From a424b5af8e0e40f61e00868afac5957bf7fdc778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Mar=C3=ADa=20Lora?= Date: Fri, 13 Dec 2024 12:12:16 +0100 Subject: [PATCH 1/3] fix: add support for default values in formParams template --- .../resources/JavaSpring/formParams.mustache | 2 +- .../java/spring/SpringCodegenTest.java | 1144 +++++++++-------- .../3_0/spring/formParams_defaultValue.yaml | 42 + 3 files changed, 629 insertions(+), 559 deletions(-) create mode 100644 modules/openapi-generator/src/test/resources/3_0/spring/formParams_defaultValue.yaml diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/formParams.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/formParams.mustache index 9508d72750d1..ef388b96e824 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/formParams.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/formParams.mustache @@ -1 +1 @@ -{{#isFormParam}}{{^isFile}}{{>paramDoc}}{{#useBeanValidation}} @Valid{{/useBeanValidation}} {{#isModel}}@RequestPart{{/isModel}}{{^isModel}}{{#isArray}}@RequestPart{{/isArray}}{{^isArray}}{{#reactive}}@RequestPart{{/reactive}}{{^reactive}}@RequestParam{{/reactive}}{{/isArray}}{{/isModel}}(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}){{>dateTimeParam}} {{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}}{{>paramDoc}} @RequestPart(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}) {{#isArray}}List<{{/isArray}}{{#reactive}}Flux{{/reactive}}{{^reactive}}MultipartFile{{/reactive}}{{#isArray}}>{{/isArray}} {{paramName}}{{/isFile}}{{/isFormParam}} \ No newline at end of file +{{#isFormParam}}{{^isFile}}{{>paramDoc}}{{#useBeanValidation}} @Valid{{/useBeanValidation}} {{#isModel}}@RequestPart{{/isModel}}{{^isModel}}{{#isArray}}@RequestPart{{/isArray}}{{^isArray}}{{#reactive}}@RequestPart{{/reactive}}{{^reactive}}@RequestParam{{/reactive}}{{/isArray}}{{/isModel}}(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}){{>dateTimeParam}} {{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}}{{>paramDoc}} @RequestPart(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}) {{#isArray}}List<{{/isArray}}{{#reactive}}Flux{{/reactive}}{{^reactive}}MultipartFile{{/reactive}}{{#isArray}}>{{/isArray}} {{paramName}}{{/isFile}}{{/isFormParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java index f2d7bd627458..933c1516ecf0 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java @@ -740,25 +740,25 @@ public void testAdditionalProperties_issue1466() throws IOException { final Map files = generateFiles(codegen, "src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml"); JavaFileAssert.assertThat(files.get("AdditionalPropertiesAnyType.java")) - .assertProperty("additionalProperties").withType("Map") - .toType() - .assertMethod("putAdditionalProperty", "String", "Object") - .toFileAssert() - .assertMethod("getAdditionalProperty", "String").hasReturnType("Object"); + .assertProperty("additionalProperties").withType("Map") + .toType() + .assertMethod("putAdditionalProperty", "String", "Object") + .toFileAssert() + .assertMethod("getAdditionalProperty", "String").hasReturnType("Object"); JavaFileAssert.assertThat(files.get("AdditionalPropertiesArray.java")) - .assertProperty("additionalProperties").withType("Map") - .toType() - .assertMethod("putAdditionalProperty", "String", "List") - .toFileAssert() - .assertMethod("getAdditionalProperty", "String").hasReturnType("List"); + .assertProperty("additionalProperties").withType("Map") + .toType() + .assertMethod("putAdditionalProperty", "String", "List") + .toFileAssert() + .assertMethod("getAdditionalProperty", "String").hasReturnType("List"); JavaFileAssert.assertThat(files.get("AdditionalPropertiesInteger.java")) - .assertProperty("additionalProperties").withType("Map") - .toType() - .assertMethod("putAdditionalProperty", "String", "Integer") - .toFileAssert() - .assertMethod("getAdditionalProperty", "String").hasReturnType("Integer"); + .assertProperty("additionalProperties").withType("Map") + .toType() + .assertMethod("putAdditionalProperty", "String", "Integer") + .toFileAssert() + .assertMethod("getAdditionalProperty", "String").hasReturnType("Integer"); } @Test @@ -767,7 +767,7 @@ public void shouldAddParameterWithInHeaderWhenImplicitHeadersIsTrue_issue14418() output.deleteOnExit(); OpenAPI openAPI = new OpenAPIParser() - .readLocation("src/test/resources/bugs/issue_14418.yaml", null, new ParseOptions()).getOpenAPI(); + .readLocation("src/test/resources/bugs/issue_14418.yaml", null, new ParseOptions()).getOpenAPI(); SpringCodegen codegen = new SpringCodegen(); codegen.setLibrary(SPRING_BOOT); codegen.setOutputDir(output.getAbsolutePath()); @@ -779,23 +779,23 @@ public void shouldAddParameterWithInHeaderWhenImplicitHeadersIsTrue_issue14418() codegen.additionalProperties().put(SpringCodegen.IMPLICIT_HEADERS, "true"); ClientOptInput input = new ClientOptInput() - .openAPI(openAPI) - .config(codegen); + .openAPI(openAPI) + .config(codegen); DefaultGenerator generator = new DefaultGenerator(); generator.setGenerateMetadata(false); Map files = generator.opts(input).generate().stream() - .collect(Collectors.toMap(File::getName, Function.identity())); + .collect(Collectors.toMap(File::getName, Function.identity())); JavaFileAssert.assertThat(files.get("TestApi.java")) - .isInterface() - .hasImports("io.swagger.v3.oas.annotations.enums.ParameterIn") - .assertMethod("test") - .assertMethodAnnotations() - .containsWithNameAndAttributes("Parameters", ImmutableMap.of( - "value", "{ @Parameter(name = \"testHeader\", description = \"Test header\", required = true, in = ParameterIn.HEADER) }" - // in = ParameterIn.HEADER is missing?! - )); + .isInterface() + .hasImports("io.swagger.v3.oas.annotations.enums.ParameterIn") + .assertMethod("test") + .assertMethodAnnotations() + .containsWithNameAndAttributes("Parameters", ImmutableMap.of( + "value", "{ @Parameter(name = \"testHeader\", description = \"Test header\", required = true, in = ParameterIn.HEADER) }" + // in = ParameterIn.HEADER is missing?! + )); } @Test @@ -804,7 +804,7 @@ public void shouldApiNameSuffixForApiClassname() throws IOException { output.deleteOnExit(); OpenAPI openAPI = new OpenAPIParser() - .readLocation("src/test/resources/3_1/petstore.yaml", null, new ParseOptions()).getOpenAPI(); + .readLocation("src/test/resources/3_1/petstore.yaml", null, new ParseOptions()).getOpenAPI(); SpringCodegen codegen = new SpringCodegen(); codegen.setLibrary(SPRING_CLOUD_LIBRARY); codegen.setOutputDir(output.getAbsolutePath()); @@ -816,16 +816,16 @@ public void shouldApiNameSuffixForApiClassname() throws IOException { ClientOptInput input = new ClientOptInput() - .openAPI(openAPI) - .config(codegen); + .openAPI(openAPI) + .config(codegen); DefaultGenerator generator = new DefaultGenerator(); generator.setGenerateMetadata(false); Map files = generator.opts(input).generate().stream() - .collect(Collectors.toMap(File::getName, Function.identity())); + .collect(Collectors.toMap(File::getName, Function.identity())); JavaFileAssert.assertThat(files.get("PetController.java")) - .isInterface(); + .isInterface(); File notExisting = files.get("PetApi.java"); assertThat(notExisting).isNull(); @@ -837,7 +837,7 @@ public void shouldUseTagsForClassname() throws IOException { output.deleteOnExit(); OpenAPI openAPI = new OpenAPIParser() - .readLocation("src/test/resources/bugs/issue_15933.yaml", null, new ParseOptions()).getOpenAPI(); + .readLocation("src/test/resources/bugs/issue_15933.yaml", null, new ParseOptions()).getOpenAPI(); SpringCodegen codegen = new SpringCodegen(); codegen.setLibrary(SPRING_CLOUD_LIBRARY); codegen.setOutputDir(output.getAbsolutePath()); @@ -849,17 +849,17 @@ public void shouldUseTagsForClassname() throws IOException { ClientOptInput input = new ClientOptInput() - .openAPI(openAPI) - .config(codegen); + .openAPI(openAPI) + .config(codegen); DefaultGenerator generator = new DefaultGenerator(); generator.setGenerateMetadata(false); - + Map files = generator.opts(input).generate().stream() - .collect(Collectors.toMap(File::getName, Function.identity())); + .collect(Collectors.toMap(File::getName, Function.identity())); JavaFileAssert.assertThat(files.get("PetTagApi.java")) - .isInterface(); + .isInterface(); File notExisting = files.get("PetApi.java"); assertThat(notExisting).isNull(); @@ -871,7 +871,7 @@ public void shouldNotUseTagsForClassname() throws IOException { output.deleteOnExit(); OpenAPI openAPI = new OpenAPIParser() - .readLocation("src/test/resources/bugs/issue_15933.yaml", null, new ParseOptions()).getOpenAPI(); + .readLocation("src/test/resources/bugs/issue_15933.yaml", null, new ParseOptions()).getOpenAPI(); SpringCodegen codegen = new SpringCodegen(); codegen.setLibrary(SPRING_CLOUD_LIBRARY); codegen.setOutputDir(output.getAbsolutePath()); @@ -883,16 +883,16 @@ public void shouldNotUseTagsForClassname() throws IOException { ClientOptInput input = new ClientOptInput() - .openAPI(openAPI) - .config(codegen); + .openAPI(openAPI) + .config(codegen); DefaultGenerator generator = new DefaultGenerator(); generator.setGenerateMetadata(false); Map files = generator.opts(input).generate().stream() - .collect(Collectors.toMap(File::getName, Function.identity())); + .collect(Collectors.toMap(File::getName, Function.identity())); JavaFileAssert.assertThat(files.get("PetApi.java")) - .isInterface(); + .isInterface(); File notExisting = files.get("PetTagApi.java"); assertThat(notExisting).isNull(); @@ -904,7 +904,7 @@ public void shouldAddValidAnnotationIntoCollectionWhenBeanValidationIsEnabled_is output.deleteOnExit(); OpenAPI openAPI = new OpenAPIParser() - .readLocation("src/test/resources/bugs/issue_14723.yaml", null, new ParseOptions()).getOpenAPI(); + .readLocation("src/test/resources/bugs/issue_14723.yaml", null, new ParseOptions()).getOpenAPI(); SpringCodegen codegen = new SpringCodegen(); codegen.setLibrary(SPRING_CLOUD_LIBRARY); codegen.setOutputDir(output.getAbsolutePath()); @@ -914,47 +914,47 @@ public void shouldAddValidAnnotationIntoCollectionWhenBeanValidationIsEnabled_is codegen.additionalProperties().put(CodegenConstants.API_PACKAGE, "xyz.controller"); ClientOptInput input = new ClientOptInput() - .openAPI(openAPI) - .config(codegen); + .openAPI(openAPI) + .config(codegen); DefaultGenerator generator = new DefaultGenerator(); generator.setGenerateMetadata(false); // skip metadata and ↓ only generate models generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "true"); Map files = generator.opts(input).generate().stream() - .collect(Collectors.toMap(File::getName, Function.identity())); + .collect(Collectors.toMap(File::getName, Function.identity())); JavaFileAssert.assertThat(files.get("ResponseTest.java")) - .isNormalClass() - .hasImports("javax.validation.Valid") - .assertProperty("details") - .withType( "Map" ) - .toType() - .assertProperty("response") - .withType( "JsonNullable>" ) - .toType() - .assertProperty("nullableDtos") - .withType( "JsonNullable>" ) - .toType() - .assertProperty("dtos") - .withType( "Set<@Valid ResponseTest2>" ) - .toType() - .assertProperty("listNullableDtos") - .withType( "JsonNullable>" ) - .toType() - .assertProperty("listDtos") - .withType( "List<@Valid ResponseTest2>" ) - .toType() - .assertProperty("nullableStrings") - .withType( "JsonNullable>" ) - .toType() - .assertProperty("strings") - .withType( "Set" ) - .toType() - .assertProperty("nullableInts") - .withType( "JsonNullable>" ) - .toType() - .assertProperty("ints") - .withType( "Set" ); + .isNormalClass() + .hasImports("javax.validation.Valid") + .assertProperty("details") + .withType("Map") + .toType() + .assertProperty("response") + .withType("JsonNullable>") + .toType() + .assertProperty("nullableDtos") + .withType("JsonNullable>") + .toType() + .assertProperty("dtos") + .withType("Set<@Valid ResponseTest2>") + .toType() + .assertProperty("listNullableDtos") + .withType("JsonNullable>") + .toType() + .assertProperty("listDtos") + .withType("List<@Valid ResponseTest2>") + .toType() + .assertProperty("nullableStrings") + .withType("JsonNullable>") + .toType() + .assertProperty("strings") + .withType("Set") + .toType() + .assertProperty("nullableInts") + .withType("JsonNullable>") + .toType() + .assertProperty("ints") + .withType("Set"); } @Test @@ -968,7 +968,7 @@ public void shouldAddValidAnnotationIntoCollectionWhenBeanValidationIsEnabled_is codegen.setLibrary(SPRING_CLOUD_LIBRARY); codegen.setOutputDir(output.getAbsolutePath()); codegen.additionalProperties().put(SpringCodegen.USE_BEANVALIDATION, "true"); - // codegen.additionalProperties().put(SpringCodegen.PERFORM_BEANVALIDATION, "true"); + // codegen.additionalProperties().put(SpringCodegen.PERFORM_BEANVALIDATION, "true"); codegen.additionalProperties().put(CodegenConstants.MODEL_PACKAGE, "xyz.model"); codegen.additionalProperties().put(CodegenConstants.API_PACKAGE, "xyz.controller"); codegen.setUseSpringBoot3(true); @@ -988,65 +988,65 @@ public void shouldAddValidAnnotationIntoCollectionWhenBeanValidationIsEnabled_is .hasImports("jakarta.validation.Valid") .hasImports("jakarta.validation.constraints") .assertProperty("stringPattern") - .withType( "Set<@Pattern(regexp = \"[a-z]\") String>" ) + .withType("Set<@Pattern(regexp = \"[a-z]\") String>") .toType() .assertProperty("stringMaxMinLength") - .withType( "Set<@Size(min = 1, max = 10) String>" ) + .withType("Set<@Size(min = 1, max = 10) String>") .toType() .assertProperty("stringMinLength") - .withType( "List<@Size(min = 1) String>" ) + .withType("List<@Size(min = 1) String>") .toType() .assertProperty("stringMaxLength") - .withType( "Set<@Size(max = 1) String>" ) + .withType("Set<@Size(max = 1) String>") .toType() .assertProperty("intMinMax") - .withType( "List<@Min(1) @Max(10) Integer>" ) + .withType("List<@Min(1) @Max(10) Integer>") .toType() .assertProperty("intMin") - .withType( "List<@Min(1) Integer>" ) + .withType("List<@Min(1) Integer>") .toType() .assertProperty("intMax") - .withType( "List<@Max(10) Integer>" ) + .withType("List<@Max(10) Integer>") .toType() .assertProperty("numberMinMax") - .withType( "List<@DecimalMin(value = \"1\", inclusive = true) @DecimalMax(value = \"10\", inclusive = true) BigDecimal>" ) + .withType("List<@DecimalMin(value = \"1\", inclusive = true) @DecimalMax(value = \"10\", inclusive = true) BigDecimal>") .toType() .assertProperty("numberMin") - .withType( "List<@DecimalMin(value = \"1\", inclusive = true) BigDecimal>" ) + .withType("List<@DecimalMin(value = \"1\", inclusive = true) BigDecimal>") .toType() .assertProperty("numberMax") - .withType( "List<@DecimalMax(value = \"10\", inclusive = true) BigDecimal>" ) + .withType("List<@DecimalMax(value = \"10\", inclusive = true) BigDecimal>") .toType() .assertProperty("stringPatternNullable") - .withType( "JsonNullable>" ) + .withType("JsonNullable>") .toType() .assertProperty("stringMaxMinLengthNullable") - .withType( "JsonNullable>" ) + .withType("JsonNullable>") .toType() .assertProperty("stringMinLengthNullable") - .withType( "JsonNullable>" ) + .withType("JsonNullable>") .toType() .assertProperty("stringMaxLengthNullable") - .withType( "JsonNullable>" ) + .withType("JsonNullable>") .toType() .assertProperty("intMinMaxNullable") - .withType( "JsonNullable>" ) + .withType("JsonNullable>") .toType() .assertProperty("intMinNullable") - .withType( "JsonNullable>" ) + .withType("JsonNullable>") .toType() .assertProperty("intMaxNullable") - .withType( "JsonNullable>" ) + .withType("JsonNullable>") .toType() .assertProperty("numberMinMaxNullable") - .withType( "JsonNullable>" ) + .withType("JsonNullable>") .toType() .assertProperty("numberMinNullable") - .withType( "JsonNullable>" ) + .withType("JsonNullable>") .toType() .assertProperty("numberMaxNullable") - .withType( "JsonNullable>" ) + .withType("JsonNullable>") .toType() ; } @@ -1116,33 +1116,33 @@ public void testRequestMappingAnnotation() throws IOException { assertFileNotContains(petApiControllerFile.toPath(), "@RequestMapping(\"${openapi.openAPIPetstore.base-path:/v2}\")"); } - @Test - public void testNoRequestMappingAnnotation_spring_cloud_default() throws IOException { - final SpringCodegen codegen = new SpringCodegen(); - codegen.setLibrary( "spring-cloud" ); + @Test + public void testNoRequestMappingAnnotation_spring_cloud_default() throws IOException { + final SpringCodegen codegen = new SpringCodegen(); + codegen.setLibrary("spring-cloud"); - final Map files = generateFiles( codegen, "src/test/resources/2_0/petstore.yaml" ); + final Map files = generateFiles(codegen, "src/test/resources/2_0/petstore.yaml"); - // Check that the @RequestMapping annotation is not generated in the Api file - final File petApiFile = files.get( "PetApi.java" ); - JavaFileAssert.assertThat( petApiFile ).assertTypeAnnotations().hasSize( 3 ).containsWithName( "Validated" ) - .containsWithName( "Generated" ).containsWithName( "Tag" ); + // Check that the @RequestMapping annotation is not generated in the Api file + final File petApiFile = files.get("PetApi.java"); + JavaFileAssert.assertThat(petApiFile).assertTypeAnnotations().hasSize(3).containsWithName("Validated") + .containsWithName("Generated").containsWithName("Tag"); - } + } @Test public void testNoRequestMappingAnnotation() throws IOException { final SpringCodegen codegen = new SpringCodegen(); - codegen.setLibrary( "spring-cloud" ); + codegen.setLibrary("spring-cloud"); codegen.additionalProperties().put(INTERFACE_ONLY, "true"); codegen.additionalProperties().put(REQUEST_MAPPING_OPTION, SpringCodegen.RequestMappingMode.none); - final Map files = generateFiles( codegen, "src/test/resources/2_0/petstore.yaml" ); + final Map files = generateFiles(codegen, "src/test/resources/2_0/petstore.yaml"); // Check that the @RequestMapping annotation is not generated in the Api file - final File petApiFile = files.get( "PetApi.java" ); - JavaFileAssert.assertThat( petApiFile ).assertTypeAnnotations().hasSize( 3 ).containsWithName( "Validated" ) - .containsWithName( "Generated" ).containsWithName( "Tag" ); + final File petApiFile = files.get("PetApi.java"); + JavaFileAssert.assertThat(petApiFile).assertTypeAnnotations().hasSize(3).containsWithName("Validated") + .containsWithName("Generated").containsWithName("Tag"); } @Test @@ -1164,7 +1164,7 @@ public void testSettersForConfigValues() throws Exception { configAssert.assertValue(CodegenConstants.INVOKER_PACKAGE, codegen::getInvokerPackage, "xx.yyyyyyyy.invoker"); configAssert.assertValue(SpringCodegen.BASE_PACKAGE, codegen::getBasePackage, "xx.yyyyyyyy.base"); configAssert.assertValue(SpringCodegen.CONFIG_PACKAGE, codegen::getConfigPackage, "xx.yyyyyyyy.config"); - configAssert.assertValue(SpringCodegen.UNHANDLED_EXCEPTION_HANDLING, codegen::isUnhandledException, true); + configAssert.assertValue(SpringCodegen.UNHANDLED_EXCEPTION_HANDLING, codegen::isUnhandledException, true); } @Test @@ -1216,7 +1216,7 @@ public void testGenerationOfClientPropertiesConfigurationForOAuth() throws Excep ); - assertFileNotContains(filePath,"spring.security.oauth2.client.registration.oAuth2Application.scope"); + assertFileNotContains(filePath, "spring.security.oauth2.client.registration.oAuth2Application.scope"); } @Test @@ -1231,7 +1231,7 @@ public void useBeanValidationTruePerformBeanValidationTrueForFormatEmail() throw @Test public void useBeanValidationTruePerformBeanValidationFalseJakartaeeTrueForFormatEmail() throws IOException { - beanValidationForFormatEmail(true, false, true,"@jakarta.validation.constraints.Email", "@javax.validation.constraints.Email"); + beanValidationForFormatEmail(true, false, true, "@jakarta.validation.constraints.Email", "@javax.validation.constraints.Email"); } // note: java8 option/mustache tag has been removed and default to true @@ -1267,11 +1267,12 @@ private void beanValidationForFormatEmail(boolean useBeanValidation, boolean per .collect(Collectors.toMap(File::getName, Function.identity())); JavaFileAssert javaFileAssert = JavaFileAssert.assertThat(files.get("PersonWithEmail.java")); - if (useBeanValidation) javaFileAssert.hasImports((useJakarta? "jakarta" : "javax") + ".validation.constraints"); + if (useBeanValidation) + javaFileAssert.hasImports((useJakarta ? "jakarta" : "javax") + ".validation.constraints"); if (performBeanValidation) javaFileAssert.hasImports("org.hibernate.validator.constraints"); JavaFileAssert.assertThat(Paths.get(outputPath + "/src/main/java/org/openapitools/model/PersonWithEmail.java")) - .fileContains(contains) - .fileDoesNotContain(notContains); + .fileContains(contains) + .fileDoesNotContain(notContains); } @Test @@ -1301,11 +1302,11 @@ public void reactiveMapTypeRequestMonoTest() throws IOException { generator.opts(input).generate(); JavaFileAssert.assertThat(Paths.get(outputPath + "/src/main/java/org/openapitools/api/SomeApi.java")) - .fileContains("Mono>") - .fileDoesNotContain("Mono"); + .fileContains("Mono>") + .fileDoesNotContain("Mono"); JavaFileAssert.assertThat(Paths.get(outputPath + "/src/main/java/org/openapitools/api/SomeApiDelegate.java")) - .fileContains("Mono>") - .fileDoesNotContain("Mono"); + .fileContains("Mono>") + .fileDoesNotContain("Mono"); } @Test @@ -1319,11 +1320,11 @@ public void reactiveArrayShouldBeWrappedInFluxWithoutMono() throws IOException { Map files = generateFromContract("src/test/resources/3_0/petstore.yaml", SPRING_BOOT, additionalProperties); JavaFileAssert - .assertThat(files.get("PetApi.java")) + .assertThat(files.get("PetApi.java")) .assertMethod("addPet").hasReturnType("Mono") - .toFileAssert() + .toFileAssert() .assertMethod("findPetsByStatus").hasReturnType("Flux") - .toFileAssert() + .toFileAssert() .assertMethod("deletePet").hasReturnType("Mono"); } @@ -1341,11 +1342,11 @@ public void reactiveArrayShouldBeWrappedInMonoFluxWhenUsingResponseEntity() thro Map files = generateFromContract("src/test/resources/3_0/petstore.yaml", SPRING_BOOT, additionalProperties); JavaFileAssert - .assertThat(files.get("PetApi.java")) + .assertThat(files.get("PetApi.java")) .assertMethod("addPet").hasReturnType("Mono>") - .toFileAssert() + .toFileAssert() .assertMethod("findPetsByStatus").hasReturnType("Mono>>") - .toFileAssert() + .toFileAssert() .assertMethod("deletePet").hasReturnType("Mono>"); } @@ -1375,10 +1376,10 @@ public void shouldGenerateValidCodeForReactiveControllerWithoutParams_issue14907 generator.setGenerateMetadata(false); // skip metadata Map files = generator.opts(input).generate().stream() - .collect(Collectors.toMap(File::getName, Function.identity())); + .collect(Collectors.toMap(File::getName, Function.identity())); JavaFileAssert.assertThat(files.get("ConsentControllerApi.java")) - .assertMethod("readAgreements", "ServerWebExchange"); + .assertMethod("readAgreements", "ServerWebExchange"); } @Test @@ -1407,12 +1408,12 @@ public void shouldGenerateValidCodeWithPaginated_reactive_issue15265() throws IO generator.setGenerateMetadata(false); // skip metadata and ↓ only generate models Map files = generator.opts(input).generate().stream() - .collect(Collectors.toMap(File::getName, Function.identity())); + .collect(Collectors.toMap(File::getName, Function.identity())); JavaFileAssert.assertThat(files.get("ConsentControllerApi.java")) - .assertMethod("paginated", "ServerWebExchange", "Pageable") - .toFileAssert() - .assertMethod("paginatedWithParams", "String", "ServerWebExchange", "Pageable"); + .assertMethod("paginated", "ServerWebExchange", "Pageable") + .toFileAssert() + .assertMethod("paginatedWithParams", "String", "ServerWebExchange", "Pageable"); } @Test @@ -1440,12 +1441,12 @@ public void shouldGenerateValidCodeWithPaginated_nonReactive_issue15265() throws generator.setGenerateMetadata(false); // skip metadata and ↓ only generate models Map files = generator.opts(input).generate().stream() - .collect(Collectors.toMap(File::getName, Function.identity())); + .collect(Collectors.toMap(File::getName, Function.identity())); JavaFileAssert.assertThat(files.get("ConsentControllerApi.java")) - .assertMethod("paginated", "Pageable") - .toFileAssert() - .assertMethod("paginatedWithParams", "String", "Pageable"); + .assertMethod("paginated", "Pageable") + .toFileAssert() + .assertMethod("paginatedWithParams", "String", "Pageable"); } @Test @@ -1488,13 +1489,13 @@ public void doGeneratePathVariableForSimpleParam() throws IOException { generator.opts(input).generate(); JavaFileAssert.assertThat(Paths.get(outputPath + "/src/main/java/org/openapitools/api/ZebrasApi.java")) - .fileContains( "allowableValues = \"0, 1\"", "@PathVariable"); + .fileContains("allowableValues = \"0, 1\"", "@PathVariable"); JavaFileAssert.assertThat(Paths.get(outputPath + "/src/main/java/org/openapitools/api/BearsApi.java")) - .fileContains( "allowableValues = \"sleeping, awake\"", "@PathVariable"); + .fileContains("allowableValues = \"sleeping, awake\"", "@PathVariable"); JavaFileAssert.assertThat(Paths.get(outputPath + "/src/main/java/org/openapitools/api/CamelsApi.java")) - .fileContains( "allowableValues = \"sleeping, awake\"", "@PathVariable"); + .fileContains("allowableValues = \"sleeping, awake\"", "@PathVariable"); JavaFileAssert.assertThat(Paths.get(outputPath + "/src/main/java/org/openapitools/api/GiraffesApi.java")) - .fileContains( "allowableValues = \"0, 1\"", "@PathVariable"); + .fileContains("allowableValues = \"0, 1\"", "@PathVariable"); } @Test @@ -1609,7 +1610,7 @@ public void shouldAddNotNullOnRequiredAttributes() throws IOException { generator.opts(input).generate(); JavaFileAssert.assertThat(Paths.get(outputPath + "/src/main/java/org/openapitools/model/Dummy.java")) - .fileContains( "status", "@NotNull"); + .fileContains("status", "@NotNull"); } @Test @@ -1636,8 +1637,8 @@ public void shouldNotAddNotNullOnReadOnlyAttributes() throws IOException { generator.opts(input).generate(); JavaFileAssert.assertThat(Paths.get(outputPath + "/src/main/java/org/openapitools/model/Dummy.java")) - .fileContains( "status") - .fileDoesNotContain("@NotNull"); + .fileContains("status") + .fileDoesNotContain("@NotNull"); } @Test @@ -1658,13 +1659,13 @@ public void testOneOf5381() throws IOException { input.config(codegen); DefaultGenerator generator = new DefaultGenerator(); - // codegen.setHateoas(true); + // codegen.setHateoas(true); generator.setGenerateMetadata(false); // skip metadata and ↓ only generate models generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "true"); generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false"); generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false"); generator.setGeneratorPropertyDefault(CodegenConstants.LEGACY_DISCRIMINATOR_BEHAVIOR, "false"); - + codegen.setUseOneOfInterfaces(true); codegen.setLegacyDiscriminatorBehavior(false); @@ -1710,7 +1711,7 @@ public void testOneOfAndAllOf() throws IOException { assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/model/FooRefOrValue.java"), "public interface FooRefOrValue"); // previous bugs JavaFileAssert.assertThat(Paths.get(outputPath + "/src/main/java/org/openapitools/model/BarRef.java")) - .fileDoesNotContain("atTypesuper.hashCode", "private String atBaseType"); + .fileDoesNotContain("atTypesuper.hashCode", "private String atBaseType"); // imports for inherited properties assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/model/PizzaSpeziale.java"), "import java.math.BigDecimal"); } @@ -1721,7 +1722,7 @@ public void testDiscriminatorWithMappingIssue14731() throws IOException { output.deleteOnExit(); String outputPath = output.getAbsolutePath().replace('\\', '/'); OpenAPI openAPI = new OpenAPIParser() - .readLocation("src/test/resources/bugs/issue_14731.yaml", null, new ParseOptions()).getOpenAPI(); + .readLocation("src/test/resources/bugs/issue_14731.yaml", null, new ParseOptions()).getOpenAPI(); SpringCodegen codegen = new SpringCodegen(); codegen.setOutputDir(output.getAbsolutePath()); @@ -1758,7 +1759,7 @@ public void testDiscriminatorWithoutMappingIssue14731() throws IOException { output.deleteOnExit(); String outputPath = output.getAbsolutePath().replace('\\', '/'); OpenAPI openAPI = new OpenAPIParser() - .readLocation("src/test/resources/bugs/issue_14731.yaml", null, new ParseOptions()).getOpenAPI(); + .readLocation("src/test/resources/bugs/issue_14731.yaml", null, new ParseOptions()).getOpenAPI(); SpringCodegen codegen = new SpringCodegen(); codegen.setOutputDir(output.getAbsolutePath()); @@ -1796,7 +1797,7 @@ void testOneOfWithEnumDiscriminator() throws IOException { output.deleteOnExit(); String outputPath = output.getAbsolutePath().replace('\\', '/'); OpenAPI openAPI = new OpenAPIParser() - .readLocation("src/test/resources/3_0/oneOfDiscriminator.yaml", null, new ParseOptions()).getOpenAPI(); + .readLocation("src/test/resources/3_0/oneOfDiscriminator.yaml", null, new ParseOptions()).getOpenAPI(); SpringCodegen codegen = new SpringCodegen(); codegen.setOutputDir(output.getAbsolutePath()); @@ -1821,18 +1822,18 @@ void testOneOfWithEnumDiscriminator() throws IOException { generator.opts(input).generate(); assertFileContains( - Paths.get(outputPath + "/src/main/java/org/openapitools/model/FruitOneOfEnumMappingDisc.java"), - "public FruitTypeEnum getFruitType();" + Paths.get(outputPath + "/src/main/java/org/openapitools/model/FruitOneOfEnumMappingDisc.java"), + "public FruitTypeEnum getFruitType();" ); assertFileContains( - Paths.get(outputPath + "/src/main/java/org/openapitools/model/AppleOneOfEnumMappingDisc.java"), - "private FruitTypeEnum fruitType;", - "public FruitTypeEnum getFruitType() {" + Paths.get(outputPath + "/src/main/java/org/openapitools/model/AppleOneOfEnumMappingDisc.java"), + "private FruitTypeEnum fruitType;", + "public FruitTypeEnum getFruitType() {" ); assertFileContains( - Paths.get(outputPath + "/src/main/java/org/openapitools/model/BananaOneOfEnumMappingDisc.java"), - "private FruitTypeEnum fruitType;", - "public FruitTypeEnum getFruitType() {" + Paths.get(outputPath + "/src/main/java/org/openapitools/model/BananaOneOfEnumMappingDisc.java"), + "private FruitTypeEnum fruitType;", + "public FruitTypeEnum getFruitType() {" ); } @@ -1981,7 +1982,7 @@ public void shouldGenerateExternalDocs() throws IOException { output.deleteOnExit(); OpenAPI openAPI = new OpenAPIParser() - .readLocation("src/test/resources/3_0/petstore.yaml", null, new ParseOptions()).getOpenAPI(); + .readLocation("src/test/resources/3_0/petstore.yaml", null, new ParseOptions()).getOpenAPI(); SpringCodegen codegen = new SpringCodegen(); codegen.setLibrary(SPRING_BOOT); codegen.setOutputDir(output.getAbsolutePath()); @@ -1989,8 +1990,8 @@ public void shouldGenerateExternalDocs() throws IOException { codegen.additionalProperties().put(BeanValidationFeatures.USE_BEANVALIDATION, "true"); ClientOptInput input = new ClientOptInput() - .openAPI(openAPI) - .config(codegen); + .openAPI(openAPI) + .config(codegen); DefaultGenerator generator = new DefaultGenerator(); generator.setGenerateMetadata(false); // skip metadata and ↓ only generate API @@ -1999,19 +2000,19 @@ public void shouldGenerateExternalDocs() throws IOException { generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "true"); Map files = generator.opts(input).generate().stream() - .collect(Collectors.toMap(File::getName, Function.identity())); + .collect(Collectors.toMap(File::getName, Function.identity())); JavaFileAssert.assertThat(files.get("PetApi.java")) - .hasImports("io.swagger.v3.oas.annotations.ExternalDocumentation") - .assertMethod("updatePet") - .assertMethodAnnotations() - .containsWithName("Operation") - .containsWithNameAndAttributes("Operation", - ImmutableMap.of( - "operationId", "\"updatePet\"", - //"security", "{ @SecurityRequirement(name = \"petstore_auth\", scopes = { \"write:pets\", \"read:pets\" }) }", - "externalDocs", "@ExternalDocumentation(description = \"API documentation for the updatePet operation\", url = \"http://petstore.swagger.io/v2/doc/updatePet\")" - ) + .hasImports("io.swagger.v3.oas.annotations.ExternalDocumentation") + .assertMethod("updatePet") + .assertMethodAnnotations() + .containsWithName("Operation") + .containsWithNameAndAttributes("Operation", + ImmutableMap.of( + "operationId", "\"updatePet\"", + //"security", "{ @SecurityRequirement(name = \"petstore_auth\", scopes = { \"write:pets\", \"read:pets\" }) }", + "externalDocs", "@ExternalDocumentation(description = \"API documentation for the updatePet operation\", url = \"http://petstore.swagger.io/v2/doc/updatePet\")" + ) ); } @@ -2206,7 +2207,7 @@ public void testResponseWithArray_issue12524() throws Exception { Map files = generateFromContract("src/test/resources/bugs/issue_12524.json", SPRING_BOOT, additionalProperties); JavaFileAssert.assertThat(files.get("API01ListOfStuff.java")) - .hasImports("com.fasterxml.jackson.annotation.JsonTypeName"); + .hasImports("com.fasterxml.jackson.annotation.JsonTypeName"); } finally { GlobalSettings.reset(); } @@ -2222,11 +2223,11 @@ public void paramObjectImportForDifferentSpringBootVersions_issue14077() throws Map files = generateFromContract("src/test/resources/2_0/petstore-with-spring-pageable.yaml", SPRING_BOOT, additionalProperties); JavaFileAssert.assertThat(files.get("PetApi.java")) - .hasImports("org.springdoc.api.annotations.ParameterObject") - .assertMethod("findPetsByStatus") - .assertParameter("pageable").hasType("Pageable") - .assertParameterAnnotations() - .containsWithName("ParameterObject"); + .hasImports("org.springdoc.api.annotations.ParameterObject") + .assertMethod("findPetsByStatus") + .assertParameter("pageable").hasType("Pageable") + .assertParameterAnnotations() + .containsWithName("ParameterObject"); // different import for SB3 @@ -2234,11 +2235,11 @@ public void paramObjectImportForDifferentSpringBootVersions_issue14077() throws files = generateFromContract("src/test/resources/2_0/petstore-with-spring-pageable.yaml", SPRING_BOOT, additionalProperties); JavaFileAssert.assertThat(files.get("PetApi.java")) - .hasImports("org.springdoc.core.annotations.ParameterObject", "org.springframework.data.domain.Pageable") - .assertMethod("findPetsByStatus") - .assertParameter("pageable").hasType("Pageable") - .assertParameterAnnotations() - .containsWithName("ParameterObject"); + .hasImports("org.springdoc.core.annotations.ParameterObject", "org.springframework.data.domain.Pageable") + .assertMethod("findPetsByStatus") + .assertParameter("pageable").hasType("Pageable") + .assertParameterAnnotations() + .containsWithName("ParameterObject"); } @Test @@ -2475,12 +2476,12 @@ public void requiredFieldShouldIncludeNotNullAnnotationWithBeanValidationTrue_is Map files = generateFiles(codegen, "src/test/resources/bugs/issue_14252.yaml"); JavaFileAssert.assertThat(files.get("MyResponse.java")) - .hasImports("com.fasterxml.jackson.annotation.JsonFormat") - .assertMethod("getMyPropTypeNumber") - .assertMethodAnnotations() - .containsWithNameAndAttributes("JsonFormat", ImmutableMap.of( - "shape", "JsonFormat.Shape.STRING" - )); + .hasImports("com.fasterxml.jackson.annotation.JsonFormat") + .assertMethod("getMyPropTypeNumber") + .assertMethodAnnotations() + .containsWithNameAndAttributes("JsonFormat", ImmutableMap.of( + "shape", "JsonFormat.Shape.STRING" + )); } @Test @@ -2504,8 +2505,8 @@ public void requiredFieldShouldIncludeNotNullAnnotationWithBeanValidationTrue_is javaFileAssert.assertMethod("getName").assertMethodAnnotations() .containsWithName("NotNull").containsWithName("Size").containsWithName("javax.validation.constraints.Email"); javaFileAssert - .hasNoImports("javax.validation.constraints.NotNull") - .hasImports("javax.validation.constraints"); + .hasNoImports("javax.validation.constraints.NotNull") + .hasImports("javax.validation.constraints"); } @Test @@ -2611,7 +2612,7 @@ public void shouldHandleSeparatelyInterfaceAndModelAdditionalAnnotations() throw output.deleteOnExit(); OpenAPI openAPI = new OpenAPIParser() - .readLocation("src/test/resources/bugs/issue_13917.yaml", null, new ParseOptions()).getOpenAPI(); + .readLocation("src/test/resources/bugs/issue_13917.yaml", null, new ParseOptions()).getOpenAPI(); SpringCodegen codegen = new SpringCodegen(); codegen.setLibrary(SPRING_BOOT); codegen.setOutputDir(output.getAbsolutePath()); @@ -2624,27 +2625,27 @@ public void shouldHandleSeparatelyInterfaceAndModelAdditionalAnnotations() throw codegen.additionalProperties().put(AbstractJavaCodegen.ADDITIONAL_ONE_OF_TYPE_ANNOTATIONS, "@marker.Interface1;@marker.Common"); ClientOptInput input = new ClientOptInput() - .openAPI(openAPI) - .config(codegen); + .openAPI(openAPI) + .config(codegen); DefaultGenerator generator = new DefaultGenerator(); generator.setGenerateMetadata(false); // skip metadata and ↓ only generate models generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "true"); Map files = generator.opts(input).generate().stream() - .collect(Collectors.toMap(File::getName, Function.identity())); + .collect(Collectors.toMap(File::getName, Function.identity())); JavaFileAssert.assertThat(files.get("PatchRequestInner.java")) - .isInterface() - .assertTypeAnnotations() - .containsWithName("marker.Interface1") - .containsWithName("marker.Common"); + .isInterface() + .assertTypeAnnotations() + .containsWithName("marker.Interface1") + .containsWithName("marker.Common"); JavaFileAssert.assertThat(files.get("JSONPatchRequestRemove.java")) - .isNormalClass() - .assertTypeAnnotations() - .containsWithName("marker.Class1") - .containsWithName("marker.Class2") - .containsWithName("marker.Common"); + .isNormalClass() + .assertTypeAnnotations() + .containsWithName("marker.Class1") + .containsWithName("marker.Class2") + .containsWithName("marker.Common"); } @Test @@ -2676,7 +2677,7 @@ public void contractWithResolvedInnerEnumContainsEnumConverter() throws IOExcept final ClientOptInput clientOptInput = configurator.toClientOptInput(); DefaultGenerator generator = new DefaultGenerator(); generator.setGenerateMetadata(false); - + Map files = generator.opts(clientOptInput).generate().stream() .collect(Collectors.toMap(File::getName, Function.identity())); @@ -2687,7 +2688,7 @@ public void contractWithResolvedInnerEnumContainsEnumConverter() throws IOExcept @Test public void shouldUseTheSameTagNameForTheInterfaceAndTheMethod_issue11570() throws IOException { final Map output = generateFromContract( - "src/test/resources/bugs/issue_11570.yml", SPRING_BOOT, Map.of(INTERFACE_ONLY, "true") + "src/test/resources/bugs/issue_11570.yml", SPRING_BOOT, Map.of(INTERFACE_ONLY, "true") ); final String expectedTagName = "\"personTagWithExclamation!\""; @@ -2701,9 +2702,9 @@ public void shouldUseTheSameTagNameForTheInterfaceAndTheMethod_issue11570() thro @Test public void shouldGenerateConstructorWithOnlyRequiredParameters() throws IOException { final Map output = generateFromContract( - "src/test/resources/3_0/spring/issue_9789.yml", - SPRING_BOOT, - Map.of(GENERATE_CONSTRUCTOR_WITH_ALL_ARGS, "false") + "src/test/resources/3_0/spring/issue_9789.yml", + SPRING_BOOT, + Map.of(GENERATE_CONSTRUCTOR_WITH_ALL_ARGS, "false") ); JavaFileAssert.assertThat(output.get("ObjectWithNoRequiredParameter.java")).hasNoConstructor("String"); @@ -2726,12 +2727,13 @@ private Map generateFromContract(String url, String library) throw } private Map generateFromContract(String url, String library, Map additionalProperties) throws IOException { - return generateFromContract(url, library, additionalProperties, codegen -> {}); + return generateFromContract(url, library, additionalProperties, codegen -> { + }); } /** * Generate the contract with additional configuration. - * + *

* use CodegenConfigurator instead of CodegenConfig for easier configuration like in JavaClientCodeGenTest */ private Map generateFromContract(String url, String library, Map additionalProperties, @@ -2789,8 +2791,8 @@ public void testMappingSubtypesIssue13150() throws IOException { generator.opts(input).generate(); String jsonSubType = "@JsonSubTypes({\n" + - " @JsonSubTypes.Type(value = Foo.class, name = \"foo\")\n" + - "})"; + " @JsonSubTypes.Type(value = Foo.class, name = \"foo\")\n" + + "})"; assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/model/Parent.java"), jsonSubType); } @@ -2800,59 +2802,59 @@ public void shouldGenerateJsonPropertyAnnotationLocatedInGetters_issue5705() thr output.deleteOnExit(); OpenAPI openAPI = new OpenAPIParser() - .readLocation("src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml", null, new ParseOptions()).getOpenAPI(); + .readLocation("src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml", null, new ParseOptions()).getOpenAPI(); SpringCodegen codegen = new SpringCodegen(); codegen.setLibrary(SPRING_BOOT); codegen.setWithXml(true); codegen.setOutputDir(output.getAbsolutePath()); ClientOptInput input = new ClientOptInput() - .openAPI(openAPI) - .config(codegen); + .openAPI(openAPI) + .config(codegen); DefaultGenerator generator = new DefaultGenerator(); generator.setGenerateMetadata(false); // skip metadata and ↓ only generate models generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "true"); Map files = generator.opts(input).generate().stream() - .collect(Collectors.toMap(File::getName, Function.identity())); + .collect(Collectors.toMap(File::getName, Function.identity())); JavaFileAssert.assertThat(files.get("ResponseObjectWithDifferentFieldNames.java")) - .assertProperty("normalPropertyName") + .assertProperty("normalPropertyName") .assertPropertyAnnotations() .doesNotContainWithName("JsonProperty") .doesNotContainWithName("JacksonXmlProperty") .toProperty().toType() - .assertProperty("UPPER_CASE_PROPERTY_SNAKE") + .assertProperty("UPPER_CASE_PROPERTY_SNAKE") .assertPropertyAnnotations() .doesNotContainWithName("JsonProperty") .doesNotContainWithName("JacksonXmlProperty") .toProperty().toType() - .assertProperty("lowerCasePropertyDashes") + .assertProperty("lowerCasePropertyDashes") .assertPropertyAnnotations() .doesNotContainWithName("JsonProperty") .doesNotContainWithName("JacksonXmlProperty") .toProperty().toType() - .assertProperty("propertyNameWithSpaces") + .assertProperty("propertyNameWithSpaces") .assertPropertyAnnotations() .doesNotContainWithName("JsonProperty") .doesNotContainWithName("JacksonXmlProperty") .toProperty().toType() - .assertMethod("getNormalPropertyName") + .assertMethod("getNormalPropertyName") .assertMethodAnnotations() .containsWithNameAndAttributes("JsonProperty", ImmutableMap.of("value", "\"normalPropertyName\"")) .containsWithNameAndAttributes("JacksonXmlProperty", ImmutableMap.of("localName", "\"normalPropertyName\"")) .toMethod().toFileAssert() - .assertMethod("getUPPERCASEPROPERTYSNAKE") + .assertMethod("getUPPERCASEPROPERTYSNAKE") .assertMethodAnnotations() .containsWithNameAndAttributes("JsonProperty", ImmutableMap.of("value", "\"UPPER_CASE_PROPERTY_SNAKE\"")) .containsWithNameAndAttributes("JacksonXmlProperty", ImmutableMap.of("localName", "\"UPPER_CASE_PROPERTY_SNAKE\"")) .toMethod().toFileAssert() - .assertMethod("getLowerCasePropertyDashes") + .assertMethod("getLowerCasePropertyDashes") .assertMethodAnnotations() .containsWithNameAndAttributes("JsonProperty", ImmutableMap.of("value", "\"lower-case-property-dashes\"")) .containsWithNameAndAttributes("JacksonXmlProperty", ImmutableMap.of("localName", "\"lower-case-property-dashes\"")) .toMethod().toFileAssert() - .assertMethod("getPropertyNameWithSpaces") + .assertMethod("getPropertyNameWithSpaces") .assertMethodAnnotations() .containsWithNameAndAttributes("JsonProperty", ImmutableMap.of("value", "\"property name with spaces\"")) .containsWithNameAndAttributes("JacksonXmlProperty", ImmutableMap.of("localName", "\"property name with spaces\"")); @@ -3427,7 +3429,7 @@ public void doCallFluentParentSettersFromChildModel() throws IOException { String outputPath = output.getAbsolutePath().replace('\\', '/'); OpenAPI openAPI = new OpenAPIParser() - .readLocation("src/test/resources/3_0/issue_16496.yaml", null, new ParseOptions()).getOpenAPI(); + .readLocation("src/test/resources/3_0/issue_16496.yaml", null, new ParseOptions()).getOpenAPI(); SpringCodegen codegen = new SpringCodegen(); codegen.setOutputDir(output.getAbsolutePath()); @@ -3448,33 +3450,33 @@ public void doCallFluentParentSettersFromChildModel() throws IOException { JavaFileAssert.assertThat(Paths.get(outputPath + "/src/main/java/org/openapitools/model/Animal.java")) - // Fluent method assertions - .assertMethod("alias") - .hasReturnType("Animal") - .bodyContainsLines("this.alias = JsonNullable.of(alias);", "return this;") - .assertParameter("alias") - .hasType("String") - .toMethod() - .toFileAssert() - - // Setter method assertions - .assertMethod("setAlias") - .hasReturnType("void") - .assertParameter("alias") - .hasType("JsonNullable"); + // Fluent method assertions + .assertMethod("alias") + .hasReturnType("Animal") + .bodyContainsLines("this.alias = JsonNullable.of(alias);", "return this;") + .assertParameter("alias") + .hasType("String") + .toMethod() + .toFileAssert() + + // Setter method assertions + .assertMethod("setAlias") + .hasReturnType("void") + .assertParameter("alias") + .hasType("JsonNullable"); JavaFileAssert.assertThat(Paths.get(outputPath + "/src/main/java/org/openapitools/model/Zebra.java")) - // Fluent method assertions - .assertMethod("alias") - .hasReturnType("Zebra") - .bodyContainsLines("super.alias(alias);", "return this;") - .assertParameter("alias") - .hasType("String") - .toMethod() - .toFileAssert() + // Fluent method assertions + .assertMethod("alias") + .hasReturnType("Zebra") + .bodyContainsLines("super.alias(alias);", "return this;") + .assertParameter("alias") + .hasType("String") + .toMethod() + .toFileAssert() - // No overridden setter on child object - .hasNoMethod("setAlias"); + // No overridden setter on child object + .hasNoMethod("setAlias"); } @Test @@ -3509,96 +3511,96 @@ public void testModelsWithNoneOptionalAndJsonNullable() throws IOException { .hasImports("jakarta.validation.constraints") .assertProperty("name") - .withType( "String" ) + .withType("String") .toType() .assertProperty("age") - .withType( "JsonNullable" ) + .withType("JsonNullable") .toType() .assertProperty("alias") - .withType( "JsonNullable" ) + .withType("JsonNullable") .toType() .assertProperty("color") - .withType( "String" ) + .withType("String") .toType() .assertProperty("names") - .withType( "List" ) + .withType("List") .toType() .assertProperty("colors") - .withType( "JsonNullable>" ) + .withType("JsonNullable>") .toType() .assertProperty("stringPattern") - .withType( "String" ) + .withType("String") .toType() .assertProperty("stringMaxMinLength") - .withType( "String" ) + .withType("String") .toType() .assertProperty("stringMinLength") - .withType( "String" ) + .withType("String") .toType() .assertProperty("stringMaxLength") - .withType( "String" ) + .withType("String") .toType() .assertProperty("stringEmail") - .withType( "String" ) + .withType("String") .toType() .assertProperty("intMinMax") - .withType( "Integer" ) + .withType("Integer") .toType() .assertProperty("intMin") - .withType( "Integer" ) + .withType("Integer") .toType() .assertProperty("intMax") - .withType( "Integer" ) + .withType("Integer") .toType() .assertProperty("numberMinMax") - .withType( "BigDecimal" ) + .withType("BigDecimal") .toType() .assertProperty("numberMin") - .withType( "BigDecimal" ) + .withType("BigDecimal") .toType() .assertProperty("numberMax") - .withType( "BigDecimal" ) + .withType("BigDecimal") .toType() .assertProperty("stringDefault") - .withType( "String" ) + .withType("String") .toType() .fileContains("stringDefault = \"ABC\"") .assertProperty("zebra") - .withType( "Zebra" ) + .withType("Zebra") .toType() .assertProperty("stringPatternNullable") - .withType( "JsonNullable<@Pattern(regexp = \"[a-z]\") String>" ) + .withType("JsonNullable<@Pattern(regexp = \"[a-z]\") String>") .toType() .assertProperty("stringMaxMinLengthNullable") - .withType( "JsonNullable<@Size(min = 1, max = 10) String>" ) + .withType("JsonNullable<@Size(min = 1, max = 10) String>") .toType() .assertProperty("stringMinLengthNullable") - .withType( "JsonNullable<@Size(min = 1) String>" ) + .withType("JsonNullable<@Size(min = 1) String>") .toType() .assertProperty("stringMaxLengthNullable") - .withType( "JsonNullable<@Size(max = 1) String>" ) + .withType("JsonNullable<@Size(max = 1) String>") .toType() .assertProperty("intMinMaxNullable") - .withType( "JsonNullable<@Min(1) @Max(10) Integer>" ) + .withType("JsonNullable<@Min(1) @Max(10) Integer>") .toType() .assertProperty("intMinNullable") - .withType( "JsonNullable<@Min(1) Integer>" ) + .withType("JsonNullable<@Min(1) Integer>") .toType() .assertProperty("intMaxNullable") - .withType( "JsonNullable<@Max(10) Integer>" ) + .withType("JsonNullable<@Max(10) Integer>") .toType() .assertProperty("numberMinMaxNullable") - .withType( "JsonNullable<@DecimalMin(\"1\") @DecimalMax(\"10\") BigDecimal>" ) + .withType("JsonNullable<@DecimalMin(\"1\") @DecimalMax(\"10\") BigDecimal>") .toType() .assertProperty("numberMinNullable") - .withType( "JsonNullable<@DecimalMin(\"1\") BigDecimal>" ) + .withType("JsonNullable<@DecimalMin(\"1\") BigDecimal>") .toType() .assertProperty("numberMaxNullable") - .withType( "JsonNullable<@DecimalMax(\"10\") BigDecimal>" ) + .withType("JsonNullable<@DecimalMax(\"10\") BigDecimal>") .toType() .assertProperty("stringDefaultNullable") - .withType( "JsonNullable<@Size(max = 1) String>" ) + .withType("JsonNullable<@Size(max = 1) String>") .toType() .fileContains("stringDefaultNullable = JsonNullable.undefined();") @@ -3725,96 +3727,96 @@ public void testModelsWithOptionalAndJsonNullable() throws IOException { .hasImports("jakarta.validation.constraints") .assertProperty("name") - .withType( "String" ) + .withType("String") .toType() .assertProperty("age") - .withType( "JsonNullable" ) + .withType("JsonNullable") .toType() .assertProperty("alias") - .withType( "JsonNullable" ) + .withType("JsonNullable") .toType() .assertProperty("color") - .withType( "Optional" ) + .withType("Optional") .toType() .assertProperty("names") - .withType( "List" ) + .withType("List") .toType() .assertProperty("colors") - .withType( "JsonNullable>" ) + .withType("JsonNullable>") .toType() .assertProperty("stringPattern") - .withType( "Optional<@Pattern(regexp = \"[a-z]\") String>" ) + .withType("Optional<@Pattern(regexp = \"[a-z]\") String>") .toType() .assertProperty("stringMaxMinLength") - .withType( "Optional<@Size(min = 1, max = 10) String>" ) + .withType("Optional<@Size(min = 1, max = 10) String>") .toType() .assertProperty("stringMinLength") - .withType( "Optional<@Size(min = 1) String>" ) + .withType("Optional<@Size(min = 1) String>") .toType() .assertProperty("stringMaxLength") - .withType( "Optional<@Size(max = 1) String>" ) + .withType("Optional<@Size(max = 1) String>") .toType() .assertProperty("stringEmail") - .withType( "Optional<@jakarta.validation.constraints.Email String>" ) + .withType("Optional<@jakarta.validation.constraints.Email String>") .toType() .assertProperty("intMinMax") - .withType( "Optional<@Min(1) @Max(10) Integer>" ) + .withType("Optional<@Min(1) @Max(10) Integer>") .toType() .assertProperty("intMin") - .withType( "Optional<@Min(1) Integer>" ) + .withType("Optional<@Min(1) Integer>") .toType() .assertProperty("intMax") - .withType( "Optional<@Max(10) Integer>" ) + .withType("Optional<@Max(10) Integer>") .toType() .assertProperty("numberMinMax") - .withType( "Optional<@DecimalMin(\"1\") @DecimalMax(\"10\") BigDecimal>" ) + .withType("Optional<@DecimalMin(\"1\") @DecimalMax(\"10\") BigDecimal>") .toType() .assertProperty("numberMin") - .withType( "Optional<@DecimalMin(\"1\") BigDecimal>" ) + .withType("Optional<@DecimalMin(\"1\") BigDecimal>") .toType() .assertProperty("numberMax") - .withType( "Optional<@DecimalMax(\"10\") BigDecimal>" ) + .withType("Optional<@DecimalMax(\"10\") BigDecimal>") .toType() .assertProperty("stringDefault") - .withType( "Optional<@Size(max = 1) String>" ) + .withType("Optional<@Size(max = 1) String>") .toType() .fileContains("stringDefault = Optional.of(\"ABC\")") .assertProperty("zebra") - .withType( "Optional" ) + .withType("Optional") .toType() .assertProperty("stringPatternNullable") - .withType( "JsonNullable<@Pattern(regexp = \"[a-z]\") String>" ) + .withType("JsonNullable<@Pattern(regexp = \"[a-z]\") String>") .toType() .assertProperty("stringMaxMinLengthNullable") - .withType( "JsonNullable<@Size(min = 1, max = 10) String>" ) + .withType("JsonNullable<@Size(min = 1, max = 10) String>") .toType() .assertProperty("stringMinLengthNullable") - .withType( "JsonNullable<@Size(min = 1) String>" ) + .withType("JsonNullable<@Size(min = 1) String>") .toType() .assertProperty("stringMaxLengthNullable") - .withType( "JsonNullable<@Size(max = 1) String>" ) + .withType("JsonNullable<@Size(max = 1) String>") .toType() .assertProperty("intMinMaxNullable") - .withType( "JsonNullable<@Min(1) @Max(10) Integer>" ) + .withType("JsonNullable<@Min(1) @Max(10) Integer>") .toType() .assertProperty("intMinNullable") - .withType( "JsonNullable<@Min(1) Integer>" ) + .withType("JsonNullable<@Min(1) Integer>") .toType() .assertProperty("intMaxNullable") - .withType( "JsonNullable<@Max(10) Integer>" ) + .withType("JsonNullable<@Max(10) Integer>") .toType() .assertProperty("numberMinMaxNullable") - .withType( "JsonNullable<@DecimalMin(\"1\") @DecimalMax(\"10\") BigDecimal>" ) + .withType("JsonNullable<@DecimalMin(\"1\") @DecimalMax(\"10\") BigDecimal>") .toType() .assertProperty("numberMinNullable") - .withType( "JsonNullable<@DecimalMin(\"1\") BigDecimal>" ) + .withType("JsonNullable<@DecimalMin(\"1\") BigDecimal>") .toType() .assertProperty("numberMaxNullable") - .withType( "JsonNullable<@DecimalMax(\"10\") BigDecimal>" ) + .withType("JsonNullable<@DecimalMax(\"10\") BigDecimal>") .toType() .assertProperty("stringDefaultNullable") - .withType( "JsonNullable<@Size(max = 1) String>" ) + .withType("JsonNullable<@Size(max = 1) String>") .toType() .fileContains("stringDefaultNullable = JsonNullable.undefined();") @@ -3825,7 +3827,7 @@ public void testModelsWithOptionalAndJsonNullable() throws IOException { .hasType("String") .toMethod() .toFileAssert() - // Setter method assertions + // Setter method assertions .assertMethod("setName") .hasReturnType("void") .assertParameter("name") @@ -3878,34 +3880,34 @@ public void testModelsWithOptionalAndJsonNullable() throws IOException { .doesNotHaveParameters() .toFileAssert(); - assertJsonNullableMethod(javaFileAssert, String.class, "alias", "JsonNullable"); - assertJsonNullableMethod(javaFileAssert, Integer.class, "age", "JsonNullable"); - assertOptionalMethod(javaFileAssert, String.class, "color", "Optional"); - - assertOptionalMethod(javaFileAssert, String.class, "stringPattern", "Optional<@Pattern(regexp = \"[a-z]\") String>"); - assertOptionalMethod(javaFileAssert, String.class, "stringMaxMinLength", "Optional<@Size(min = 1, max = 10) String>"); - assertOptionalMethod(javaFileAssert, String.class, "stringMinLength", "Optional<@Size(min = 1) String>"); - assertOptionalMethod(javaFileAssert, String.class, "stringMaxLength", "Optional<@Size(max = 1) String>"); - assertOptionalMethod(javaFileAssert, String.class, "stringEmail", "Optional<@jakarta.validation.constraints.Email String>"); - assertOptionalMethod(javaFileAssert, Integer.class, "intMinMax", "Optional<@Min(1) @Max(10) Integer>"); - assertOptionalMethod(javaFileAssert, Integer.class, "intMin", "Optional<@Min(1) Integer>"); - assertOptionalMethod(javaFileAssert, Integer.class, "intMax", "Optional<@Max(10) Integer>"); - assertOptionalMethod(javaFileAssert, BigDecimal.class, "numberMinMax", "Optional<@DecimalMin(\"1\") @DecimalMax(\"10\") BigDecimal>"); - assertOptionalMethod(javaFileAssert, BigDecimal.class, "numberMin", "Optional<@DecimalMin(\"1\") BigDecimal>"); - assertOptionalMethod(javaFileAssert, BigDecimal.class, "numberMax", "Optional<@DecimalMax(\"10\") BigDecimal>"); - assertOptionalMethod(javaFileAssert,"Zebra", "zebra", "Optional"); - - assertJsonNullableMethod(javaFileAssert, String.class, "stringPatternNullable", "JsonNullable<@Pattern(regexp = \"[a-z]\") String>"); - assertJsonNullableMethod(javaFileAssert, String.class, "stringMaxMinLengthNullable", "JsonNullable<@Size(min = 1, max = 10) String>"); - assertJsonNullableMethod(javaFileAssert, String.class, "stringMinLengthNullable", "JsonNullable<@Size(min = 1) String>"); - assertJsonNullableMethod(javaFileAssert, String.class, "stringMaxLengthNullable", "JsonNullable<@Size(max = 1) String>"); - assertJsonNullableMethod(javaFileAssert, String.class, "stringEmailNullable", "JsonNullable<@jakarta.validation.constraints.Email String>"); - assertJsonNullableMethod(javaFileAssert, Integer.class, "intMinMaxNullable", "JsonNullable<@Min(1) @Max(10) Integer>"); - assertJsonNullableMethod(javaFileAssert, Integer.class, "intMinNullable", "JsonNullable<@Min(1) Integer>"); - assertJsonNullableMethod(javaFileAssert, Integer.class, "intMaxNullable", "JsonNullable<@Max(10) Integer>"); - assertJsonNullableMethod(javaFileAssert, BigDecimal.class, "numberMinMaxNullable", "JsonNullable<@DecimalMin(\"1\") @DecimalMax(\"10\") BigDecimal>"); - assertJsonNullableMethod(javaFileAssert, BigDecimal.class, "numberMinNullable", "JsonNullable<@DecimalMin(\"1\") BigDecimal>"); - assertJsonNullableMethod(javaFileAssert, BigDecimal.class, "numberMaxNullable", "JsonNullable<@DecimalMax(\"10\") BigDecimal>"); + assertJsonNullableMethod(javaFileAssert, String.class, "alias", "JsonNullable"); + assertJsonNullableMethod(javaFileAssert, Integer.class, "age", "JsonNullable"); + assertOptionalMethod(javaFileAssert, String.class, "color", "Optional"); + + assertOptionalMethod(javaFileAssert, String.class, "stringPattern", "Optional<@Pattern(regexp = \"[a-z]\") String>"); + assertOptionalMethod(javaFileAssert, String.class, "stringMaxMinLength", "Optional<@Size(min = 1, max = 10) String>"); + assertOptionalMethod(javaFileAssert, String.class, "stringMinLength", "Optional<@Size(min = 1) String>"); + assertOptionalMethod(javaFileAssert, String.class, "stringMaxLength", "Optional<@Size(max = 1) String>"); + assertOptionalMethod(javaFileAssert, String.class, "stringEmail", "Optional<@jakarta.validation.constraints.Email String>"); + assertOptionalMethod(javaFileAssert, Integer.class, "intMinMax", "Optional<@Min(1) @Max(10) Integer>"); + assertOptionalMethod(javaFileAssert, Integer.class, "intMin", "Optional<@Min(1) Integer>"); + assertOptionalMethod(javaFileAssert, Integer.class, "intMax", "Optional<@Max(10) Integer>"); + assertOptionalMethod(javaFileAssert, BigDecimal.class, "numberMinMax", "Optional<@DecimalMin(\"1\") @DecimalMax(\"10\") BigDecimal>"); + assertOptionalMethod(javaFileAssert, BigDecimal.class, "numberMin", "Optional<@DecimalMin(\"1\") BigDecimal>"); + assertOptionalMethod(javaFileAssert, BigDecimal.class, "numberMax", "Optional<@DecimalMax(\"10\") BigDecimal>"); + assertOptionalMethod(javaFileAssert, "Zebra", "zebra", "Optional"); + + assertJsonNullableMethod(javaFileAssert, String.class, "stringPatternNullable", "JsonNullable<@Pattern(regexp = \"[a-z]\") String>"); + assertJsonNullableMethod(javaFileAssert, String.class, "stringMaxMinLengthNullable", "JsonNullable<@Size(min = 1, max = 10) String>"); + assertJsonNullableMethod(javaFileAssert, String.class, "stringMinLengthNullable", "JsonNullable<@Size(min = 1) String>"); + assertJsonNullableMethod(javaFileAssert, String.class, "stringMaxLengthNullable", "JsonNullable<@Size(max = 1) String>"); + assertJsonNullableMethod(javaFileAssert, String.class, "stringEmailNullable", "JsonNullable<@jakarta.validation.constraints.Email String>"); + assertJsonNullableMethod(javaFileAssert, Integer.class, "intMinMaxNullable", "JsonNullable<@Min(1) @Max(10) Integer>"); + assertJsonNullableMethod(javaFileAssert, Integer.class, "intMinNullable", "JsonNullable<@Min(1) Integer>"); + assertJsonNullableMethod(javaFileAssert, Integer.class, "intMaxNullable", "JsonNullable<@Max(10) Integer>"); + assertJsonNullableMethod(javaFileAssert, BigDecimal.class, "numberMinMaxNullable", "JsonNullable<@DecimalMin(\"1\") @DecimalMax(\"10\") BigDecimal>"); + assertJsonNullableMethod(javaFileAssert, BigDecimal.class, "numberMinNullable", "JsonNullable<@DecimalMin(\"1\") BigDecimal>"); + assertJsonNullableMethod(javaFileAssert, BigDecimal.class, "numberMaxNullable", "JsonNullable<@DecimalMax(\"10\") BigDecimal>"); } @@ -3941,96 +3943,96 @@ public void testModelsWithOptionalAndNoneJsonNullable() throws IOException { .hasImports("jakarta.validation.constraints") .assertProperty("name") - .withType( "String" ) + .withType("String") .toType() .assertProperty("age") - .withType( "Integer" ) + .withType("Integer") .toType() .assertProperty("alias") - .withType( "String" ) + .withType("String") .toType() .assertProperty("color") - .withType( "String" ) + .withType("String") .toType() .assertProperty("names") - .withType( "List" ) + .withType("List") .toType() .assertProperty("colors") - .withType( "List" ) + .withType("List") .toType() .assertProperty("stringPattern") - .withType( "String" ) + .withType("String") .toType() .assertProperty("stringMaxMinLength") - .withType( "String" ) + .withType("String") .toType() .assertProperty("stringMinLength") - .withType( "String" ) + .withType("String") .toType() .assertProperty("stringMaxLength") - .withType( "String" ) + .withType("String") .toType() .assertProperty("stringEmail") - .withType( "String" ) + .withType("String") .toType() .assertProperty("intMinMax") - .withType( "Integer" ) + .withType("Integer") .toType() .assertProperty("intMin") - .withType( "Integer" ) + .withType("Integer") .toType() .assertProperty("intMax") - .withType( "Integer" ) + .withType("Integer") .toType() .assertProperty("numberMinMax") - .withType( "BigDecimal" ) + .withType("BigDecimal") .toType() .assertProperty("numberMin") - .withType( "BigDecimal" ) + .withType("BigDecimal") .toType() .assertProperty("numberMax") - .withType( "BigDecimal" ) + .withType("BigDecimal") .toType() .assertProperty("stringDefault") - .withType( "String" ) + .withType("String") .toType() .fileContains("stringDefault = \"ABC\"") .assertProperty("zebra") - .withType( "Zebra" ) + .withType("Zebra") .toType() .assertProperty("stringPatternNullable") - .withType( "String" ) + .withType("String") .toType() .assertProperty("stringMaxMinLengthNullable") - .withType( "String" ) + .withType("String") .toType() .assertProperty("stringMinLengthNullable") - .withType( "String" ) + .withType("String") .toType() .assertProperty("stringMaxLengthNullable") - .withType( "String" ) + .withType("String") .toType() .assertProperty("intMinMaxNullable") - .withType( "Integer" ) + .withType("Integer") .toType() .assertProperty("intMinNullable") - .withType( "Integer" ) + .withType("Integer") .toType() .assertProperty("intMaxNullable") - .withType( "Integer" ) + .withType("Integer") .toType() .assertProperty("numberMinMaxNullable") - .withType( "BigDecimal" ) + .withType("BigDecimal") .toType() .assertProperty("numberMinNullable") - .withType( "BigDecimal" ) + .withType("BigDecimal") .toType() .assertProperty("numberMaxNullable") - .withType( "BigDecimal" ) + .withType("BigDecimal") .toType() .assertProperty("stringDefaultNullable") - .withType( "String" ) + .withType("String") .toType() .fileContains("stringDefaultNullable = null;") @@ -4176,96 +4178,96 @@ public void testModelsWithNoneOptionalAndNoneOpenApiNullable() throws IOExceptio .hasImports("jakarta.validation.constraints") .assertProperty("name") - .withType( "String" ) + .withType("String") .toType() .assertProperty("age") - .withType( "Integer" ) + .withType("Integer") .toType() .assertProperty("alias") - .withType( "String" ) + .withType("String") .toType() .assertProperty("color") - .withType( "String" ) + .withType("String") .toType() .assertProperty("names") - .withType( "List" ) + .withType("List") .toType() .assertProperty("colors") - .withType( "List" ) + .withType("List") .toType() .assertProperty("stringPattern") - .withType( "String" ) + .withType("String") .toType() .assertProperty("stringMaxMinLength") - .withType( "String" ) + .withType("String") .toType() .assertProperty("stringMinLength") - .withType( "String" ) + .withType("String") .toType() .assertProperty("stringMaxLength") - .withType( "String" ) + .withType("String") .toType() .assertProperty("stringEmail") - .withType( "String" ) + .withType("String") .toType() .assertProperty("intMinMax") - .withType( "Integer" ) + .withType("Integer") .toType() .assertProperty("intMin") - .withType( "Integer" ) + .withType("Integer") .toType() .assertProperty("intMax") - .withType( "Integer" ) + .withType("Integer") .toType() .assertProperty("numberMinMax") - .withType( "BigDecimal" ) + .withType("BigDecimal") .toType() .assertProperty("numberMin") - .withType( "BigDecimal" ) + .withType("BigDecimal") .toType() .assertProperty("numberMax") - .withType( "BigDecimal" ) + .withType("BigDecimal") .toType() .assertProperty("stringDefault") - .withType( "String" ) + .withType("String") .toType() .fileContains("stringDefault = \"ABC\"") .assertProperty("zebra") - .withType( "Zebra" ) + .withType("Zebra") .toType() .assertProperty("stringPatternNullable") - .withType( "String" ) + .withType("String") .toType() .assertProperty("stringMaxMinLengthNullable") - .withType( "String" ) + .withType("String") .toType() .assertProperty("stringMinLengthNullable") - .withType( "String" ) + .withType("String") .toType() .assertProperty("stringMaxLengthNullable") - .withType( "String" ) + .withType("String") .toType() .assertProperty("intMinMaxNullable") - .withType( "Integer" ) + .withType("Integer") .toType() .assertProperty("intMinNullable") - .withType( "Integer" ) + .withType("Integer") .toType() .assertProperty("intMaxNullable") - .withType( "Integer" ) + .withType("Integer") .toType() .assertProperty("numberMinMaxNullable") - .withType( "BigDecimal" ) + .withType("BigDecimal") .toType() .assertProperty("numberMinNullable") - .withType( "BigDecimal" ) + .withType("BigDecimal") .toType() .assertProperty("numberMaxNullable") - .withType( "BigDecimal" ) + .withType("BigDecimal") .toType() .assertProperty("stringDefaultNullable") - .withType( "String" ) + .withType("String") .toType() .fileContains("stringDefaultNullable = null;") @@ -4378,71 +4380,71 @@ public void testModelsWithNoneOptionalAndNoneOpenApiNullable() throws IOExceptio assertMethod(javaFileAssert, BigDecimal.class, "numberMaxNullable"); } - - private void assertOptionalMethod(JavaFileAssert javaFileAssert, Class type, String expectedName, String getterReturnType){ + + private void assertOptionalMethod(JavaFileAssert javaFileAssert, Class type, String expectedName, String getterReturnType) { assertOptionalMethod(javaFileAssert, type.getSimpleName(), expectedName, getterReturnType); } - private void assertOptionalMethod(JavaFileAssert javaFileAssert, String type, String expectedName, String getterReturnType){ + private void assertOptionalMethod(JavaFileAssert javaFileAssert, String type, String expectedName, String getterReturnType) { assertWrapperMethod(javaFileAssert, "Optional", type, expectedName, getterReturnType); } - private void assertJsonNullableMethod(JavaFileAssert javaFileAssert, Class type, String expectedName, String getterReturnType){ + private void assertJsonNullableMethod(JavaFileAssert javaFileAssert, Class type, String expectedName, String getterReturnType) { assertJsonNullableMethod(javaFileAssert, type.getSimpleName(), expectedName, getterReturnType); } - private void assertJsonNullableMethod(JavaFileAssert javaFileAssert, String type, String expectedName, String getterReturnType){ + private void assertJsonNullableMethod(JavaFileAssert javaFileAssert, String type, String expectedName, String getterReturnType) { assertWrapperMethod(javaFileAssert, "JsonNullable", type, expectedName, getterReturnType); } - private void assertWrapperMethod(JavaFileAssert javaFileAssert, String wrapperType, String type, String expectedName, String getterReturnType){ + private void assertWrapperMethod(JavaFileAssert javaFileAssert, String wrapperType, String type, String expectedName, String getterReturnType) { String methodName = StringUtils.capitalize(expectedName); javaFileAssert.assertMethod(expectedName) .hasReturnType("Animal") - .bodyContainsLines("this."+expectedName+" = "+wrapperType+".of("+expectedName+");", "return this;") + .bodyContainsLines("this." + expectedName + " = " + wrapperType + ".of(" + expectedName + ");", "return this;") .assertParameter(expectedName) .hasType(type) .toMethod() .toFileAssert() // Setter method assertions - .assertMethod("set"+methodName) + .assertMethod("set" + methodName) .hasReturnType("void") .assertParameter(expectedName) - .hasType(wrapperType+"<"+type+">") + .hasType(wrapperType + "<" + type + ">") .toMethod() .toFileAssert() // Getter method assertions - .assertMethod("get"+methodName) + .assertMethod("get" + methodName) .hasReturnType(getterReturnType) .doesNotHaveParameters() .toFileAssert(); } - private void assertMethod(JavaFileAssert javaFileAssert, String type, String expectedName){ + private void assertMethod(JavaFileAssert javaFileAssert, String type, String expectedName) { String methodName = StringUtils.capitalize(expectedName); javaFileAssert.assertMethod(expectedName) .hasReturnType("Animal") - .bodyContainsLines("this."+expectedName+" = "+ expectedName + ";", "return this;") + .bodyContainsLines("this." + expectedName + " = " + expectedName + ";", "return this;") .assertParameter(expectedName) .hasType(type) .toMethod() .toFileAssert() // Setter method assertions - .assertMethod("set"+methodName) + .assertMethod("set" + methodName) .hasReturnType("void") .assertParameter(expectedName) .hasType(type) .toMethod() .toFileAssert() // Getter method assertions - .assertMethod("get"+methodName) + .assertMethod("get" + methodName) .hasReturnType(type) .doesNotHaveParameters() .toFileAssert(); } - private void assertMethod(JavaFileAssert javaFileAssert, Class type, String expectedName){ - assertMethod(javaFileAssert,type.getSimpleName(), expectedName); + private void assertMethod(JavaFileAssert javaFileAssert, Class type, String expectedName) { + assertMethod(javaFileAssert, type.getSimpleName(), expectedName); } @@ -4625,7 +4627,7 @@ public void testAllArgsConstructor_16797_REFACTOR_ALLOF_WITH_PROPERTIES_ONLY() t @Test public void testMultiInheritanceParentRequiredParams_issue16797() throws IOException { final Map output = generateFromContract( - "src/test/resources/3_0/spring/issue_16797.yaml", SPRING_BOOT, Map.of(INTERFACE_ONLY, "true") + "src/test/resources/3_0/spring/issue_16797.yaml", SPRING_BOOT, Map.of(INTERFACE_ONLY, "true") ); // constructor should as // public Object4(Type1 pageInfo, String responseType, String requestId, Boolean success) { @@ -4643,7 +4645,7 @@ public void testMultiInheritanceParentRequiredParams_issue16797() throws IOExcep @Test public void testMultiInheritanceParentRequiredParams_issue15796() throws IOException { final Map output = generateFromContract( - "src/test/resources/3_0/spring/issue_15796.yaml", SPRING_BOOT, Map.of(INTERFACE_ONLY, "true") + "src/test/resources/3_0/spring/issue_15796.yaml", SPRING_BOOT, Map.of(INTERFACE_ONLY, "true") ); // constructor should as this //public Poodle(String race, String type) { @@ -4718,9 +4720,9 @@ public void generateAllArgsConstructor() throws IOException { @Test public void allOfDuplicatedProperties() throws IOException { Map output = generateFromContract( - "src/test/resources/3_0/allOfDuplicatedProperties.yaml", - SPRING_BOOT, - Map.of(GENERATE_CONSTRUCTOR_WITH_ALL_ARGS, true, INTERFACE_ONLY, "true") + "src/test/resources/3_0/allOfDuplicatedProperties.yaml", + SPRING_BOOT, + Map.of(GENERATE_CONSTRUCTOR_WITH_ALL_ARGS, true, INTERFACE_ONLY, "true") ); JavaFileAssert.assertThat(output.get("ModelC.java")) @@ -4775,14 +4777,14 @@ public void testLombokAnnotations() throws IOException { @Test void testBuilderJavaSpring_noOptional() throws IOException { Map files = generateFromContract( - "src/test/resources/3_0/java/builder.yaml", - SPRING_BOOT, - Map.of( - GENERATE_BUILDERS, true, - SpringCodegen.OPENAPI_NULLABLE, false, - SpringCodegen.USE_OPTIONAL, false, - INTERFACE_ONLY, "true" - ) + "src/test/resources/3_0/java/builder.yaml", + SPRING_BOOT, + Map.of( + GENERATE_BUILDERS, true, + SpringCodegen.OPENAPI_NULLABLE, false, + SpringCodegen.USE_OPTIONAL, false, + INTERFACE_ONLY, "true" + ) ); JavaFileAssert.assertThat(files.get("Pet.java")) @@ -4804,14 +4806,14 @@ void testBuilderJavaSpring_noOptional() throws IOException { @Test void testBuilderJavaSpring_useOptional() throws IOException { Map files = generateFromContract( - "src/test/resources/3_0/java/builder.yaml", - SPRING_BOOT, - Map.of( - GENERATE_BUILDERS, true, - SpringCodegen.OPENAPI_NULLABLE, true, - SpringCodegen.USE_OPTIONAL, true, - INTERFACE_ONLY, "true" - ) + "src/test/resources/3_0/java/builder.yaml", + SPRING_BOOT, + Map.of( + GENERATE_BUILDERS, true, + SpringCodegen.OPENAPI_NULLABLE, true, + SpringCodegen.USE_OPTIONAL, true, + INTERFACE_ONLY, "true" + ) ); JavaFileAssert.assertThat(files.get("Pet.java")) @@ -4854,7 +4856,7 @@ public void optionalListShouldBeEmpty() throws IOException { DefaultGenerator generator = new DefaultGenerator(); generator.setGenerateMetadata(false); // skip metadata and ↓ only generate models generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "true"); - + Map files = generator.opts(input).generate().stream() .collect(Collectors.toMap(File::getName, Function.identity())); @@ -4888,7 +4890,7 @@ public void testCollectionTypesWithDefaults_issue_18102() throws IOException { DefaultGenerator generator = new DefaultGenerator(); generator.setGenerateMetadata(false); // skip metadata and ↓ only generate models generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "true"); - + Map files = generator.opts(input).generate().stream() .collect(Collectors.toMap(File::getName, Function.identity())); @@ -4964,139 +4966,165 @@ public void testEnumUnknownDefaultCaseDeserializationNotSet_issue13241() throws * Includes regression tests for: * - Correct Jackson annotation when `wrapped: false` */ - @Test void shouldGenerateCorrectXmlAnnotations() { + @Test + void shouldGenerateCorrectXmlAnnotations() { // Arrange final CodegenConfigurator config = new CodegenConfigurator() - .addAdditionalProperty(CodegenConstants.WITH_XML, true) - .addGlobalProperty(CodegenConstants.MODELS, "Pet") - .setGeneratorName("spring") - .setInputSpec("src/test/resources/3_0/java/xml-annotations-test.yaml") - .setLibrary(SPRING_BOOT) - .setOutputDir(newTempFolder().toString()); + .addAdditionalProperty(CodegenConstants.WITH_XML, true) + .addGlobalProperty(CodegenConstants.MODELS, "Pet") + .setGeneratorName("spring") + .setInputSpec("src/test/resources/3_0/java/xml-annotations-test.yaml") + .setLibrary(SPRING_BOOT) + .setOutputDir(newTempFolder().toString()); // Act final List files = new DefaultGenerator().opts(config.toClientOptInput()).generate(); // Assert JavaFileAssert.assertThat(files.get(0)) - .assertTypeAnnotations() - .containsWithNameAndAttributes("JacksonXmlRootElement", Map.of("localName", "\"Pet\"", "namespace", "\"urn:jacksonxml\"")) - .containsWithNameAndAttributes("XmlRootElement", Map.of("name", "\"Pet\"", "namespace", "\"urn:jacksonxml\"")) - .containsWithNameAndAttributes("XmlAccessorType", Map.of("value", "XmlAccessType.FIELD")) - .toType() - - // ↓ test custom-name on wrapper element (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Use%20xml/name%20to%20give%20different%20names) - .assertMethod("getTags") - .doesNotHaveAnnotation("XmlAttribute") - .hasAnnotation("XmlElement", Map.of("name", "\"Tag\"")) - .hasAnnotation("XmlElementWrapper", Map.of("name", "\"TagList\"")) - .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"Tag\"")) - .hasAnnotation("JacksonXmlElementWrapper", Map.of("localName", "\"TagList\"", "useWrapping", "true")) - .toFileAssert() - - // ↓ custom internal xml-array element name, non-wrapped (1st example in https://spec.openapis.org/oas/v3.0.0#xml-arrays) - .assertMethod("getFriends") - .doesNotHaveAnnotation("XmlAttribute") - .doesNotHaveAnnotation("XmlElementWrapper") - .hasAnnotation("XmlElement", Map.of("name", "\"friend-pet\"")) - .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"friend-pet\"")) - .hasAnnotation("JacksonXmlElementWrapper", Map.of("useWrapping", "false")) - .toFileAssert() - - // ↓ test custom element name (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Change%20Element%20Names) - .assertMethod("getStatus") - .doesNotHaveAnnotation("XmlAttribute") - .doesNotHaveAnnotation("XmlElementWrapper") - .hasAnnotation("XmlElement", Map.of("name", "\"PetStatus\"")) - .doesNotHaveAnnotation("JacksonXmlElementWrapper") - .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"PetStatus\"")) - .toFileAssert() - - // ↓ test same-name wrapping element (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Wrapping%20Arrays) - // maps to 3rd example in https://spec.openapis.org/oas/v3.0.0#xml-arrays - .assertMethod("getPhotoUrls") - .doesNotHaveAnnotation("XmlAttribute") - .hasAnnotation("XmlElement", Map.of("name", "\"photoUrls\"")) - .hasAnnotation("XmlElementWrapper", Map.of("name", "\"photoUrls\"")) - .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"photoUrls\"")) - .hasAnnotation("JacksonXmlElementWrapper", Map.of("localName", "\"photoUrls\"", "useWrapping", "true")) - .toFileAssert() - - // ↓ test attribute generation (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Convert%20Property%20to%20an%20Attribute) - .assertMethod("getName") - .doesNotHaveAnnotation("XmlElement") - .doesNotHaveAnnotation("XmlElementWrapper") - .hasAnnotation("XmlAttribute", Map.of("name", "\"name\"")) - .doesNotHaveAnnotation("JacksonXmlElementWrapper") - .hasAnnotation("JacksonXmlProperty", Map.of("isAttribute", "true", "localName", "\"name\"")) - .toFileAssert() - - // ↓ test XML namespace and prefix (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Prefixes%20and%20Namespaces) - .assertMethod("getId") - .doesNotHaveAnnotation("XmlAttribute") - .doesNotHaveAnnotation("XmlElementWrapper") - .hasAnnotation("XmlElement", Map.of("name", "\"id\"", "namespace", "\"http://example.com/schema\"")) - .doesNotHaveAnnotation("JacksonXmlElementWrapper") - .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"id\"", "namespace", "\"http://example.com/schema\"")) - .toFileAssert() - - // ↓ external xml-array element name only (last example in https://spec.openapis.org/oas/v3.0.0#xml-arrays) - .assertMethod("getFoods") - .doesNotHaveAnnotation("XmlAttribute") - .hasAnnotation("XmlElement", Map.of("name", "\"yummy-yummy\"")) - .hasAnnotation("XmlElementWrapper", Map.of("name", "\"yummy-yummy\"")) - .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"yummy-yummy\"")) - .hasAnnotation("JacksonXmlElementWrapper", Map.of("localName", "\"yummy-yummy\"")) - .toFileAssert() - - // ↓ internal xml-array element name (4th example in https://spec.openapis.org/oas/v3.0.0#xml-arrays) - .assertMethod("getColors") - .doesNotHaveAnnotation("XmlAttribute") - .hasAnnotation("XmlElement", Map.of("name", "\"color\"")) - .hasAnnotation("XmlElementWrapper", Map.of("name", "\"colors\"")) - .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"color\"")) - .hasAnnotation("JacksonXmlElementWrapper", Map.of("localName", "\"colors\"")) - .toFileAssert() - - // ↓ ignored external xml-array element name, non-wrapped (2nd example in https://spec.openapis.org/oas/v3.0.0#xml-arrays) - .assertMethod("getCategories") - .doesNotHaveAnnotation("XmlAttribute") - .doesNotHaveAnnotation("XmlElementWrapper") - .hasAnnotation("XmlElement", Map.of("name", "\"Category\"")) - .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"Category\"")) - // ↓ specific regression test for #2417: (useWrapping=false) needs to be present - .hasAnnotation("JacksonXmlElementWrapper", Map.of("useWrapping", "false")) - .toFileAssert() - - // ↓ test custom-name on wrapper AND children (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Use%20xml/name%20to%20give%20different%20names) - // maps to 5th example in https://spec.openapis.org/oas/v3.0.0#xml-arrays - .assertMethod("getActivities") - .doesNotHaveAnnotation("XmlAttribute") - .hasAnnotation("XmlElement", Map.of("name", "\"item\"")) - .hasAnnotation("XmlElementWrapper", Map.of("name", "\"activities-array\"")) - .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"item\"")) - .hasAnnotation("JacksonXmlElementWrapper", Map.of("localName", "\"activities-array\"")); - } - + .assertTypeAnnotations() + .containsWithNameAndAttributes("JacksonXmlRootElement", Map.of("localName", "\"Pet\"", "namespace", "\"urn:jacksonxml\"")) + .containsWithNameAndAttributes("XmlRootElement", Map.of("name", "\"Pet\"", "namespace", "\"urn:jacksonxml\"")) + .containsWithNameAndAttributes("XmlAccessorType", Map.of("value", "XmlAccessType.FIELD")) + .toType() + + // ↓ test custom-name on wrapper element (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Use%20xml/name%20to%20give%20different%20names) + .assertMethod("getTags") + .doesNotHaveAnnotation("XmlAttribute") + .hasAnnotation("XmlElement", Map.of("name", "\"Tag\"")) + .hasAnnotation("XmlElementWrapper", Map.of("name", "\"TagList\"")) + .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"Tag\"")) + .hasAnnotation("JacksonXmlElementWrapper", Map.of("localName", "\"TagList\"", "useWrapping", "true")) + .toFileAssert() + + // ↓ custom internal xml-array element name, non-wrapped (1st example in https://spec.openapis.org/oas/v3.0.0#xml-arrays) + .assertMethod("getFriends") + .doesNotHaveAnnotation("XmlAttribute") + .doesNotHaveAnnotation("XmlElementWrapper") + .hasAnnotation("XmlElement", Map.of("name", "\"friend-pet\"")) + .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"friend-pet\"")) + .hasAnnotation("JacksonXmlElementWrapper", Map.of("useWrapping", "false")) + .toFileAssert() + + // ↓ test custom element name (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Change%20Element%20Names) + .assertMethod("getStatus") + .doesNotHaveAnnotation("XmlAttribute") + .doesNotHaveAnnotation("XmlElementWrapper") + .hasAnnotation("XmlElement", Map.of("name", "\"PetStatus\"")) + .doesNotHaveAnnotation("JacksonXmlElementWrapper") + .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"PetStatus\"")) + .toFileAssert() + + // ↓ test same-name wrapping element (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Wrapping%20Arrays) + // maps to 3rd example in https://spec.openapis.org/oas/v3.0.0#xml-arrays + .assertMethod("getPhotoUrls") + .doesNotHaveAnnotation("XmlAttribute") + .hasAnnotation("XmlElement", Map.of("name", "\"photoUrls\"")) + .hasAnnotation("XmlElementWrapper", Map.of("name", "\"photoUrls\"")) + .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"photoUrls\"")) + .hasAnnotation("JacksonXmlElementWrapper", Map.of("localName", "\"photoUrls\"", "useWrapping", "true")) + .toFileAssert() + + // ↓ test attribute generation (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Convert%20Property%20to%20an%20Attribute) + .assertMethod("getName") + .doesNotHaveAnnotation("XmlElement") + .doesNotHaveAnnotation("XmlElementWrapper") + .hasAnnotation("XmlAttribute", Map.of("name", "\"name\"")) + .doesNotHaveAnnotation("JacksonXmlElementWrapper") + .hasAnnotation("JacksonXmlProperty", Map.of("isAttribute", "true", "localName", "\"name\"")) + .toFileAssert() + + // ↓ test XML namespace and prefix (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Prefixes%20and%20Namespaces) + .assertMethod("getId") + .doesNotHaveAnnotation("XmlAttribute") + .doesNotHaveAnnotation("XmlElementWrapper") + .hasAnnotation("XmlElement", Map.of("name", "\"id\"", "namespace", "\"http://example.com/schema\"")) + .doesNotHaveAnnotation("JacksonXmlElementWrapper") + .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"id\"", "namespace", "\"http://example.com/schema\"")) + .toFileAssert() + + // ↓ external xml-array element name only (last example in https://spec.openapis.org/oas/v3.0.0#xml-arrays) + .assertMethod("getFoods") + .doesNotHaveAnnotation("XmlAttribute") + .hasAnnotation("XmlElement", Map.of("name", "\"yummy-yummy\"")) + .hasAnnotation("XmlElementWrapper", Map.of("name", "\"yummy-yummy\"")) + .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"yummy-yummy\"")) + .hasAnnotation("JacksonXmlElementWrapper", Map.of("localName", "\"yummy-yummy\"")) + .toFileAssert() + + // ↓ internal xml-array element name (4th example in https://spec.openapis.org/oas/v3.0.0#xml-arrays) + .assertMethod("getColors") + .doesNotHaveAnnotation("XmlAttribute") + .hasAnnotation("XmlElement", Map.of("name", "\"color\"")) + .hasAnnotation("XmlElementWrapper", Map.of("name", "\"colors\"")) + .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"color\"")) + .hasAnnotation("JacksonXmlElementWrapper", Map.of("localName", "\"colors\"")) + .toFileAssert() + + // ↓ ignored external xml-array element name, non-wrapped (2nd example in https://spec.openapis.org/oas/v3.0.0#xml-arrays) + .assertMethod("getCategories") + .doesNotHaveAnnotation("XmlAttribute") + .doesNotHaveAnnotation("XmlElementWrapper") + .hasAnnotation("XmlElement", Map.of("name", "\"Category\"")) + .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"Category\"")) + // ↓ specific regression test for #2417: (useWrapping=false) needs to be present + .hasAnnotation("JacksonXmlElementWrapper", Map.of("useWrapping", "false")) + .toFileAssert() + + // ↓ test custom-name on wrapper AND children (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Use%20xml/name%20to%20give%20different%20names) + // maps to 5th example in https://spec.openapis.org/oas/v3.0.0#xml-arrays + .assertMethod("getActivities") + .doesNotHaveAnnotation("XmlAttribute") + .hasAnnotation("XmlElement", Map.of("name", "\"item\"")) + .hasAnnotation("XmlElementWrapper", Map.of("name", "\"activities-array\"")) + .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"item\"")) + .hasAnnotation("JacksonXmlElementWrapper", Map.of("localName", "\"activities-array\"")); + } + /** * Regression test for #12804 */ - @Test public void shouldGenerateSingleDeprecatedAnnotation() { + @Test + public void shouldGenerateSingleDeprecatedAnnotation() { final var tempDir = TestUtils.newTempFolder(); final CodegenConfigurator configurator = new CodegenConfigurator() - .addAdditionalProperty(GENERATE_BUILDERS, true) - .addGlobalProperty(CodegenConstants.MODELS, "Pet") - .setInputSpec("src/test/resources/3_0/petstore.yaml") - .setGeneratorName("spring") - .setOutputDir(tempDir.toString()); + .addAdditionalProperty(GENERATE_BUILDERS, true) + .addGlobalProperty(CodegenConstants.MODELS, "Pet") + .setInputSpec("src/test/resources/3_0/petstore.yaml") + .setGeneratorName("spring") + .setOutputDir(tempDir.toString()); new DefaultGenerator().opts(configurator.toClientOptInput()).generate(); JavaFileAssert.assertThat(tempDir.resolve("src/main/java/org/openapitools/model/Pet.java")) - .assertInnerClass("Builder") - .assertMethod("status").hasAnnotation("Deprecated") - .toInnerClassAssert() - .assertMethod("build") - .doesNotHaveAnnotation("Deprecated"); + .assertInnerClass("Builder") + .assertMethod("status").hasAnnotation("Deprecated") + .toInnerClassAssert() + .assertMethod("build") + .doesNotHaveAnnotation("Deprecated"); + } + + @Test + public void testRequestBodyFormParamsDefaultValue() { + final var tempDir = TestUtils.newTempFolder(); + final CodegenConfigurator configurator = new CodegenConfigurator() + .setInputSpec("src/test/resources/3_0/spring/formParams_defaultValue.yaml") + .setGeneratorName("spring") + .setOutputDir(tempDir.toString()); + + new DefaultGenerator().opts(configurator.toClientOptInput()).generate(); + + JavaFileAssert.assertThat(tempDir.resolve("src/main/java/org/openapitools/api/SomeApi.java")) + .assertMethod("someDummyEndpoint", "String", "String") + .assertParameter("productId") + .assertParameterAnnotations() + .containsWithNameAndAttributes("RequestParam", + Map.of("value", "\"product_id\"", "required", "true")) + .toParameter().toMethod() + .assertParameter("locale") + .assertParameterAnnotations() + .containsWithNameAndAttributes("RequestParam", + Map.of("value", "\"locale\"", "required", "false", "defaultValue", "\"en_US\"")); } + } diff --git a/modules/openapi-generator/src/test/resources/3_0/spring/formParams_defaultValue.yaml b/modules/openapi-generator/src/test/resources/3_0/spring/formParams_defaultValue.yaml new file mode 100644 index 000000000000..51999928d769 --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/spring/formParams_defaultValue.yaml @@ -0,0 +1,42 @@ +openapi: 3.0.0 +info: + version: "1.0.0" + title: formParams-defaultValue-test +paths: + /some/dummy/endpoint: + post: + operationId: someDummyEndpoint + requestBody: + required: true + content: + application/x-www-form-urlencoded: + schema: + $ref: '#/components/schemas/DummyRequest' + responses: + 200: + description: Successfully created + content: + application/json: + schema: + type: object + additionalProperties: + $ref: '#/components/schemas/DummyResponse' +components: + schemas: + DummyResponse: + required: + - status + type: object + properties: + status: + type: string + DummyRequest: + required: + - product_id + type: object + properties: + product_id: + type: string + locale: + type: string + default: "en_US" \ No newline at end of file From ce89695bb627377eb0aa732c1983fd39a9656848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Mar=C3=ADa=20Lora?= Date: Fri, 13 Dec 2024 12:22:00 +0100 Subject: [PATCH 2/3] chore: remove unwanted formatting changes --- .../java/spring/SpringCodegenTest.java | 1104 ++++++++--------- 1 file changed, 550 insertions(+), 554 deletions(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java index 933c1516ecf0..0b441cf9d5a8 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java @@ -740,25 +740,25 @@ public void testAdditionalProperties_issue1466() throws IOException { final Map files = generateFiles(codegen, "src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml"); JavaFileAssert.assertThat(files.get("AdditionalPropertiesAnyType.java")) - .assertProperty("additionalProperties").withType("Map") - .toType() - .assertMethod("putAdditionalProperty", "String", "Object") - .toFileAssert() - .assertMethod("getAdditionalProperty", "String").hasReturnType("Object"); + .assertProperty("additionalProperties").withType("Map") + .toType() + .assertMethod("putAdditionalProperty", "String", "Object") + .toFileAssert() + .assertMethod("getAdditionalProperty", "String").hasReturnType("Object"); JavaFileAssert.assertThat(files.get("AdditionalPropertiesArray.java")) - .assertProperty("additionalProperties").withType("Map") - .toType() - .assertMethod("putAdditionalProperty", "String", "List") - .toFileAssert() - .assertMethod("getAdditionalProperty", "String").hasReturnType("List"); + .assertProperty("additionalProperties").withType("Map") + .toType() + .assertMethod("putAdditionalProperty", "String", "List") + .toFileAssert() + .assertMethod("getAdditionalProperty", "String").hasReturnType("List"); JavaFileAssert.assertThat(files.get("AdditionalPropertiesInteger.java")) - .assertProperty("additionalProperties").withType("Map") - .toType() - .assertMethod("putAdditionalProperty", "String", "Integer") - .toFileAssert() - .assertMethod("getAdditionalProperty", "String").hasReturnType("Integer"); + .assertProperty("additionalProperties").withType("Map") + .toType() + .assertMethod("putAdditionalProperty", "String", "Integer") + .toFileAssert() + .assertMethod("getAdditionalProperty", "String").hasReturnType("Integer"); } @Test @@ -767,7 +767,7 @@ public void shouldAddParameterWithInHeaderWhenImplicitHeadersIsTrue_issue14418() output.deleteOnExit(); OpenAPI openAPI = new OpenAPIParser() - .readLocation("src/test/resources/bugs/issue_14418.yaml", null, new ParseOptions()).getOpenAPI(); + .readLocation("src/test/resources/bugs/issue_14418.yaml", null, new ParseOptions()).getOpenAPI(); SpringCodegen codegen = new SpringCodegen(); codegen.setLibrary(SPRING_BOOT); codegen.setOutputDir(output.getAbsolutePath()); @@ -779,23 +779,23 @@ public void shouldAddParameterWithInHeaderWhenImplicitHeadersIsTrue_issue14418() codegen.additionalProperties().put(SpringCodegen.IMPLICIT_HEADERS, "true"); ClientOptInput input = new ClientOptInput() - .openAPI(openAPI) - .config(codegen); + .openAPI(openAPI) + .config(codegen); DefaultGenerator generator = new DefaultGenerator(); generator.setGenerateMetadata(false); Map files = generator.opts(input).generate().stream() - .collect(Collectors.toMap(File::getName, Function.identity())); + .collect(Collectors.toMap(File::getName, Function.identity())); JavaFileAssert.assertThat(files.get("TestApi.java")) - .isInterface() - .hasImports("io.swagger.v3.oas.annotations.enums.ParameterIn") - .assertMethod("test") - .assertMethodAnnotations() - .containsWithNameAndAttributes("Parameters", ImmutableMap.of( - "value", "{ @Parameter(name = \"testHeader\", description = \"Test header\", required = true, in = ParameterIn.HEADER) }" - // in = ParameterIn.HEADER is missing?! - )); + .isInterface() + .hasImports("io.swagger.v3.oas.annotations.enums.ParameterIn") + .assertMethod("test") + .assertMethodAnnotations() + .containsWithNameAndAttributes("Parameters", ImmutableMap.of( + "value", "{ @Parameter(name = \"testHeader\", description = \"Test header\", required = true, in = ParameterIn.HEADER) }" + // in = ParameterIn.HEADER is missing?! + )); } @Test @@ -804,7 +804,7 @@ public void shouldApiNameSuffixForApiClassname() throws IOException { output.deleteOnExit(); OpenAPI openAPI = new OpenAPIParser() - .readLocation("src/test/resources/3_1/petstore.yaml", null, new ParseOptions()).getOpenAPI(); + .readLocation("src/test/resources/3_1/petstore.yaml", null, new ParseOptions()).getOpenAPI(); SpringCodegen codegen = new SpringCodegen(); codegen.setLibrary(SPRING_CLOUD_LIBRARY); codegen.setOutputDir(output.getAbsolutePath()); @@ -816,16 +816,16 @@ public void shouldApiNameSuffixForApiClassname() throws IOException { ClientOptInput input = new ClientOptInput() - .openAPI(openAPI) - .config(codegen); + .openAPI(openAPI) + .config(codegen); DefaultGenerator generator = new DefaultGenerator(); generator.setGenerateMetadata(false); Map files = generator.opts(input).generate().stream() - .collect(Collectors.toMap(File::getName, Function.identity())); + .collect(Collectors.toMap(File::getName, Function.identity())); JavaFileAssert.assertThat(files.get("PetController.java")) - .isInterface(); + .isInterface(); File notExisting = files.get("PetApi.java"); assertThat(notExisting).isNull(); @@ -837,7 +837,7 @@ public void shouldUseTagsForClassname() throws IOException { output.deleteOnExit(); OpenAPI openAPI = new OpenAPIParser() - .readLocation("src/test/resources/bugs/issue_15933.yaml", null, new ParseOptions()).getOpenAPI(); + .readLocation("src/test/resources/bugs/issue_15933.yaml", null, new ParseOptions()).getOpenAPI(); SpringCodegen codegen = new SpringCodegen(); codegen.setLibrary(SPRING_CLOUD_LIBRARY); codegen.setOutputDir(output.getAbsolutePath()); @@ -849,17 +849,17 @@ public void shouldUseTagsForClassname() throws IOException { ClientOptInput input = new ClientOptInput() - .openAPI(openAPI) - .config(codegen); + .openAPI(openAPI) + .config(codegen); DefaultGenerator generator = new DefaultGenerator(); generator.setGenerateMetadata(false); Map files = generator.opts(input).generate().stream() - .collect(Collectors.toMap(File::getName, Function.identity())); + .collect(Collectors.toMap(File::getName, Function.identity())); JavaFileAssert.assertThat(files.get("PetTagApi.java")) - .isInterface(); + .isInterface(); File notExisting = files.get("PetApi.java"); assertThat(notExisting).isNull(); @@ -871,7 +871,7 @@ public void shouldNotUseTagsForClassname() throws IOException { output.deleteOnExit(); OpenAPI openAPI = new OpenAPIParser() - .readLocation("src/test/resources/bugs/issue_15933.yaml", null, new ParseOptions()).getOpenAPI(); + .readLocation("src/test/resources/bugs/issue_15933.yaml", null, new ParseOptions()).getOpenAPI(); SpringCodegen codegen = new SpringCodegen(); codegen.setLibrary(SPRING_CLOUD_LIBRARY); codegen.setOutputDir(output.getAbsolutePath()); @@ -883,16 +883,16 @@ public void shouldNotUseTagsForClassname() throws IOException { ClientOptInput input = new ClientOptInput() - .openAPI(openAPI) - .config(codegen); + .openAPI(openAPI) + .config(codegen); DefaultGenerator generator = new DefaultGenerator(); generator.setGenerateMetadata(false); Map files = generator.opts(input).generate().stream() - .collect(Collectors.toMap(File::getName, Function.identity())); + .collect(Collectors.toMap(File::getName, Function.identity())); JavaFileAssert.assertThat(files.get("PetApi.java")) - .isInterface(); + .isInterface(); File notExisting = files.get("PetTagApi.java"); assertThat(notExisting).isNull(); @@ -904,7 +904,7 @@ public void shouldAddValidAnnotationIntoCollectionWhenBeanValidationIsEnabled_is output.deleteOnExit(); OpenAPI openAPI = new OpenAPIParser() - .readLocation("src/test/resources/bugs/issue_14723.yaml", null, new ParseOptions()).getOpenAPI(); + .readLocation("src/test/resources/bugs/issue_14723.yaml", null, new ParseOptions()).getOpenAPI(); SpringCodegen codegen = new SpringCodegen(); codegen.setLibrary(SPRING_CLOUD_LIBRARY); codegen.setOutputDir(output.getAbsolutePath()); @@ -914,47 +914,47 @@ public void shouldAddValidAnnotationIntoCollectionWhenBeanValidationIsEnabled_is codegen.additionalProperties().put(CodegenConstants.API_PACKAGE, "xyz.controller"); ClientOptInput input = new ClientOptInput() - .openAPI(openAPI) - .config(codegen); + .openAPI(openAPI) + .config(codegen); DefaultGenerator generator = new DefaultGenerator(); generator.setGenerateMetadata(false); // skip metadata and ↓ only generate models generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "true"); Map files = generator.opts(input).generate().stream() - .collect(Collectors.toMap(File::getName, Function.identity())); + .collect(Collectors.toMap(File::getName, Function.identity())); JavaFileAssert.assertThat(files.get("ResponseTest.java")) - .isNormalClass() - .hasImports("javax.validation.Valid") - .assertProperty("details") - .withType("Map") - .toType() - .assertProperty("response") - .withType("JsonNullable>") - .toType() - .assertProperty("nullableDtos") - .withType("JsonNullable>") - .toType() - .assertProperty("dtos") - .withType("Set<@Valid ResponseTest2>") - .toType() - .assertProperty("listNullableDtos") - .withType("JsonNullable>") - .toType() - .assertProperty("listDtos") - .withType("List<@Valid ResponseTest2>") - .toType() - .assertProperty("nullableStrings") - .withType("JsonNullable>") - .toType() - .assertProperty("strings") - .withType("Set") - .toType() - .assertProperty("nullableInts") - .withType("JsonNullable>") - .toType() - .assertProperty("ints") - .withType("Set"); + .isNormalClass() + .hasImports("javax.validation.Valid") + .assertProperty("details") + .withType( "Map" ) + .toType() + .assertProperty("response") + .withType( "JsonNullable>" ) + .toType() + .assertProperty("nullableDtos") + .withType( "JsonNullable>" ) + .toType() + .assertProperty("dtos") + .withType( "Set<@Valid ResponseTest2>" ) + .toType() + .assertProperty("listNullableDtos") + .withType( "JsonNullable>" ) + .toType() + .assertProperty("listDtos") + .withType( "List<@Valid ResponseTest2>" ) + .toType() + .assertProperty("nullableStrings") + .withType( "JsonNullable>" ) + .toType() + .assertProperty("strings") + .withType( "Set" ) + .toType() + .assertProperty("nullableInts") + .withType( "JsonNullable>" ) + .toType() + .assertProperty("ints") + .withType( "Set" ); } @Test @@ -968,7 +968,7 @@ public void shouldAddValidAnnotationIntoCollectionWhenBeanValidationIsEnabled_is codegen.setLibrary(SPRING_CLOUD_LIBRARY); codegen.setOutputDir(output.getAbsolutePath()); codegen.additionalProperties().put(SpringCodegen.USE_BEANVALIDATION, "true"); - // codegen.additionalProperties().put(SpringCodegen.PERFORM_BEANVALIDATION, "true"); + // codegen.additionalProperties().put(SpringCodegen.PERFORM_BEANVALIDATION, "true"); codegen.additionalProperties().put(CodegenConstants.MODEL_PACKAGE, "xyz.model"); codegen.additionalProperties().put(CodegenConstants.API_PACKAGE, "xyz.controller"); codegen.setUseSpringBoot3(true); @@ -988,65 +988,65 @@ public void shouldAddValidAnnotationIntoCollectionWhenBeanValidationIsEnabled_is .hasImports("jakarta.validation.Valid") .hasImports("jakarta.validation.constraints") .assertProperty("stringPattern") - .withType("Set<@Pattern(regexp = \"[a-z]\") String>") + .withType( "Set<@Pattern(regexp = \"[a-z]\") String>" ) .toType() .assertProperty("stringMaxMinLength") - .withType("Set<@Size(min = 1, max = 10) String>") + .withType( "Set<@Size(min = 1, max = 10) String>" ) .toType() .assertProperty("stringMinLength") - .withType("List<@Size(min = 1) String>") + .withType( "List<@Size(min = 1) String>" ) .toType() .assertProperty("stringMaxLength") - .withType("Set<@Size(max = 1) String>") + .withType( "Set<@Size(max = 1) String>" ) .toType() .assertProperty("intMinMax") - .withType("List<@Min(1) @Max(10) Integer>") + .withType( "List<@Min(1) @Max(10) Integer>" ) .toType() .assertProperty("intMin") - .withType("List<@Min(1) Integer>") + .withType( "List<@Min(1) Integer>" ) .toType() .assertProperty("intMax") - .withType("List<@Max(10) Integer>") + .withType( "List<@Max(10) Integer>" ) .toType() .assertProperty("numberMinMax") - .withType("List<@DecimalMin(value = \"1\", inclusive = true) @DecimalMax(value = \"10\", inclusive = true) BigDecimal>") + .withType( "List<@DecimalMin(value = \"1\", inclusive = true) @DecimalMax(value = \"10\", inclusive = true) BigDecimal>" ) .toType() .assertProperty("numberMin") - .withType("List<@DecimalMin(value = \"1\", inclusive = true) BigDecimal>") + .withType( "List<@DecimalMin(value = \"1\", inclusive = true) BigDecimal>" ) .toType() .assertProperty("numberMax") - .withType("List<@DecimalMax(value = \"10\", inclusive = true) BigDecimal>") + .withType( "List<@DecimalMax(value = \"10\", inclusive = true) BigDecimal>" ) .toType() .assertProperty("stringPatternNullable") - .withType("JsonNullable>") + .withType( "JsonNullable>" ) .toType() .assertProperty("stringMaxMinLengthNullable") - .withType("JsonNullable>") + .withType( "JsonNullable>" ) .toType() .assertProperty("stringMinLengthNullable") - .withType("JsonNullable>") + .withType( "JsonNullable>" ) .toType() .assertProperty("stringMaxLengthNullable") - .withType("JsonNullable>") + .withType( "JsonNullable>" ) .toType() .assertProperty("intMinMaxNullable") - .withType("JsonNullable>") + .withType( "JsonNullable>" ) .toType() .assertProperty("intMinNullable") - .withType("JsonNullable>") + .withType( "JsonNullable>" ) .toType() .assertProperty("intMaxNullable") - .withType("JsonNullable>") + .withType( "JsonNullable>" ) .toType() .assertProperty("numberMinMaxNullable") - .withType("JsonNullable>") + .withType( "JsonNullable>" ) .toType() .assertProperty("numberMinNullable") - .withType("JsonNullable>") + .withType( "JsonNullable>" ) .toType() .assertProperty("numberMaxNullable") - .withType("JsonNullable>") + .withType( "JsonNullable>" ) .toType() ; } @@ -1116,33 +1116,33 @@ public void testRequestMappingAnnotation() throws IOException { assertFileNotContains(petApiControllerFile.toPath(), "@RequestMapping(\"${openapi.openAPIPetstore.base-path:/v2}\")"); } - @Test - public void testNoRequestMappingAnnotation_spring_cloud_default() throws IOException { - final SpringCodegen codegen = new SpringCodegen(); - codegen.setLibrary("spring-cloud"); + @Test + public void testNoRequestMappingAnnotation_spring_cloud_default() throws IOException { + final SpringCodegen codegen = new SpringCodegen(); + codegen.setLibrary( "spring-cloud" ); - final Map files = generateFiles(codegen, "src/test/resources/2_0/petstore.yaml"); + final Map files = generateFiles( codegen, "src/test/resources/2_0/petstore.yaml" ); - // Check that the @RequestMapping annotation is not generated in the Api file - final File petApiFile = files.get("PetApi.java"); - JavaFileAssert.assertThat(petApiFile).assertTypeAnnotations().hasSize(3).containsWithName("Validated") - .containsWithName("Generated").containsWithName("Tag"); + // Check that the @RequestMapping annotation is not generated in the Api file + final File petApiFile = files.get( "PetApi.java" ); + JavaFileAssert.assertThat( petApiFile ).assertTypeAnnotations().hasSize( 3 ).containsWithName( "Validated" ) + .containsWithName( "Generated" ).containsWithName( "Tag" ); - } + } @Test public void testNoRequestMappingAnnotation() throws IOException { final SpringCodegen codegen = new SpringCodegen(); - codegen.setLibrary("spring-cloud"); + codegen.setLibrary( "spring-cloud" ); codegen.additionalProperties().put(INTERFACE_ONLY, "true"); codegen.additionalProperties().put(REQUEST_MAPPING_OPTION, SpringCodegen.RequestMappingMode.none); - final Map files = generateFiles(codegen, "src/test/resources/2_0/petstore.yaml"); + final Map files = generateFiles( codegen, "src/test/resources/2_0/petstore.yaml" ); // Check that the @RequestMapping annotation is not generated in the Api file - final File petApiFile = files.get("PetApi.java"); - JavaFileAssert.assertThat(petApiFile).assertTypeAnnotations().hasSize(3).containsWithName("Validated") - .containsWithName("Generated").containsWithName("Tag"); + final File petApiFile = files.get( "PetApi.java" ); + JavaFileAssert.assertThat( petApiFile ).assertTypeAnnotations().hasSize( 3 ).containsWithName( "Validated" ) + .containsWithName( "Generated" ).containsWithName( "Tag" ); } @Test @@ -1164,7 +1164,7 @@ public void testSettersForConfigValues() throws Exception { configAssert.assertValue(CodegenConstants.INVOKER_PACKAGE, codegen::getInvokerPackage, "xx.yyyyyyyy.invoker"); configAssert.assertValue(SpringCodegen.BASE_PACKAGE, codegen::getBasePackage, "xx.yyyyyyyy.base"); configAssert.assertValue(SpringCodegen.CONFIG_PACKAGE, codegen::getConfigPackage, "xx.yyyyyyyy.config"); - configAssert.assertValue(SpringCodegen.UNHANDLED_EXCEPTION_HANDLING, codegen::isUnhandledException, true); + configAssert.assertValue(SpringCodegen.UNHANDLED_EXCEPTION_HANDLING, codegen::isUnhandledException, true); } @Test @@ -1216,7 +1216,7 @@ public void testGenerationOfClientPropertiesConfigurationForOAuth() throws Excep ); - assertFileNotContains(filePath, "spring.security.oauth2.client.registration.oAuth2Application.scope"); + assertFileNotContains(filePath,"spring.security.oauth2.client.registration.oAuth2Application.scope"); } @Test @@ -1231,7 +1231,7 @@ public void useBeanValidationTruePerformBeanValidationTrueForFormatEmail() throw @Test public void useBeanValidationTruePerformBeanValidationFalseJakartaeeTrueForFormatEmail() throws IOException { - beanValidationForFormatEmail(true, false, true, "@jakarta.validation.constraints.Email", "@javax.validation.constraints.Email"); + beanValidationForFormatEmail(true, false, true,"@jakarta.validation.constraints.Email", "@javax.validation.constraints.Email"); } // note: java8 option/mustache tag has been removed and default to true @@ -1267,12 +1267,11 @@ private void beanValidationForFormatEmail(boolean useBeanValidation, boolean per .collect(Collectors.toMap(File::getName, Function.identity())); JavaFileAssert javaFileAssert = JavaFileAssert.assertThat(files.get("PersonWithEmail.java")); - if (useBeanValidation) - javaFileAssert.hasImports((useJakarta ? "jakarta" : "javax") + ".validation.constraints"); + if (useBeanValidation) javaFileAssert.hasImports((useJakarta? "jakarta" : "javax") + ".validation.constraints"); if (performBeanValidation) javaFileAssert.hasImports("org.hibernate.validator.constraints"); JavaFileAssert.assertThat(Paths.get(outputPath + "/src/main/java/org/openapitools/model/PersonWithEmail.java")) - .fileContains(contains) - .fileDoesNotContain(notContains); + .fileContains(contains) + .fileDoesNotContain(notContains); } @Test @@ -1302,11 +1301,11 @@ public void reactiveMapTypeRequestMonoTest() throws IOException { generator.opts(input).generate(); JavaFileAssert.assertThat(Paths.get(outputPath + "/src/main/java/org/openapitools/api/SomeApi.java")) - .fileContains("Mono>") - .fileDoesNotContain("Mono"); + .fileContains("Mono>") + .fileDoesNotContain("Mono"); JavaFileAssert.assertThat(Paths.get(outputPath + "/src/main/java/org/openapitools/api/SomeApiDelegate.java")) - .fileContains("Mono>") - .fileDoesNotContain("Mono"); + .fileContains("Mono>") + .fileDoesNotContain("Mono"); } @Test @@ -1320,11 +1319,11 @@ public void reactiveArrayShouldBeWrappedInFluxWithoutMono() throws IOException { Map files = generateFromContract("src/test/resources/3_0/petstore.yaml", SPRING_BOOT, additionalProperties); JavaFileAssert - .assertThat(files.get("PetApi.java")) + .assertThat(files.get("PetApi.java")) .assertMethod("addPet").hasReturnType("Mono") - .toFileAssert() + .toFileAssert() .assertMethod("findPetsByStatus").hasReturnType("Flux") - .toFileAssert() + .toFileAssert() .assertMethod("deletePet").hasReturnType("Mono"); } @@ -1342,11 +1341,11 @@ public void reactiveArrayShouldBeWrappedInMonoFluxWhenUsingResponseEntity() thro Map files = generateFromContract("src/test/resources/3_0/petstore.yaml", SPRING_BOOT, additionalProperties); JavaFileAssert - .assertThat(files.get("PetApi.java")) + .assertThat(files.get("PetApi.java")) .assertMethod("addPet").hasReturnType("Mono>") - .toFileAssert() + .toFileAssert() .assertMethod("findPetsByStatus").hasReturnType("Mono>>") - .toFileAssert() + .toFileAssert() .assertMethod("deletePet").hasReturnType("Mono>"); } @@ -1376,10 +1375,10 @@ public void shouldGenerateValidCodeForReactiveControllerWithoutParams_issue14907 generator.setGenerateMetadata(false); // skip metadata Map files = generator.opts(input).generate().stream() - .collect(Collectors.toMap(File::getName, Function.identity())); + .collect(Collectors.toMap(File::getName, Function.identity())); JavaFileAssert.assertThat(files.get("ConsentControllerApi.java")) - .assertMethod("readAgreements", "ServerWebExchange"); + .assertMethod("readAgreements", "ServerWebExchange"); } @Test @@ -1408,12 +1407,12 @@ public void shouldGenerateValidCodeWithPaginated_reactive_issue15265() throws IO generator.setGenerateMetadata(false); // skip metadata and ↓ only generate models Map files = generator.opts(input).generate().stream() - .collect(Collectors.toMap(File::getName, Function.identity())); + .collect(Collectors.toMap(File::getName, Function.identity())); JavaFileAssert.assertThat(files.get("ConsentControllerApi.java")) - .assertMethod("paginated", "ServerWebExchange", "Pageable") - .toFileAssert() - .assertMethod("paginatedWithParams", "String", "ServerWebExchange", "Pageable"); + .assertMethod("paginated", "ServerWebExchange", "Pageable") + .toFileAssert() + .assertMethod("paginatedWithParams", "String", "ServerWebExchange", "Pageable"); } @Test @@ -1441,12 +1440,12 @@ public void shouldGenerateValidCodeWithPaginated_nonReactive_issue15265() throws generator.setGenerateMetadata(false); // skip metadata and ↓ only generate models Map files = generator.opts(input).generate().stream() - .collect(Collectors.toMap(File::getName, Function.identity())); + .collect(Collectors.toMap(File::getName, Function.identity())); JavaFileAssert.assertThat(files.get("ConsentControllerApi.java")) - .assertMethod("paginated", "Pageable") - .toFileAssert() - .assertMethod("paginatedWithParams", "String", "Pageable"); + .assertMethod("paginated", "Pageable") + .toFileAssert() + .assertMethod("paginatedWithParams", "String", "Pageable"); } @Test @@ -1489,13 +1488,13 @@ public void doGeneratePathVariableForSimpleParam() throws IOException { generator.opts(input).generate(); JavaFileAssert.assertThat(Paths.get(outputPath + "/src/main/java/org/openapitools/api/ZebrasApi.java")) - .fileContains("allowableValues = \"0, 1\"", "@PathVariable"); + .fileContains( "allowableValues = \"0, 1\"", "@PathVariable"); JavaFileAssert.assertThat(Paths.get(outputPath + "/src/main/java/org/openapitools/api/BearsApi.java")) - .fileContains("allowableValues = \"sleeping, awake\"", "@PathVariable"); + .fileContains( "allowableValues = \"sleeping, awake\"", "@PathVariable"); JavaFileAssert.assertThat(Paths.get(outputPath + "/src/main/java/org/openapitools/api/CamelsApi.java")) - .fileContains("allowableValues = \"sleeping, awake\"", "@PathVariable"); + .fileContains( "allowableValues = \"sleeping, awake\"", "@PathVariable"); JavaFileAssert.assertThat(Paths.get(outputPath + "/src/main/java/org/openapitools/api/GiraffesApi.java")) - .fileContains("allowableValues = \"0, 1\"", "@PathVariable"); + .fileContains( "allowableValues = \"0, 1\"", "@PathVariable"); } @Test @@ -1610,7 +1609,7 @@ public void shouldAddNotNullOnRequiredAttributes() throws IOException { generator.opts(input).generate(); JavaFileAssert.assertThat(Paths.get(outputPath + "/src/main/java/org/openapitools/model/Dummy.java")) - .fileContains("status", "@NotNull"); + .fileContains( "status", "@NotNull"); } @Test @@ -1637,8 +1636,8 @@ public void shouldNotAddNotNullOnReadOnlyAttributes() throws IOException { generator.opts(input).generate(); JavaFileAssert.assertThat(Paths.get(outputPath + "/src/main/java/org/openapitools/model/Dummy.java")) - .fileContains("status") - .fileDoesNotContain("@NotNull"); + .fileContains( "status") + .fileDoesNotContain("@NotNull"); } @Test @@ -1659,7 +1658,7 @@ public void testOneOf5381() throws IOException { input.config(codegen); DefaultGenerator generator = new DefaultGenerator(); - // codegen.setHateoas(true); + // codegen.setHateoas(true); generator.setGenerateMetadata(false); // skip metadata and ↓ only generate models generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "true"); generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false"); @@ -1711,7 +1710,7 @@ public void testOneOfAndAllOf() throws IOException { assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/model/FooRefOrValue.java"), "public interface FooRefOrValue"); // previous bugs JavaFileAssert.assertThat(Paths.get(outputPath + "/src/main/java/org/openapitools/model/BarRef.java")) - .fileDoesNotContain("atTypesuper.hashCode", "private String atBaseType"); + .fileDoesNotContain("atTypesuper.hashCode", "private String atBaseType"); // imports for inherited properties assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/model/PizzaSpeziale.java"), "import java.math.BigDecimal"); } @@ -1722,7 +1721,7 @@ public void testDiscriminatorWithMappingIssue14731() throws IOException { output.deleteOnExit(); String outputPath = output.getAbsolutePath().replace('\\', '/'); OpenAPI openAPI = new OpenAPIParser() - .readLocation("src/test/resources/bugs/issue_14731.yaml", null, new ParseOptions()).getOpenAPI(); + .readLocation("src/test/resources/bugs/issue_14731.yaml", null, new ParseOptions()).getOpenAPI(); SpringCodegen codegen = new SpringCodegen(); codegen.setOutputDir(output.getAbsolutePath()); @@ -1759,7 +1758,7 @@ public void testDiscriminatorWithoutMappingIssue14731() throws IOException { output.deleteOnExit(); String outputPath = output.getAbsolutePath().replace('\\', '/'); OpenAPI openAPI = new OpenAPIParser() - .readLocation("src/test/resources/bugs/issue_14731.yaml", null, new ParseOptions()).getOpenAPI(); + .readLocation("src/test/resources/bugs/issue_14731.yaml", null, new ParseOptions()).getOpenAPI(); SpringCodegen codegen = new SpringCodegen(); codegen.setOutputDir(output.getAbsolutePath()); @@ -1797,7 +1796,7 @@ void testOneOfWithEnumDiscriminator() throws IOException { output.deleteOnExit(); String outputPath = output.getAbsolutePath().replace('\\', '/'); OpenAPI openAPI = new OpenAPIParser() - .readLocation("src/test/resources/3_0/oneOfDiscriminator.yaml", null, new ParseOptions()).getOpenAPI(); + .readLocation("src/test/resources/3_0/oneOfDiscriminator.yaml", null, new ParseOptions()).getOpenAPI(); SpringCodegen codegen = new SpringCodegen(); codegen.setOutputDir(output.getAbsolutePath()); @@ -1822,18 +1821,18 @@ void testOneOfWithEnumDiscriminator() throws IOException { generator.opts(input).generate(); assertFileContains( - Paths.get(outputPath + "/src/main/java/org/openapitools/model/FruitOneOfEnumMappingDisc.java"), - "public FruitTypeEnum getFruitType();" + Paths.get(outputPath + "/src/main/java/org/openapitools/model/FruitOneOfEnumMappingDisc.java"), + "public FruitTypeEnum getFruitType();" ); assertFileContains( - Paths.get(outputPath + "/src/main/java/org/openapitools/model/AppleOneOfEnumMappingDisc.java"), - "private FruitTypeEnum fruitType;", - "public FruitTypeEnum getFruitType() {" + Paths.get(outputPath + "/src/main/java/org/openapitools/model/AppleOneOfEnumMappingDisc.java"), + "private FruitTypeEnum fruitType;", + "public FruitTypeEnum getFruitType() {" ); assertFileContains( - Paths.get(outputPath + "/src/main/java/org/openapitools/model/BananaOneOfEnumMappingDisc.java"), - "private FruitTypeEnum fruitType;", - "public FruitTypeEnum getFruitType() {" + Paths.get(outputPath + "/src/main/java/org/openapitools/model/BananaOneOfEnumMappingDisc.java"), + "private FruitTypeEnum fruitType;", + "public FruitTypeEnum getFruitType() {" ); } @@ -1982,7 +1981,7 @@ public void shouldGenerateExternalDocs() throws IOException { output.deleteOnExit(); OpenAPI openAPI = new OpenAPIParser() - .readLocation("src/test/resources/3_0/petstore.yaml", null, new ParseOptions()).getOpenAPI(); + .readLocation("src/test/resources/3_0/petstore.yaml", null, new ParseOptions()).getOpenAPI(); SpringCodegen codegen = new SpringCodegen(); codegen.setLibrary(SPRING_BOOT); codegen.setOutputDir(output.getAbsolutePath()); @@ -1990,8 +1989,8 @@ public void shouldGenerateExternalDocs() throws IOException { codegen.additionalProperties().put(BeanValidationFeatures.USE_BEANVALIDATION, "true"); ClientOptInput input = new ClientOptInput() - .openAPI(openAPI) - .config(codegen); + .openAPI(openAPI) + .config(codegen); DefaultGenerator generator = new DefaultGenerator(); generator.setGenerateMetadata(false); // skip metadata and ↓ only generate API @@ -2000,19 +1999,19 @@ public void shouldGenerateExternalDocs() throws IOException { generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "true"); Map files = generator.opts(input).generate().stream() - .collect(Collectors.toMap(File::getName, Function.identity())); + .collect(Collectors.toMap(File::getName, Function.identity())); JavaFileAssert.assertThat(files.get("PetApi.java")) - .hasImports("io.swagger.v3.oas.annotations.ExternalDocumentation") - .assertMethod("updatePet") - .assertMethodAnnotations() - .containsWithName("Operation") - .containsWithNameAndAttributes("Operation", - ImmutableMap.of( - "operationId", "\"updatePet\"", - //"security", "{ @SecurityRequirement(name = \"petstore_auth\", scopes = { \"write:pets\", \"read:pets\" }) }", - "externalDocs", "@ExternalDocumentation(description = \"API documentation for the updatePet operation\", url = \"http://petstore.swagger.io/v2/doc/updatePet\")" - ) + .hasImports("io.swagger.v3.oas.annotations.ExternalDocumentation") + .assertMethod("updatePet") + .assertMethodAnnotations() + .containsWithName("Operation") + .containsWithNameAndAttributes("Operation", + ImmutableMap.of( + "operationId", "\"updatePet\"", + //"security", "{ @SecurityRequirement(name = \"petstore_auth\", scopes = { \"write:pets\", \"read:pets\" }) }", + "externalDocs", "@ExternalDocumentation(description = \"API documentation for the updatePet operation\", url = \"http://petstore.swagger.io/v2/doc/updatePet\")" + ) ); } @@ -2207,7 +2206,7 @@ public void testResponseWithArray_issue12524() throws Exception { Map files = generateFromContract("src/test/resources/bugs/issue_12524.json", SPRING_BOOT, additionalProperties); JavaFileAssert.assertThat(files.get("API01ListOfStuff.java")) - .hasImports("com.fasterxml.jackson.annotation.JsonTypeName"); + .hasImports("com.fasterxml.jackson.annotation.JsonTypeName"); } finally { GlobalSettings.reset(); } @@ -2223,11 +2222,11 @@ public void paramObjectImportForDifferentSpringBootVersions_issue14077() throws Map files = generateFromContract("src/test/resources/2_0/petstore-with-spring-pageable.yaml", SPRING_BOOT, additionalProperties); JavaFileAssert.assertThat(files.get("PetApi.java")) - .hasImports("org.springdoc.api.annotations.ParameterObject") - .assertMethod("findPetsByStatus") - .assertParameter("pageable").hasType("Pageable") - .assertParameterAnnotations() - .containsWithName("ParameterObject"); + .hasImports("org.springdoc.api.annotations.ParameterObject") + .assertMethod("findPetsByStatus") + .assertParameter("pageable").hasType("Pageable") + .assertParameterAnnotations() + .containsWithName("ParameterObject"); // different import for SB3 @@ -2235,11 +2234,11 @@ public void paramObjectImportForDifferentSpringBootVersions_issue14077() throws files = generateFromContract("src/test/resources/2_0/petstore-with-spring-pageable.yaml", SPRING_BOOT, additionalProperties); JavaFileAssert.assertThat(files.get("PetApi.java")) - .hasImports("org.springdoc.core.annotations.ParameterObject", "org.springframework.data.domain.Pageable") - .assertMethod("findPetsByStatus") - .assertParameter("pageable").hasType("Pageable") - .assertParameterAnnotations() - .containsWithName("ParameterObject"); + .hasImports("org.springdoc.core.annotations.ParameterObject", "org.springframework.data.domain.Pageable") + .assertMethod("findPetsByStatus") + .assertParameter("pageable").hasType("Pageable") + .assertParameterAnnotations() + .containsWithName("ParameterObject"); } @Test @@ -2476,12 +2475,12 @@ public void requiredFieldShouldIncludeNotNullAnnotationWithBeanValidationTrue_is Map files = generateFiles(codegen, "src/test/resources/bugs/issue_14252.yaml"); JavaFileAssert.assertThat(files.get("MyResponse.java")) - .hasImports("com.fasterxml.jackson.annotation.JsonFormat") - .assertMethod("getMyPropTypeNumber") - .assertMethodAnnotations() - .containsWithNameAndAttributes("JsonFormat", ImmutableMap.of( - "shape", "JsonFormat.Shape.STRING" - )); + .hasImports("com.fasterxml.jackson.annotation.JsonFormat") + .assertMethod("getMyPropTypeNumber") + .assertMethodAnnotations() + .containsWithNameAndAttributes("JsonFormat", ImmutableMap.of( + "shape", "JsonFormat.Shape.STRING" + )); } @Test @@ -2505,8 +2504,8 @@ public void requiredFieldShouldIncludeNotNullAnnotationWithBeanValidationTrue_is javaFileAssert.assertMethod("getName").assertMethodAnnotations() .containsWithName("NotNull").containsWithName("Size").containsWithName("javax.validation.constraints.Email"); javaFileAssert - .hasNoImports("javax.validation.constraints.NotNull") - .hasImports("javax.validation.constraints"); + .hasNoImports("javax.validation.constraints.NotNull") + .hasImports("javax.validation.constraints"); } @Test @@ -2612,7 +2611,7 @@ public void shouldHandleSeparatelyInterfaceAndModelAdditionalAnnotations() throw output.deleteOnExit(); OpenAPI openAPI = new OpenAPIParser() - .readLocation("src/test/resources/bugs/issue_13917.yaml", null, new ParseOptions()).getOpenAPI(); + .readLocation("src/test/resources/bugs/issue_13917.yaml", null, new ParseOptions()).getOpenAPI(); SpringCodegen codegen = new SpringCodegen(); codegen.setLibrary(SPRING_BOOT); codegen.setOutputDir(output.getAbsolutePath()); @@ -2625,27 +2624,27 @@ public void shouldHandleSeparatelyInterfaceAndModelAdditionalAnnotations() throw codegen.additionalProperties().put(AbstractJavaCodegen.ADDITIONAL_ONE_OF_TYPE_ANNOTATIONS, "@marker.Interface1;@marker.Common"); ClientOptInput input = new ClientOptInput() - .openAPI(openAPI) - .config(codegen); + .openAPI(openAPI) + .config(codegen); DefaultGenerator generator = new DefaultGenerator(); generator.setGenerateMetadata(false); // skip metadata and ↓ only generate models generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "true"); Map files = generator.opts(input).generate().stream() - .collect(Collectors.toMap(File::getName, Function.identity())); + .collect(Collectors.toMap(File::getName, Function.identity())); JavaFileAssert.assertThat(files.get("PatchRequestInner.java")) - .isInterface() - .assertTypeAnnotations() - .containsWithName("marker.Interface1") - .containsWithName("marker.Common"); + .isInterface() + .assertTypeAnnotations() + .containsWithName("marker.Interface1") + .containsWithName("marker.Common"); JavaFileAssert.assertThat(files.get("JSONPatchRequestRemove.java")) - .isNormalClass() - .assertTypeAnnotations() - .containsWithName("marker.Class1") - .containsWithName("marker.Class2") - .containsWithName("marker.Common"); + .isNormalClass() + .assertTypeAnnotations() + .containsWithName("marker.Class1") + .containsWithName("marker.Class2") + .containsWithName("marker.Common"); } @Test @@ -2688,7 +2687,7 @@ public void contractWithResolvedInnerEnumContainsEnumConverter() throws IOExcept @Test public void shouldUseTheSameTagNameForTheInterfaceAndTheMethod_issue11570() throws IOException { final Map output = generateFromContract( - "src/test/resources/bugs/issue_11570.yml", SPRING_BOOT, Map.of(INTERFACE_ONLY, "true") + "src/test/resources/bugs/issue_11570.yml", SPRING_BOOT, Map.of(INTERFACE_ONLY, "true") ); final String expectedTagName = "\"personTagWithExclamation!\""; @@ -2702,9 +2701,9 @@ public void shouldUseTheSameTagNameForTheInterfaceAndTheMethod_issue11570() thro @Test public void shouldGenerateConstructorWithOnlyRequiredParameters() throws IOException { final Map output = generateFromContract( - "src/test/resources/3_0/spring/issue_9789.yml", - SPRING_BOOT, - Map.of(GENERATE_CONSTRUCTOR_WITH_ALL_ARGS, "false") + "src/test/resources/3_0/spring/issue_9789.yml", + SPRING_BOOT, + Map.of(GENERATE_CONSTRUCTOR_WITH_ALL_ARGS, "false") ); JavaFileAssert.assertThat(output.get("ObjectWithNoRequiredParameter.java")).hasNoConstructor("String"); @@ -2727,13 +2726,12 @@ private Map generateFromContract(String url, String library) throw } private Map generateFromContract(String url, String library, Map additionalProperties) throws IOException { - return generateFromContract(url, library, additionalProperties, codegen -> { - }); + return generateFromContract(url, library, additionalProperties, codegen -> {}); } /** * Generate the contract with additional configuration. - *

+ * * use CodegenConfigurator instead of CodegenConfig for easier configuration like in JavaClientCodeGenTest */ private Map generateFromContract(String url, String library, Map additionalProperties, @@ -2791,8 +2789,8 @@ public void testMappingSubtypesIssue13150() throws IOException { generator.opts(input).generate(); String jsonSubType = "@JsonSubTypes({\n" + - " @JsonSubTypes.Type(value = Foo.class, name = \"foo\")\n" + - "})"; + " @JsonSubTypes.Type(value = Foo.class, name = \"foo\")\n" + + "})"; assertFileContains(Paths.get(outputPath + "/src/main/java/org/openapitools/model/Parent.java"), jsonSubType); } @@ -2802,59 +2800,59 @@ public void shouldGenerateJsonPropertyAnnotationLocatedInGetters_issue5705() thr output.deleteOnExit(); OpenAPI openAPI = new OpenAPIParser() - .readLocation("src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml", null, new ParseOptions()).getOpenAPI(); + .readLocation("src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml", null, new ParseOptions()).getOpenAPI(); SpringCodegen codegen = new SpringCodegen(); codegen.setLibrary(SPRING_BOOT); codegen.setWithXml(true); codegen.setOutputDir(output.getAbsolutePath()); ClientOptInput input = new ClientOptInput() - .openAPI(openAPI) - .config(codegen); + .openAPI(openAPI) + .config(codegen); DefaultGenerator generator = new DefaultGenerator(); generator.setGenerateMetadata(false); // skip metadata and ↓ only generate models generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "true"); Map files = generator.opts(input).generate().stream() - .collect(Collectors.toMap(File::getName, Function.identity())); + .collect(Collectors.toMap(File::getName, Function.identity())); JavaFileAssert.assertThat(files.get("ResponseObjectWithDifferentFieldNames.java")) - .assertProperty("normalPropertyName") + .assertProperty("normalPropertyName") .assertPropertyAnnotations() .doesNotContainWithName("JsonProperty") .doesNotContainWithName("JacksonXmlProperty") .toProperty().toType() - .assertProperty("UPPER_CASE_PROPERTY_SNAKE") + .assertProperty("UPPER_CASE_PROPERTY_SNAKE") .assertPropertyAnnotations() .doesNotContainWithName("JsonProperty") .doesNotContainWithName("JacksonXmlProperty") .toProperty().toType() - .assertProperty("lowerCasePropertyDashes") + .assertProperty("lowerCasePropertyDashes") .assertPropertyAnnotations() .doesNotContainWithName("JsonProperty") .doesNotContainWithName("JacksonXmlProperty") .toProperty().toType() - .assertProperty("propertyNameWithSpaces") + .assertProperty("propertyNameWithSpaces") .assertPropertyAnnotations() .doesNotContainWithName("JsonProperty") .doesNotContainWithName("JacksonXmlProperty") .toProperty().toType() - .assertMethod("getNormalPropertyName") + .assertMethod("getNormalPropertyName") .assertMethodAnnotations() .containsWithNameAndAttributes("JsonProperty", ImmutableMap.of("value", "\"normalPropertyName\"")) .containsWithNameAndAttributes("JacksonXmlProperty", ImmutableMap.of("localName", "\"normalPropertyName\"")) .toMethod().toFileAssert() - .assertMethod("getUPPERCASEPROPERTYSNAKE") + .assertMethod("getUPPERCASEPROPERTYSNAKE") .assertMethodAnnotations() .containsWithNameAndAttributes("JsonProperty", ImmutableMap.of("value", "\"UPPER_CASE_PROPERTY_SNAKE\"")) .containsWithNameAndAttributes("JacksonXmlProperty", ImmutableMap.of("localName", "\"UPPER_CASE_PROPERTY_SNAKE\"")) .toMethod().toFileAssert() - .assertMethod("getLowerCasePropertyDashes") + .assertMethod("getLowerCasePropertyDashes") .assertMethodAnnotations() .containsWithNameAndAttributes("JsonProperty", ImmutableMap.of("value", "\"lower-case-property-dashes\"")) .containsWithNameAndAttributes("JacksonXmlProperty", ImmutableMap.of("localName", "\"lower-case-property-dashes\"")) .toMethod().toFileAssert() - .assertMethod("getPropertyNameWithSpaces") + .assertMethod("getPropertyNameWithSpaces") .assertMethodAnnotations() .containsWithNameAndAttributes("JsonProperty", ImmutableMap.of("value", "\"property name with spaces\"")) .containsWithNameAndAttributes("JacksonXmlProperty", ImmutableMap.of("localName", "\"property name with spaces\"")); @@ -3429,7 +3427,7 @@ public void doCallFluentParentSettersFromChildModel() throws IOException { String outputPath = output.getAbsolutePath().replace('\\', '/'); OpenAPI openAPI = new OpenAPIParser() - .readLocation("src/test/resources/3_0/issue_16496.yaml", null, new ParseOptions()).getOpenAPI(); + .readLocation("src/test/resources/3_0/issue_16496.yaml", null, new ParseOptions()).getOpenAPI(); SpringCodegen codegen = new SpringCodegen(); codegen.setOutputDir(output.getAbsolutePath()); @@ -3450,33 +3448,33 @@ public void doCallFluentParentSettersFromChildModel() throws IOException { JavaFileAssert.assertThat(Paths.get(outputPath + "/src/main/java/org/openapitools/model/Animal.java")) - // Fluent method assertions - .assertMethod("alias") - .hasReturnType("Animal") - .bodyContainsLines("this.alias = JsonNullable.of(alias);", "return this;") - .assertParameter("alias") - .hasType("String") - .toMethod() - .toFileAssert() - - // Setter method assertions - .assertMethod("setAlias") - .hasReturnType("void") - .assertParameter("alias") - .hasType("JsonNullable"); + // Fluent method assertions + .assertMethod("alias") + .hasReturnType("Animal") + .bodyContainsLines("this.alias = JsonNullable.of(alias);", "return this;") + .assertParameter("alias") + .hasType("String") + .toMethod() + .toFileAssert() + + // Setter method assertions + .assertMethod("setAlias") + .hasReturnType("void") + .assertParameter("alias") + .hasType("JsonNullable"); JavaFileAssert.assertThat(Paths.get(outputPath + "/src/main/java/org/openapitools/model/Zebra.java")) - // Fluent method assertions - .assertMethod("alias") - .hasReturnType("Zebra") - .bodyContainsLines("super.alias(alias);", "return this;") - .assertParameter("alias") - .hasType("String") - .toMethod() - .toFileAssert() + // Fluent method assertions + .assertMethod("alias") + .hasReturnType("Zebra") + .bodyContainsLines("super.alias(alias);", "return this;") + .assertParameter("alias") + .hasType("String") + .toMethod() + .toFileAssert() - // No overridden setter on child object - .hasNoMethod("setAlias"); + // No overridden setter on child object + .hasNoMethod("setAlias"); } @Test @@ -3511,96 +3509,96 @@ public void testModelsWithNoneOptionalAndJsonNullable() throws IOException { .hasImports("jakarta.validation.constraints") .assertProperty("name") - .withType("String") + .withType( "String" ) .toType() .assertProperty("age") - .withType("JsonNullable") + .withType( "JsonNullable" ) .toType() .assertProperty("alias") - .withType("JsonNullable") + .withType( "JsonNullable" ) .toType() .assertProperty("color") - .withType("String") + .withType( "String" ) .toType() .assertProperty("names") - .withType("List") + .withType( "List" ) .toType() .assertProperty("colors") - .withType("JsonNullable>") + .withType( "JsonNullable>" ) .toType() .assertProperty("stringPattern") - .withType("String") + .withType( "String" ) .toType() .assertProperty("stringMaxMinLength") - .withType("String") + .withType( "String" ) .toType() .assertProperty("stringMinLength") - .withType("String") + .withType( "String" ) .toType() .assertProperty("stringMaxLength") - .withType("String") + .withType( "String" ) .toType() .assertProperty("stringEmail") - .withType("String") + .withType( "String" ) .toType() .assertProperty("intMinMax") - .withType("Integer") + .withType( "Integer" ) .toType() .assertProperty("intMin") - .withType("Integer") + .withType( "Integer" ) .toType() .assertProperty("intMax") - .withType("Integer") + .withType( "Integer" ) .toType() .assertProperty("numberMinMax") - .withType("BigDecimal") + .withType( "BigDecimal" ) .toType() .assertProperty("numberMin") - .withType("BigDecimal") + .withType( "BigDecimal" ) .toType() .assertProperty("numberMax") - .withType("BigDecimal") + .withType( "BigDecimal" ) .toType() .assertProperty("stringDefault") - .withType("String") + .withType( "String" ) .toType() .fileContains("stringDefault = \"ABC\"") .assertProperty("zebra") - .withType("Zebra") + .withType( "Zebra" ) .toType() .assertProperty("stringPatternNullable") - .withType("JsonNullable<@Pattern(regexp = \"[a-z]\") String>") + .withType( "JsonNullable<@Pattern(regexp = \"[a-z]\") String>" ) .toType() .assertProperty("stringMaxMinLengthNullable") - .withType("JsonNullable<@Size(min = 1, max = 10) String>") + .withType( "JsonNullable<@Size(min = 1, max = 10) String>" ) .toType() .assertProperty("stringMinLengthNullable") - .withType("JsonNullable<@Size(min = 1) String>") + .withType( "JsonNullable<@Size(min = 1) String>" ) .toType() .assertProperty("stringMaxLengthNullable") - .withType("JsonNullable<@Size(max = 1) String>") + .withType( "JsonNullable<@Size(max = 1) String>" ) .toType() .assertProperty("intMinMaxNullable") - .withType("JsonNullable<@Min(1) @Max(10) Integer>") + .withType( "JsonNullable<@Min(1) @Max(10) Integer>" ) .toType() .assertProperty("intMinNullable") - .withType("JsonNullable<@Min(1) Integer>") + .withType( "JsonNullable<@Min(1) Integer>" ) .toType() .assertProperty("intMaxNullable") - .withType("JsonNullable<@Max(10) Integer>") + .withType( "JsonNullable<@Max(10) Integer>" ) .toType() .assertProperty("numberMinMaxNullable") - .withType("JsonNullable<@DecimalMin(\"1\") @DecimalMax(\"10\") BigDecimal>") + .withType( "JsonNullable<@DecimalMin(\"1\") @DecimalMax(\"10\") BigDecimal>" ) .toType() .assertProperty("numberMinNullable") - .withType("JsonNullable<@DecimalMin(\"1\") BigDecimal>") + .withType( "JsonNullable<@DecimalMin(\"1\") BigDecimal>" ) .toType() .assertProperty("numberMaxNullable") - .withType("JsonNullable<@DecimalMax(\"10\") BigDecimal>") + .withType( "JsonNullable<@DecimalMax(\"10\") BigDecimal>" ) .toType() .assertProperty("stringDefaultNullable") - .withType("JsonNullable<@Size(max = 1) String>") + .withType( "JsonNullable<@Size(max = 1) String>" ) .toType() .fileContains("stringDefaultNullable = JsonNullable.undefined();") @@ -3727,96 +3725,96 @@ public void testModelsWithOptionalAndJsonNullable() throws IOException { .hasImports("jakarta.validation.constraints") .assertProperty("name") - .withType("String") + .withType( "String" ) .toType() .assertProperty("age") - .withType("JsonNullable") + .withType( "JsonNullable" ) .toType() .assertProperty("alias") - .withType("JsonNullable") + .withType( "JsonNullable" ) .toType() .assertProperty("color") - .withType("Optional") + .withType( "Optional" ) .toType() .assertProperty("names") - .withType("List") + .withType( "List" ) .toType() .assertProperty("colors") - .withType("JsonNullable>") + .withType( "JsonNullable>" ) .toType() .assertProperty("stringPattern") - .withType("Optional<@Pattern(regexp = \"[a-z]\") String>") + .withType( "Optional<@Pattern(regexp = \"[a-z]\") String>" ) .toType() .assertProperty("stringMaxMinLength") - .withType("Optional<@Size(min = 1, max = 10) String>") + .withType( "Optional<@Size(min = 1, max = 10) String>" ) .toType() .assertProperty("stringMinLength") - .withType("Optional<@Size(min = 1) String>") + .withType( "Optional<@Size(min = 1) String>" ) .toType() .assertProperty("stringMaxLength") - .withType("Optional<@Size(max = 1) String>") + .withType( "Optional<@Size(max = 1) String>" ) .toType() .assertProperty("stringEmail") - .withType("Optional<@jakarta.validation.constraints.Email String>") + .withType( "Optional<@jakarta.validation.constraints.Email String>" ) .toType() .assertProperty("intMinMax") - .withType("Optional<@Min(1) @Max(10) Integer>") + .withType( "Optional<@Min(1) @Max(10) Integer>" ) .toType() .assertProperty("intMin") - .withType("Optional<@Min(1) Integer>") + .withType( "Optional<@Min(1) Integer>" ) .toType() .assertProperty("intMax") - .withType("Optional<@Max(10) Integer>") + .withType( "Optional<@Max(10) Integer>" ) .toType() .assertProperty("numberMinMax") - .withType("Optional<@DecimalMin(\"1\") @DecimalMax(\"10\") BigDecimal>") + .withType( "Optional<@DecimalMin(\"1\") @DecimalMax(\"10\") BigDecimal>" ) .toType() .assertProperty("numberMin") - .withType("Optional<@DecimalMin(\"1\") BigDecimal>") + .withType( "Optional<@DecimalMin(\"1\") BigDecimal>" ) .toType() .assertProperty("numberMax") - .withType("Optional<@DecimalMax(\"10\") BigDecimal>") + .withType( "Optional<@DecimalMax(\"10\") BigDecimal>" ) .toType() .assertProperty("stringDefault") - .withType("Optional<@Size(max = 1) String>") + .withType( "Optional<@Size(max = 1) String>" ) .toType() .fileContains("stringDefault = Optional.of(\"ABC\")") .assertProperty("zebra") - .withType("Optional") + .withType( "Optional" ) .toType() .assertProperty("stringPatternNullable") - .withType("JsonNullable<@Pattern(regexp = \"[a-z]\") String>") + .withType( "JsonNullable<@Pattern(regexp = \"[a-z]\") String>" ) .toType() .assertProperty("stringMaxMinLengthNullable") - .withType("JsonNullable<@Size(min = 1, max = 10) String>") + .withType( "JsonNullable<@Size(min = 1, max = 10) String>" ) .toType() .assertProperty("stringMinLengthNullable") - .withType("JsonNullable<@Size(min = 1) String>") + .withType( "JsonNullable<@Size(min = 1) String>" ) .toType() .assertProperty("stringMaxLengthNullable") - .withType("JsonNullable<@Size(max = 1) String>") + .withType( "JsonNullable<@Size(max = 1) String>" ) .toType() .assertProperty("intMinMaxNullable") - .withType("JsonNullable<@Min(1) @Max(10) Integer>") + .withType( "JsonNullable<@Min(1) @Max(10) Integer>" ) .toType() .assertProperty("intMinNullable") - .withType("JsonNullable<@Min(1) Integer>") + .withType( "JsonNullable<@Min(1) Integer>" ) .toType() .assertProperty("intMaxNullable") - .withType("JsonNullable<@Max(10) Integer>") + .withType( "JsonNullable<@Max(10) Integer>" ) .toType() .assertProperty("numberMinMaxNullable") - .withType("JsonNullable<@DecimalMin(\"1\") @DecimalMax(\"10\") BigDecimal>") + .withType( "JsonNullable<@DecimalMin(\"1\") @DecimalMax(\"10\") BigDecimal>" ) .toType() .assertProperty("numberMinNullable") - .withType("JsonNullable<@DecimalMin(\"1\") BigDecimal>") + .withType( "JsonNullable<@DecimalMin(\"1\") BigDecimal>" ) .toType() .assertProperty("numberMaxNullable") - .withType("JsonNullable<@DecimalMax(\"10\") BigDecimal>") + .withType( "JsonNullable<@DecimalMax(\"10\") BigDecimal>" ) .toType() .assertProperty("stringDefaultNullable") - .withType("JsonNullable<@Size(max = 1) String>") + .withType( "JsonNullable<@Size(max = 1) String>" ) .toType() .fileContains("stringDefaultNullable = JsonNullable.undefined();") @@ -3827,7 +3825,7 @@ public void testModelsWithOptionalAndJsonNullable() throws IOException { .hasType("String") .toMethod() .toFileAssert() - // Setter method assertions + // Setter method assertions .assertMethod("setName") .hasReturnType("void") .assertParameter("name") @@ -3880,34 +3878,34 @@ public void testModelsWithOptionalAndJsonNullable() throws IOException { .doesNotHaveParameters() .toFileAssert(); - assertJsonNullableMethod(javaFileAssert, String.class, "alias", "JsonNullable"); - assertJsonNullableMethod(javaFileAssert, Integer.class, "age", "JsonNullable"); - assertOptionalMethod(javaFileAssert, String.class, "color", "Optional"); - - assertOptionalMethod(javaFileAssert, String.class, "stringPattern", "Optional<@Pattern(regexp = \"[a-z]\") String>"); - assertOptionalMethod(javaFileAssert, String.class, "stringMaxMinLength", "Optional<@Size(min = 1, max = 10) String>"); - assertOptionalMethod(javaFileAssert, String.class, "stringMinLength", "Optional<@Size(min = 1) String>"); - assertOptionalMethod(javaFileAssert, String.class, "stringMaxLength", "Optional<@Size(max = 1) String>"); - assertOptionalMethod(javaFileAssert, String.class, "stringEmail", "Optional<@jakarta.validation.constraints.Email String>"); - assertOptionalMethod(javaFileAssert, Integer.class, "intMinMax", "Optional<@Min(1) @Max(10) Integer>"); - assertOptionalMethod(javaFileAssert, Integer.class, "intMin", "Optional<@Min(1) Integer>"); - assertOptionalMethod(javaFileAssert, Integer.class, "intMax", "Optional<@Max(10) Integer>"); - assertOptionalMethod(javaFileAssert, BigDecimal.class, "numberMinMax", "Optional<@DecimalMin(\"1\") @DecimalMax(\"10\") BigDecimal>"); - assertOptionalMethod(javaFileAssert, BigDecimal.class, "numberMin", "Optional<@DecimalMin(\"1\") BigDecimal>"); - assertOptionalMethod(javaFileAssert, BigDecimal.class, "numberMax", "Optional<@DecimalMax(\"10\") BigDecimal>"); - assertOptionalMethod(javaFileAssert, "Zebra", "zebra", "Optional"); - - assertJsonNullableMethod(javaFileAssert, String.class, "stringPatternNullable", "JsonNullable<@Pattern(regexp = \"[a-z]\") String>"); - assertJsonNullableMethod(javaFileAssert, String.class, "stringMaxMinLengthNullable", "JsonNullable<@Size(min = 1, max = 10) String>"); - assertJsonNullableMethod(javaFileAssert, String.class, "stringMinLengthNullable", "JsonNullable<@Size(min = 1) String>"); - assertJsonNullableMethod(javaFileAssert, String.class, "stringMaxLengthNullable", "JsonNullable<@Size(max = 1) String>"); - assertJsonNullableMethod(javaFileAssert, String.class, "stringEmailNullable", "JsonNullable<@jakarta.validation.constraints.Email String>"); - assertJsonNullableMethod(javaFileAssert, Integer.class, "intMinMaxNullable", "JsonNullable<@Min(1) @Max(10) Integer>"); - assertJsonNullableMethod(javaFileAssert, Integer.class, "intMinNullable", "JsonNullable<@Min(1) Integer>"); - assertJsonNullableMethod(javaFileAssert, Integer.class, "intMaxNullable", "JsonNullable<@Max(10) Integer>"); - assertJsonNullableMethod(javaFileAssert, BigDecimal.class, "numberMinMaxNullable", "JsonNullable<@DecimalMin(\"1\") @DecimalMax(\"10\") BigDecimal>"); - assertJsonNullableMethod(javaFileAssert, BigDecimal.class, "numberMinNullable", "JsonNullable<@DecimalMin(\"1\") BigDecimal>"); - assertJsonNullableMethod(javaFileAssert, BigDecimal.class, "numberMaxNullable", "JsonNullable<@DecimalMax(\"10\") BigDecimal>"); + assertJsonNullableMethod(javaFileAssert, String.class, "alias", "JsonNullable"); + assertJsonNullableMethod(javaFileAssert, Integer.class, "age", "JsonNullable"); + assertOptionalMethod(javaFileAssert, String.class, "color", "Optional"); + + assertOptionalMethod(javaFileAssert, String.class, "stringPattern", "Optional<@Pattern(regexp = \"[a-z]\") String>"); + assertOptionalMethod(javaFileAssert, String.class, "stringMaxMinLength", "Optional<@Size(min = 1, max = 10) String>"); + assertOptionalMethod(javaFileAssert, String.class, "stringMinLength", "Optional<@Size(min = 1) String>"); + assertOptionalMethod(javaFileAssert, String.class, "stringMaxLength", "Optional<@Size(max = 1) String>"); + assertOptionalMethod(javaFileAssert, String.class, "stringEmail", "Optional<@jakarta.validation.constraints.Email String>"); + assertOptionalMethod(javaFileAssert, Integer.class, "intMinMax", "Optional<@Min(1) @Max(10) Integer>"); + assertOptionalMethod(javaFileAssert, Integer.class, "intMin", "Optional<@Min(1) Integer>"); + assertOptionalMethod(javaFileAssert, Integer.class, "intMax", "Optional<@Max(10) Integer>"); + assertOptionalMethod(javaFileAssert, BigDecimal.class, "numberMinMax", "Optional<@DecimalMin(\"1\") @DecimalMax(\"10\") BigDecimal>"); + assertOptionalMethod(javaFileAssert, BigDecimal.class, "numberMin", "Optional<@DecimalMin(\"1\") BigDecimal>"); + assertOptionalMethod(javaFileAssert, BigDecimal.class, "numberMax", "Optional<@DecimalMax(\"10\") BigDecimal>"); + assertOptionalMethod(javaFileAssert,"Zebra", "zebra", "Optional"); + + assertJsonNullableMethod(javaFileAssert, String.class, "stringPatternNullable", "JsonNullable<@Pattern(regexp = \"[a-z]\") String>"); + assertJsonNullableMethod(javaFileAssert, String.class, "stringMaxMinLengthNullable", "JsonNullable<@Size(min = 1, max = 10) String>"); + assertJsonNullableMethod(javaFileAssert, String.class, "stringMinLengthNullable", "JsonNullable<@Size(min = 1) String>"); + assertJsonNullableMethod(javaFileAssert, String.class, "stringMaxLengthNullable", "JsonNullable<@Size(max = 1) String>"); + assertJsonNullableMethod(javaFileAssert, String.class, "stringEmailNullable", "JsonNullable<@jakarta.validation.constraints.Email String>"); + assertJsonNullableMethod(javaFileAssert, Integer.class, "intMinMaxNullable", "JsonNullable<@Min(1) @Max(10) Integer>"); + assertJsonNullableMethod(javaFileAssert, Integer.class, "intMinNullable", "JsonNullable<@Min(1) Integer>"); + assertJsonNullableMethod(javaFileAssert, Integer.class, "intMaxNullable", "JsonNullable<@Max(10) Integer>"); + assertJsonNullableMethod(javaFileAssert, BigDecimal.class, "numberMinMaxNullable", "JsonNullable<@DecimalMin(\"1\") @DecimalMax(\"10\") BigDecimal>"); + assertJsonNullableMethod(javaFileAssert, BigDecimal.class, "numberMinNullable", "JsonNullable<@DecimalMin(\"1\") BigDecimal>"); + assertJsonNullableMethod(javaFileAssert, BigDecimal.class, "numberMaxNullable", "JsonNullable<@DecimalMax(\"10\") BigDecimal>"); } @@ -3943,96 +3941,96 @@ public void testModelsWithOptionalAndNoneJsonNullable() throws IOException { .hasImports("jakarta.validation.constraints") .assertProperty("name") - .withType("String") + .withType( "String" ) .toType() .assertProperty("age") - .withType("Integer") + .withType( "Integer" ) .toType() .assertProperty("alias") - .withType("String") + .withType( "String" ) .toType() .assertProperty("color") - .withType("String") + .withType( "String" ) .toType() .assertProperty("names") - .withType("List") + .withType( "List" ) .toType() .assertProperty("colors") - .withType("List") + .withType( "List" ) .toType() .assertProperty("stringPattern") - .withType("String") + .withType( "String" ) .toType() .assertProperty("stringMaxMinLength") - .withType("String") + .withType( "String" ) .toType() .assertProperty("stringMinLength") - .withType("String") + .withType( "String" ) .toType() .assertProperty("stringMaxLength") - .withType("String") + .withType( "String" ) .toType() .assertProperty("stringEmail") - .withType("String") + .withType( "String" ) .toType() .assertProperty("intMinMax") - .withType("Integer") + .withType( "Integer" ) .toType() .assertProperty("intMin") - .withType("Integer") + .withType( "Integer" ) .toType() .assertProperty("intMax") - .withType("Integer") + .withType( "Integer" ) .toType() .assertProperty("numberMinMax") - .withType("BigDecimal") + .withType( "BigDecimal" ) .toType() .assertProperty("numberMin") - .withType("BigDecimal") + .withType( "BigDecimal" ) .toType() .assertProperty("numberMax") - .withType("BigDecimal") + .withType( "BigDecimal" ) .toType() .assertProperty("stringDefault") - .withType("String") + .withType( "String" ) .toType() .fileContains("stringDefault = \"ABC\"") .assertProperty("zebra") - .withType("Zebra") + .withType( "Zebra" ) .toType() .assertProperty("stringPatternNullable") - .withType("String") + .withType( "String" ) .toType() .assertProperty("stringMaxMinLengthNullable") - .withType("String") + .withType( "String" ) .toType() .assertProperty("stringMinLengthNullable") - .withType("String") + .withType( "String" ) .toType() .assertProperty("stringMaxLengthNullable") - .withType("String") + .withType( "String" ) .toType() .assertProperty("intMinMaxNullable") - .withType("Integer") + .withType( "Integer" ) .toType() .assertProperty("intMinNullable") - .withType("Integer") + .withType( "Integer" ) .toType() .assertProperty("intMaxNullable") - .withType("Integer") + .withType( "Integer" ) .toType() .assertProperty("numberMinMaxNullable") - .withType("BigDecimal") + .withType( "BigDecimal" ) .toType() .assertProperty("numberMinNullable") - .withType("BigDecimal") + .withType( "BigDecimal" ) .toType() .assertProperty("numberMaxNullable") - .withType("BigDecimal") + .withType( "BigDecimal" ) .toType() .assertProperty("stringDefaultNullable") - .withType("String") + .withType( "String" ) .toType() .fileContains("stringDefaultNullable = null;") @@ -4178,96 +4176,96 @@ public void testModelsWithNoneOptionalAndNoneOpenApiNullable() throws IOExceptio .hasImports("jakarta.validation.constraints") .assertProperty("name") - .withType("String") + .withType( "String" ) .toType() .assertProperty("age") - .withType("Integer") + .withType( "Integer" ) .toType() .assertProperty("alias") - .withType("String") + .withType( "String" ) .toType() .assertProperty("color") - .withType("String") + .withType( "String" ) .toType() .assertProperty("names") - .withType("List") + .withType( "List" ) .toType() .assertProperty("colors") - .withType("List") + .withType( "List" ) .toType() .assertProperty("stringPattern") - .withType("String") + .withType( "String" ) .toType() .assertProperty("stringMaxMinLength") - .withType("String") + .withType( "String" ) .toType() .assertProperty("stringMinLength") - .withType("String") + .withType( "String" ) .toType() .assertProperty("stringMaxLength") - .withType("String") + .withType( "String" ) .toType() .assertProperty("stringEmail") - .withType("String") + .withType( "String" ) .toType() .assertProperty("intMinMax") - .withType("Integer") + .withType( "Integer" ) .toType() .assertProperty("intMin") - .withType("Integer") + .withType( "Integer" ) .toType() .assertProperty("intMax") - .withType("Integer") + .withType( "Integer" ) .toType() .assertProperty("numberMinMax") - .withType("BigDecimal") + .withType( "BigDecimal" ) .toType() .assertProperty("numberMin") - .withType("BigDecimal") + .withType( "BigDecimal" ) .toType() .assertProperty("numberMax") - .withType("BigDecimal") + .withType( "BigDecimal" ) .toType() .assertProperty("stringDefault") - .withType("String") + .withType( "String" ) .toType() .fileContains("stringDefault = \"ABC\"") .assertProperty("zebra") - .withType("Zebra") + .withType( "Zebra" ) .toType() .assertProperty("stringPatternNullable") - .withType("String") + .withType( "String" ) .toType() .assertProperty("stringMaxMinLengthNullable") - .withType("String") + .withType( "String" ) .toType() .assertProperty("stringMinLengthNullable") - .withType("String") + .withType( "String" ) .toType() .assertProperty("stringMaxLengthNullable") - .withType("String") + .withType( "String" ) .toType() .assertProperty("intMinMaxNullable") - .withType("Integer") + .withType( "Integer" ) .toType() .assertProperty("intMinNullable") - .withType("Integer") + .withType( "Integer" ) .toType() .assertProperty("intMaxNullable") - .withType("Integer") + .withType( "Integer" ) .toType() .assertProperty("numberMinMaxNullable") - .withType("BigDecimal") + .withType( "BigDecimal" ) .toType() .assertProperty("numberMinNullable") - .withType("BigDecimal") + .withType( "BigDecimal" ) .toType() .assertProperty("numberMaxNullable") - .withType("BigDecimal") + .withType( "BigDecimal" ) .toType() .assertProperty("stringDefaultNullable") - .withType("String") + .withType( "String" ) .toType() .fileContains("stringDefaultNullable = null;") @@ -4381,70 +4379,70 @@ public void testModelsWithNoneOptionalAndNoneOpenApiNullable() throws IOExceptio } - private void assertOptionalMethod(JavaFileAssert javaFileAssert, Class type, String expectedName, String getterReturnType) { + private void assertOptionalMethod(JavaFileAssert javaFileAssert, Class type, String expectedName, String getterReturnType){ assertOptionalMethod(javaFileAssert, type.getSimpleName(), expectedName, getterReturnType); } - private void assertOptionalMethod(JavaFileAssert javaFileAssert, String type, String expectedName, String getterReturnType) { + private void assertOptionalMethod(JavaFileAssert javaFileAssert, String type, String expectedName, String getterReturnType){ assertWrapperMethod(javaFileAssert, "Optional", type, expectedName, getterReturnType); } - private void assertJsonNullableMethod(JavaFileAssert javaFileAssert, Class type, String expectedName, String getterReturnType) { + private void assertJsonNullableMethod(JavaFileAssert javaFileAssert, Class type, String expectedName, String getterReturnType){ assertJsonNullableMethod(javaFileAssert, type.getSimpleName(), expectedName, getterReturnType); } - private void assertJsonNullableMethod(JavaFileAssert javaFileAssert, String type, String expectedName, String getterReturnType) { + private void assertJsonNullableMethod(JavaFileAssert javaFileAssert, String type, String expectedName, String getterReturnType){ assertWrapperMethod(javaFileAssert, "JsonNullable", type, expectedName, getterReturnType); } - private void assertWrapperMethod(JavaFileAssert javaFileAssert, String wrapperType, String type, String expectedName, String getterReturnType) { + private void assertWrapperMethod(JavaFileAssert javaFileAssert, String wrapperType, String type, String expectedName, String getterReturnType){ String methodName = StringUtils.capitalize(expectedName); javaFileAssert.assertMethod(expectedName) .hasReturnType("Animal") - .bodyContainsLines("this." + expectedName + " = " + wrapperType + ".of(" + expectedName + ");", "return this;") + .bodyContainsLines("this."+expectedName+" = "+wrapperType+".of("+expectedName+");", "return this;") .assertParameter(expectedName) .hasType(type) .toMethod() .toFileAssert() // Setter method assertions - .assertMethod("set" + methodName) + .assertMethod("set"+methodName) .hasReturnType("void") .assertParameter(expectedName) - .hasType(wrapperType + "<" + type + ">") + .hasType(wrapperType+"<"+type+">") .toMethod() .toFileAssert() // Getter method assertions - .assertMethod("get" + methodName) + .assertMethod("get"+methodName) .hasReturnType(getterReturnType) .doesNotHaveParameters() .toFileAssert(); } - private void assertMethod(JavaFileAssert javaFileAssert, String type, String expectedName) { + private void assertMethod(JavaFileAssert javaFileAssert, String type, String expectedName){ String methodName = StringUtils.capitalize(expectedName); javaFileAssert.assertMethod(expectedName) .hasReturnType("Animal") - .bodyContainsLines("this." + expectedName + " = " + expectedName + ";", "return this;") + .bodyContainsLines("this."+expectedName+" = "+ expectedName + ";", "return this;") .assertParameter(expectedName) .hasType(type) .toMethod() .toFileAssert() // Setter method assertions - .assertMethod("set" + methodName) + .assertMethod("set"+methodName) .hasReturnType("void") .assertParameter(expectedName) .hasType(type) .toMethod() .toFileAssert() // Getter method assertions - .assertMethod("get" + methodName) + .assertMethod("get"+methodName) .hasReturnType(type) .doesNotHaveParameters() .toFileAssert(); } - private void assertMethod(JavaFileAssert javaFileAssert, Class type, String expectedName) { - assertMethod(javaFileAssert, type.getSimpleName(), expectedName); + private void assertMethod(JavaFileAssert javaFileAssert, Class type, String expectedName){ + assertMethod(javaFileAssert,type.getSimpleName(), expectedName); } @@ -4627,7 +4625,7 @@ public void testAllArgsConstructor_16797_REFACTOR_ALLOF_WITH_PROPERTIES_ONLY() t @Test public void testMultiInheritanceParentRequiredParams_issue16797() throws IOException { final Map output = generateFromContract( - "src/test/resources/3_0/spring/issue_16797.yaml", SPRING_BOOT, Map.of(INTERFACE_ONLY, "true") + "src/test/resources/3_0/spring/issue_16797.yaml", SPRING_BOOT, Map.of(INTERFACE_ONLY, "true") ); // constructor should as // public Object4(Type1 pageInfo, String responseType, String requestId, Boolean success) { @@ -4645,7 +4643,7 @@ public void testMultiInheritanceParentRequiredParams_issue16797() throws IOExcep @Test public void testMultiInheritanceParentRequiredParams_issue15796() throws IOException { final Map output = generateFromContract( - "src/test/resources/3_0/spring/issue_15796.yaml", SPRING_BOOT, Map.of(INTERFACE_ONLY, "true") + "src/test/resources/3_0/spring/issue_15796.yaml", SPRING_BOOT, Map.of(INTERFACE_ONLY, "true") ); // constructor should as this //public Poodle(String race, String type) { @@ -4720,9 +4718,9 @@ public void generateAllArgsConstructor() throws IOException { @Test public void allOfDuplicatedProperties() throws IOException { Map output = generateFromContract( - "src/test/resources/3_0/allOfDuplicatedProperties.yaml", - SPRING_BOOT, - Map.of(GENERATE_CONSTRUCTOR_WITH_ALL_ARGS, true, INTERFACE_ONLY, "true") + "src/test/resources/3_0/allOfDuplicatedProperties.yaml", + SPRING_BOOT, + Map.of(GENERATE_CONSTRUCTOR_WITH_ALL_ARGS, true, INTERFACE_ONLY, "true") ); JavaFileAssert.assertThat(output.get("ModelC.java")) @@ -4777,14 +4775,14 @@ public void testLombokAnnotations() throws IOException { @Test void testBuilderJavaSpring_noOptional() throws IOException { Map files = generateFromContract( - "src/test/resources/3_0/java/builder.yaml", - SPRING_BOOT, - Map.of( - GENERATE_BUILDERS, true, - SpringCodegen.OPENAPI_NULLABLE, false, - SpringCodegen.USE_OPTIONAL, false, - INTERFACE_ONLY, "true" - ) + "src/test/resources/3_0/java/builder.yaml", + SPRING_BOOT, + Map.of( + GENERATE_BUILDERS, true, + SpringCodegen.OPENAPI_NULLABLE, false, + SpringCodegen.USE_OPTIONAL, false, + INTERFACE_ONLY, "true" + ) ); JavaFileAssert.assertThat(files.get("Pet.java")) @@ -4806,14 +4804,14 @@ void testBuilderJavaSpring_noOptional() throws IOException { @Test void testBuilderJavaSpring_useOptional() throws IOException { Map files = generateFromContract( - "src/test/resources/3_0/java/builder.yaml", - SPRING_BOOT, - Map.of( - GENERATE_BUILDERS, true, - SpringCodegen.OPENAPI_NULLABLE, true, - SpringCodegen.USE_OPTIONAL, true, - INTERFACE_ONLY, "true" - ) + "src/test/resources/3_0/java/builder.yaml", + SPRING_BOOT, + Map.of( + GENERATE_BUILDERS, true, + SpringCodegen.OPENAPI_NULLABLE, true, + SpringCodegen.USE_OPTIONAL, true, + INTERFACE_ONLY, "true" + ) ); JavaFileAssert.assertThat(files.get("Pet.java")) @@ -4966,142 +4964,140 @@ public void testEnumUnknownDefaultCaseDeserializationNotSet_issue13241() throws * Includes regression tests for: * - Correct Jackson annotation when `wrapped: false` */ - @Test - void shouldGenerateCorrectXmlAnnotations() { + @Test void shouldGenerateCorrectXmlAnnotations() { // Arrange final CodegenConfigurator config = new CodegenConfigurator() - .addAdditionalProperty(CodegenConstants.WITH_XML, true) - .addGlobalProperty(CodegenConstants.MODELS, "Pet") - .setGeneratorName("spring") - .setInputSpec("src/test/resources/3_0/java/xml-annotations-test.yaml") - .setLibrary(SPRING_BOOT) - .setOutputDir(newTempFolder().toString()); + .addAdditionalProperty(CodegenConstants.WITH_XML, true) + .addGlobalProperty(CodegenConstants.MODELS, "Pet") + .setGeneratorName("spring") + .setInputSpec("src/test/resources/3_0/java/xml-annotations-test.yaml") + .setLibrary(SPRING_BOOT) + .setOutputDir(newTempFolder().toString()); // Act final List files = new DefaultGenerator().opts(config.toClientOptInput()).generate(); // Assert JavaFileAssert.assertThat(files.get(0)) - .assertTypeAnnotations() - .containsWithNameAndAttributes("JacksonXmlRootElement", Map.of("localName", "\"Pet\"", "namespace", "\"urn:jacksonxml\"")) - .containsWithNameAndAttributes("XmlRootElement", Map.of("name", "\"Pet\"", "namespace", "\"urn:jacksonxml\"")) - .containsWithNameAndAttributes("XmlAccessorType", Map.of("value", "XmlAccessType.FIELD")) - .toType() - - // ↓ test custom-name on wrapper element (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Use%20xml/name%20to%20give%20different%20names) - .assertMethod("getTags") - .doesNotHaveAnnotation("XmlAttribute") - .hasAnnotation("XmlElement", Map.of("name", "\"Tag\"")) - .hasAnnotation("XmlElementWrapper", Map.of("name", "\"TagList\"")) - .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"Tag\"")) - .hasAnnotation("JacksonXmlElementWrapper", Map.of("localName", "\"TagList\"", "useWrapping", "true")) - .toFileAssert() - - // ↓ custom internal xml-array element name, non-wrapped (1st example in https://spec.openapis.org/oas/v3.0.0#xml-arrays) - .assertMethod("getFriends") - .doesNotHaveAnnotation("XmlAttribute") - .doesNotHaveAnnotation("XmlElementWrapper") - .hasAnnotation("XmlElement", Map.of("name", "\"friend-pet\"")) - .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"friend-pet\"")) - .hasAnnotation("JacksonXmlElementWrapper", Map.of("useWrapping", "false")) - .toFileAssert() - - // ↓ test custom element name (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Change%20Element%20Names) - .assertMethod("getStatus") - .doesNotHaveAnnotation("XmlAttribute") - .doesNotHaveAnnotation("XmlElementWrapper") - .hasAnnotation("XmlElement", Map.of("name", "\"PetStatus\"")) - .doesNotHaveAnnotation("JacksonXmlElementWrapper") - .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"PetStatus\"")) - .toFileAssert() - - // ↓ test same-name wrapping element (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Wrapping%20Arrays) - // maps to 3rd example in https://spec.openapis.org/oas/v3.0.0#xml-arrays - .assertMethod("getPhotoUrls") - .doesNotHaveAnnotation("XmlAttribute") - .hasAnnotation("XmlElement", Map.of("name", "\"photoUrls\"")) - .hasAnnotation("XmlElementWrapper", Map.of("name", "\"photoUrls\"")) - .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"photoUrls\"")) - .hasAnnotation("JacksonXmlElementWrapper", Map.of("localName", "\"photoUrls\"", "useWrapping", "true")) - .toFileAssert() - - // ↓ test attribute generation (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Convert%20Property%20to%20an%20Attribute) - .assertMethod("getName") - .doesNotHaveAnnotation("XmlElement") - .doesNotHaveAnnotation("XmlElementWrapper") - .hasAnnotation("XmlAttribute", Map.of("name", "\"name\"")) - .doesNotHaveAnnotation("JacksonXmlElementWrapper") - .hasAnnotation("JacksonXmlProperty", Map.of("isAttribute", "true", "localName", "\"name\"")) - .toFileAssert() - - // ↓ test XML namespace and prefix (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Prefixes%20and%20Namespaces) - .assertMethod("getId") - .doesNotHaveAnnotation("XmlAttribute") - .doesNotHaveAnnotation("XmlElementWrapper") - .hasAnnotation("XmlElement", Map.of("name", "\"id\"", "namespace", "\"http://example.com/schema\"")) - .doesNotHaveAnnotation("JacksonXmlElementWrapper") - .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"id\"", "namespace", "\"http://example.com/schema\"")) - .toFileAssert() - - // ↓ external xml-array element name only (last example in https://spec.openapis.org/oas/v3.0.0#xml-arrays) - .assertMethod("getFoods") - .doesNotHaveAnnotation("XmlAttribute") - .hasAnnotation("XmlElement", Map.of("name", "\"yummy-yummy\"")) - .hasAnnotation("XmlElementWrapper", Map.of("name", "\"yummy-yummy\"")) - .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"yummy-yummy\"")) - .hasAnnotation("JacksonXmlElementWrapper", Map.of("localName", "\"yummy-yummy\"")) - .toFileAssert() - - // ↓ internal xml-array element name (4th example in https://spec.openapis.org/oas/v3.0.0#xml-arrays) - .assertMethod("getColors") - .doesNotHaveAnnotation("XmlAttribute") - .hasAnnotation("XmlElement", Map.of("name", "\"color\"")) - .hasAnnotation("XmlElementWrapper", Map.of("name", "\"colors\"")) - .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"color\"")) - .hasAnnotation("JacksonXmlElementWrapper", Map.of("localName", "\"colors\"")) - .toFileAssert() - - // ↓ ignored external xml-array element name, non-wrapped (2nd example in https://spec.openapis.org/oas/v3.0.0#xml-arrays) - .assertMethod("getCategories") - .doesNotHaveAnnotation("XmlAttribute") - .doesNotHaveAnnotation("XmlElementWrapper") - .hasAnnotation("XmlElement", Map.of("name", "\"Category\"")) - .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"Category\"")) - // ↓ specific regression test for #2417: (useWrapping=false) needs to be present - .hasAnnotation("JacksonXmlElementWrapper", Map.of("useWrapping", "false")) - .toFileAssert() - - // ↓ test custom-name on wrapper AND children (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Use%20xml/name%20to%20give%20different%20names) - // maps to 5th example in https://spec.openapis.org/oas/v3.0.0#xml-arrays - .assertMethod("getActivities") - .doesNotHaveAnnotation("XmlAttribute") - .hasAnnotation("XmlElement", Map.of("name", "\"item\"")) - .hasAnnotation("XmlElementWrapper", Map.of("name", "\"activities-array\"")) - .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"item\"")) - .hasAnnotation("JacksonXmlElementWrapper", Map.of("localName", "\"activities-array\"")); + .assertTypeAnnotations() + .containsWithNameAndAttributes("JacksonXmlRootElement", Map.of("localName", "\"Pet\"", "namespace", "\"urn:jacksonxml\"")) + .containsWithNameAndAttributes("XmlRootElement", Map.of("name", "\"Pet\"", "namespace", "\"urn:jacksonxml\"")) + .containsWithNameAndAttributes("XmlAccessorType", Map.of("value", "XmlAccessType.FIELD")) + .toType() + + // ↓ test custom-name on wrapper element (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Use%20xml/name%20to%20give%20different%20names) + .assertMethod("getTags") + .doesNotHaveAnnotation("XmlAttribute") + .hasAnnotation("XmlElement", Map.of("name", "\"Tag\"")) + .hasAnnotation("XmlElementWrapper", Map.of("name", "\"TagList\"")) + .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"Tag\"")) + .hasAnnotation("JacksonXmlElementWrapper", Map.of("localName", "\"TagList\"", "useWrapping", "true")) + .toFileAssert() + + // ↓ custom internal xml-array element name, non-wrapped (1st example in https://spec.openapis.org/oas/v3.0.0#xml-arrays) + .assertMethod("getFriends") + .doesNotHaveAnnotation("XmlAttribute") + .doesNotHaveAnnotation("XmlElementWrapper") + .hasAnnotation("XmlElement", Map.of("name", "\"friend-pet\"")) + .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"friend-pet\"")) + .hasAnnotation("JacksonXmlElementWrapper", Map.of("useWrapping", "false")) + .toFileAssert() + + // ↓ test custom element name (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Change%20Element%20Names) + .assertMethod("getStatus") + .doesNotHaveAnnotation("XmlAttribute") + .doesNotHaveAnnotation("XmlElementWrapper") + .hasAnnotation("XmlElement", Map.of("name", "\"PetStatus\"")) + .doesNotHaveAnnotation("JacksonXmlElementWrapper") + .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"PetStatus\"")) + .toFileAssert() + + // ↓ test same-name wrapping element (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Wrapping%20Arrays) + // maps to 3rd example in https://spec.openapis.org/oas/v3.0.0#xml-arrays + .assertMethod("getPhotoUrls") + .doesNotHaveAnnotation("XmlAttribute") + .hasAnnotation("XmlElement", Map.of("name", "\"photoUrls\"")) + .hasAnnotation("XmlElementWrapper", Map.of("name", "\"photoUrls\"")) + .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"photoUrls\"")) + .hasAnnotation("JacksonXmlElementWrapper", Map.of("localName", "\"photoUrls\"", "useWrapping", "true")) + .toFileAssert() + + // ↓ test attribute generation (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Convert%20Property%20to%20an%20Attribute) + .assertMethod("getName") + .doesNotHaveAnnotation("XmlElement") + .doesNotHaveAnnotation("XmlElementWrapper") + .hasAnnotation("XmlAttribute", Map.of("name", "\"name\"")) + .doesNotHaveAnnotation("JacksonXmlElementWrapper") + .hasAnnotation("JacksonXmlProperty", Map.of("isAttribute", "true", "localName", "\"name\"")) + .toFileAssert() + + // ↓ test XML namespace and prefix (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Prefixes%20and%20Namespaces) + .assertMethod("getId") + .doesNotHaveAnnotation("XmlAttribute") + .doesNotHaveAnnotation("XmlElementWrapper") + .hasAnnotation("XmlElement", Map.of("name", "\"id\"", "namespace", "\"http://example.com/schema\"")) + .doesNotHaveAnnotation("JacksonXmlElementWrapper") + .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"id\"", "namespace", "\"http://example.com/schema\"")) + .toFileAssert() + + // ↓ external xml-array element name only (last example in https://spec.openapis.org/oas/v3.0.0#xml-arrays) + .assertMethod("getFoods") + .doesNotHaveAnnotation("XmlAttribute") + .hasAnnotation("XmlElement", Map.of("name", "\"yummy-yummy\"")) + .hasAnnotation("XmlElementWrapper", Map.of("name", "\"yummy-yummy\"")) + .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"yummy-yummy\"")) + .hasAnnotation("JacksonXmlElementWrapper", Map.of("localName", "\"yummy-yummy\"")) + .toFileAssert() + + // ↓ internal xml-array element name (4th example in https://spec.openapis.org/oas/v3.0.0#xml-arrays) + .assertMethod("getColors") + .doesNotHaveAnnotation("XmlAttribute") + .hasAnnotation("XmlElement", Map.of("name", "\"color\"")) + .hasAnnotation("XmlElementWrapper", Map.of("name", "\"colors\"")) + .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"color\"")) + .hasAnnotation("JacksonXmlElementWrapper", Map.of("localName", "\"colors\"")) + .toFileAssert() + + // ↓ ignored external xml-array element name, non-wrapped (2nd example in https://spec.openapis.org/oas/v3.0.0#xml-arrays) + .assertMethod("getCategories") + .doesNotHaveAnnotation("XmlAttribute") + .doesNotHaveAnnotation("XmlElementWrapper") + .hasAnnotation("XmlElement", Map.of("name", "\"Category\"")) + .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"Category\"")) + // ↓ specific regression test for #2417: (useWrapping=false) needs to be present + .hasAnnotation("JacksonXmlElementWrapper", Map.of("useWrapping", "false")) + .toFileAssert() + + // ↓ test custom-name on wrapper AND children (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Use%20xml/name%20to%20give%20different%20names) + // maps to 5th example in https://spec.openapis.org/oas/v3.0.0#xml-arrays + .assertMethod("getActivities") + .doesNotHaveAnnotation("XmlAttribute") + .hasAnnotation("XmlElement", Map.of("name", "\"item\"")) + .hasAnnotation("XmlElementWrapper", Map.of("name", "\"activities-array\"")) + .hasAnnotation("JacksonXmlProperty", Map.of("localName", "\"item\"")) + .hasAnnotation("JacksonXmlElementWrapper", Map.of("localName", "\"activities-array\"")); } /** * Regression test for #12804 */ - @Test - public void shouldGenerateSingleDeprecatedAnnotation() { + @Test public void shouldGenerateSingleDeprecatedAnnotation() { final var tempDir = TestUtils.newTempFolder(); final CodegenConfigurator configurator = new CodegenConfigurator() - .addAdditionalProperty(GENERATE_BUILDERS, true) - .addGlobalProperty(CodegenConstants.MODELS, "Pet") - .setInputSpec("src/test/resources/3_0/petstore.yaml") - .setGeneratorName("spring") - .setOutputDir(tempDir.toString()); + .addAdditionalProperty(GENERATE_BUILDERS, true) + .addGlobalProperty(CodegenConstants.MODELS, "Pet") + .setInputSpec("src/test/resources/3_0/petstore.yaml") + .setGeneratorName("spring") + .setOutputDir(tempDir.toString()); new DefaultGenerator().opts(configurator.toClientOptInput()).generate(); JavaFileAssert.assertThat(tempDir.resolve("src/main/java/org/openapitools/model/Pet.java")) - .assertInnerClass("Builder") - .assertMethod("status").hasAnnotation("Deprecated") - .toInnerClassAssert() - .assertMethod("build") - .doesNotHaveAnnotation("Deprecated"); + .assertInnerClass("Builder") + .assertMethod("status").hasAnnotation("Deprecated") + .toInnerClassAssert() + .assertMethod("build") + .doesNotHaveAnnotation("Deprecated"); } @Test From 5c7b8b64b7bc9e500860e8c5c05e2a7b96a499e5 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 29 Oct 2025 18:22:37 +0800 Subject: [PATCH 3/3] update samples --- .../java/org/openapitools/api/DefaultApi.java | 18 ++- .../java/org/openapitools/api/PetApi.java | 23 ++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../java/org/openapitools/api/PetApi.java | 23 ++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../org/openapitools/api/PetController.java | 27 +++- .../org/openapitools/api/StoreController.java | 3 + .../org/openapitools/api/UserController.java | 13 +- .../java/org/openapitools/api/PetApi.java | 23 ++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../org/openapitools/api/AnotherFakeApi.java | 1 + .../java/org/openapitools/api/FakeApi.java | 107 +++++++++---- .../api/FakeClassnameTags123Api.java | 1 + .../java/org/openapitools/api/PetApi.java | 31 +++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../org/openapitools/api/AnotherFakeApi.java | 1 + .../java/org/openapitools/api/FakeApi.java | 107 +++++++++---- .../api/FakeClassnameTags123Api.java | 1 + .../java/org/openapitools/api/PetApi.java | 31 +++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../org/openapitools/api/AnotherFakeApi.java | 1 + .../java/org/openapitools/api/FakeApi.java | 107 +++++++++---- .../api/FakeClassnameTags123Api.java | 1 + .../java/org/openapitools/api/PetApi.java | 31 +++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../org/openapitools/api/AnotherFakeApi.java | 1 + .../java/org/openapitools/api/FakeApi.java | 107 +++++++++---- .../api/FakeClassnameTags123Api.java | 1 + .../java/org/openapitools/api/PetApi.java | 31 +++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../java/org/openapitools/api/PetApi.java | 23 ++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../java/org/openapitools/api/PetApi.java | 23 ++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../java/org/openapitools/api/PetApi.java | 23 ++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../java/org/openapitools/api/DefaultApi.java | 18 ++- .../java/org/openapitools/api/PetApi.java | 1 + .../org/openapitools/api/AnotherFakeApi.java | 1 + .../java/org/openapitools/api/FakeApi.java | 107 +++++++++---- .../api/FakeClassnameTags123Api.java | 1 + .../java/org/openapitools/api/PetApi.java | 31 +++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../java/org/openapitools/api/PetApi.java | 30 +++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../java/org/openapitools/api/PetApi.java | 23 ++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../java/org/openapitools/api/PetApi.java | 23 ++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../java/org/openapitools/api/PetApi.java | 23 ++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../java/org/openapitools/api/BarApi.java | 1 + .../java/org/openapitools/api/FooApi.java | 1 + .../java/org/openapitools/api/BarApi.java | 1 + .../java/org/openapitools/api/FooApi.java | 1 + .../java/org/openapitools/api/BarApi.java | 1 + .../java/org/openapitools/api/FooApi.java | 1 + .../java/org/openapitools/api/PetApi.java | 23 ++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../java/org/openapitools/api/PetApi.java | 23 ++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../org/openapitools/api/AnotherFakeApi.java | 1 + .../java/org/openapitools/api/FakeApi.java | 115 ++++++++++---- .../api/FakeClassnameTestApi.java | 1 + .../java/org/openapitools/api/PetApi.java | 23 ++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../org/openapitools/api/AnotherFakeApi.java | 1 + .../java/org/openapitools/api/FakeApi.java | 103 ++++++++---- .../api/FakeClassnameTestApi.java | 1 + .../java/org/openapitools/api/PetApi.java | 20 ++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../java/org/openapitools/api/PetApi.java | 23 ++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../java/org/openapitools/api/PetApi.java | 23 ++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../org/openapitools/api/AnotherFakeApi.java | 1 + .../java/org/openapitools/api/FakeApi.java | 115 ++++++++++---- .../api/FakeClassnameTestApi.java | 1 + .../java/org/openapitools/api/PetApi.java | 23 ++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../org/openapitools/api/NullableApi.java | 1 + .../java/org/openapitools/api/DogsApi.java | 1 + .../org/openapitools/api/AnotherFakeApi.java | 1 + .../java/org/openapitools/api/FakeApi.java | 115 ++++++++++---- .../api/FakeClassnameTestApi.java | 1 + .../java/org/openapitools/api/PetApi.java | 23 ++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../org/openapitools/api/AnotherFakeApi.java | 1 + .../java/org/openapitools/api/FakeApi.java | 115 ++++++++++---- .../api/FakeClassnameTestApi.java | 1 + .../java/org/openapitools/api/PetApi.java | 23 ++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../org/openapitools/api/AnotherFakeApi.java | 1 + .../java/org/openapitools/api/FakeApi.java | 115 ++++++++++---- .../api/FakeClassnameTestApi.java | 1 + .../java/org/openapitools/api/PetApi.java | 23 ++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../org/openapitools/api/AnotherFakeApi.java | 1 + .../java/org/openapitools/api/FakeApi.java | 115 ++++++++++---- .../api/FakeClassnameTestApi.java | 1 + .../java/org/openapitools/api/PetApi.java | 23 ++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../java/org/openapitools/api/PetApi.java | 23 ++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../org/openapitools/api/AnotherFakeApi.java | 1 + .../java/org/openapitools/api/FakeApi.java | 115 ++++++++++---- .../api/FakeClassnameTestApi.java | 1 + .../java/org/openapitools/api/PetApi.java | 23 ++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../java/org/openapitools/api/DummyApi.java | 1 + .../java/org/openapitools/api/PetApi.java | 20 ++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../org/openapitools/api/AnotherFakeApi.java | 1 + .../java/org/openapitools/api/FakeApi.java | 103 ++++++++---- .../api/FakeClassnameTestApi.java | 1 + .../java/org/openapitools/api/PetApi.java | 20 ++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../java/org/openapitools/api/PetApi.java | 23 ++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../java/org/openapitools/api/PetApi.java | 23 ++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../java/org/openapitools/api/PetApi.java | 23 ++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../org/openapitools/api/AnotherFakeApi.java | 3 +- .../java/org/openapitools/api/FakeApi.java | 147 ++++++++++++------ .../api/FakeClassnameTestApi.java | 3 +- .../java/org/openapitools/api/PetApi.java | 39 +++-- .../java/org/openapitools/api/StoreApi.java | 9 +- .../java/org/openapitools/api/UserApi.java | 27 ++-- .../org/openapitools/api/AnotherFakeApi.java | 3 +- .../java/org/openapitools/api/FakeApi.java | 147 ++++++++++++------ .../api/FakeClassnameTestApi.java | 3 +- .../java/org/openapitools/api/PetApi.java | 39 +++-- .../java/org/openapitools/api/StoreApi.java | 9 +- .../java/org/openapitools/api/UserApi.java | 27 ++-- .../org/openapitools/api/AnotherFakeApi.java | 1 + .../java/org/openapitools/api/FakeApi.java | 116 ++++++++++---- .../api/FakeClassnameTestApi.java | 1 + .../java/org/openapitools/api/PetApi.java | 30 +++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../org/openapitools/api/VersioningApi.java | 27 +++- .../org/openapitools/api/AnotherFakeApi.java | 1 + .../java/org/openapitools/api/FakeApi.java | 116 ++++++++++---- .../api/FakeClassnameTestApi.java | 1 + .../java/org/openapitools/api/PetApi.java | 30 +++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../org/openapitools/api/VersioningApi.java | 15 +- .../org/openapitools/api/AnotherFakeApi.java | 1 + .../java/org/openapitools/api/FakeApi.java | 116 ++++++++++---- .../api/FakeClassnameTestApi.java | 1 + .../java/org/openapitools/api/PetApi.java | 30 +++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../org/openapitools/api/VersioningApi.java | 27 +++- .../org/openapitools/api/AnotherFakeApi.java | 1 + .../java/org/openapitools/api/FakeApi.java | 116 ++++++++++---- .../api/FakeClassnameTestApi.java | 1 + .../java/org/openapitools/api/PetApi.java | 30 +++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../org/openapitools/api/VersioningApi.java | 15 +- .../java/org/openapitools/api/UserApi.java | 6 +- .../org/openapitools/api/AnotherFakeApi.java | 1 + .../java/org/openapitools/api/FakeApi.java | 115 ++++++++++---- .../api/FakeClassnameTestApi.java | 1 + .../java/org/openapitools/api/PetApi.java | 23 ++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- .../virtualan/api/AnotherFakeApi.java | 1 + .../openapitools/virtualan/api/FakeApi.java | 115 ++++++++++---- .../virtualan/api/FakeClassnameTestApi.java | 1 + .../openapitools/virtualan/api/PetApi.java | 23 ++- .../openapitools/virtualan/api/StoreApi.java | 3 + .../openapitools/virtualan/api/UserApi.java | 13 +- .../org/openapitools/api/AnotherFakeApi.java | 1 + .../java/org/openapitools/api/FakeApi.java | 115 ++++++++++---- .../api/FakeClassnameTestApi.java | 1 + .../java/org/openapitools/api/PetApi.java | 23 ++- .../java/org/openapitools/api/StoreApi.java | 3 + .../java/org/openapitools/api/UserApi.java | 13 +- 215 files changed, 3478 insertions(+), 1180 deletions(-) diff --git a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java index 7c7bb057ba32..95de75bdf6bd 100644 --- a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java +++ b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java @@ -50,10 +50,14 @@ public interface DefaultApi { value = DefaultApi.PATH_GET ) ResponseEntity get( - @NotNull @ApiParam(value = "A date path parameter", required = true, defaultValue = "1972-01-01") @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @NotNull @ApiParam(value = "A date-time query parameter", required = true, defaultValue = "1973-12-19T03:39:57-08:00") @Valid @RequestParam(value = "dateTime", required = true, defaultValue = "1973-12-19T03:39:57-08:00") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, - @NotNull @ApiParam(value = "A date header parameter", required = true, defaultValue = "1974-01-01") @RequestHeader(value = "X-Order-Date", required = true, defaultValue = "1974-01-01") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate xOrderDate, - @ApiParam(value = "A date cookie parameter", defaultValue = "1975-01-01") @CookieValue(name = "loginDate", required = false, defaultValue = "1975-01-01") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate loginDate + @NotNull @ApiParam(value = "A date path parameter", required = true, defaultValue = "1972-01-01") @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date +, + @NotNull @ApiParam(value = "A date-time query parameter", required = true, defaultValue = "1973-12-19T03:39:57-08:00") @Valid @RequestParam(value = "dateTime", required = true, defaultValue = "1973-12-19T03:39:57-08:00") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime +, + @NotNull @ApiParam(value = "A date header parameter", required = true, defaultValue = "1974-01-01") @RequestHeader(value = "X-Order-Date", required = true, defaultValue = "1974-01-01") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate xOrderDate +, + +@ApiParam(value = "A date cookie parameter", defaultValue = "1975-01-01") @CookieValue(name = "loginDate", required = false, defaultValue = "1975-01-01") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate loginDate ); @@ -80,8 +84,10 @@ ResponseEntity get( consumes = "application/x-www-form-urlencoded" ) ResponseEntity updatePetWithForm( - @NotNull @ApiParam(value = "A date path parameter", required = true, defaultValue = "1970-01-01") @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @ApiParam(value = "Updated last visit timestamp", defaultValue = "1971-12-19T03:39:57-08:00") @Valid @RequestParam(value = "visitDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime visitDate + @NotNull @ApiParam(value = "A date path parameter", required = true, defaultValue = "1970-01-01") @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date +, + @ApiParam(value = "Updated last visit timestamp", defaultValue = "1971-12-19T03:39:57-08:00") @Valid @RequestParam(value = "visitDate", required = false, defaultValue = "1971-12-19T03:39:57-08:00") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime visitDate + ); } diff --git a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/PetApi.java index 9b2029d8ee45..e36a7b9419cd 100644 --- a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/PetApi.java @@ -64,6 +64,7 @@ public interface PetApi { ) ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ); @@ -93,8 +94,10 @@ ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) ResponseEntity deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ); @@ -130,6 +133,7 @@ ResponseEntity deletePet( ) ResponseEntity> findPetsByStatus( @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) List status + ); @@ -168,6 +172,7 @@ ResponseEntity> findPetsByStatus( ) ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List tags + ); @@ -205,6 +210,7 @@ ResponseEntity> findPetsByTags( ) ResponseEntity getPetById( @NotNull @Parameter(name = "petId", deprecated = true, description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") @Deprecated Long petId + ); @@ -239,6 +245,7 @@ ResponseEntity getPetById( ) ResponseEntity updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ); @@ -270,9 +277,12 @@ ResponseEntity updatePet( consumes = "application/x-www-form-urlencoded" ) ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, + @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name +, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status + ); @@ -307,9 +317,12 @@ ResponseEntity updatePetWithForm( consumes = "multipart/form-data" ) ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file + ); } diff --git a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/StoreApi.java index 7e16b0de54cc..07ac660d0c1d 100644 --- a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/StoreApi.java @@ -61,6 +61,7 @@ public interface StoreApi { ) ResponseEntity deleteOrder( @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId + ); @@ -126,6 +127,7 @@ ResponseEntity> getInventory( ) ResponseEntity getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId + ); @@ -159,6 +161,7 @@ ResponseEntity getOrderById( ) ResponseEntity placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order + ); } diff --git a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/UserApi.java index 163322a385ab..645ab6cf8290 100644 --- a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/UserApi.java @@ -63,6 +63,7 @@ public interface UserApi { ) ResponseEntity createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user + ); @@ -93,6 +94,7 @@ ResponseEntity createUser( ) ResponseEntity createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ); @@ -123,6 +125,7 @@ ResponseEntity createUsersWithArrayInput( ) ResponseEntity createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ); @@ -154,6 +157,7 @@ ResponseEntity createUsersWithListInput( ) ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ); @@ -188,6 +192,7 @@ ResponseEntity deleteUser( ) ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ); @@ -220,8 +225,10 @@ ResponseEntity getUserByName( produces = { "application/json", "application/xml" } ) ResponseEntity loginUser( - @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @Parameter(name = "password", deprecated = true, description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) @Deprecated String password + ); @@ -282,8 +289,10 @@ ResponseEntity logoutUser( consumes = "application/json" ) ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username +, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user + ); } diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/PetApi.java index f28f16aa267e..583c03ed5ea5 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/PetApi.java @@ -60,6 +60,7 @@ public interface PetApi { ) ResponseEntity addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ); @@ -92,8 +93,10 @@ ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) ResponseEntity deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, + @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId +, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ); @@ -130,6 +133,7 @@ ResponseEntity deletePet( ) ResponseEntity> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) @Deprecated List status + ); @@ -168,6 +172,7 @@ ResponseEntity> findPetsByStatus( ) ResponseEntity> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags + ); @@ -203,6 +208,7 @@ ResponseEntity> findPetsByTags( ) ResponseEntity getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId + ); @@ -246,6 +252,7 @@ ResponseEntity getPetById( ) ResponseEntity updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ); @@ -280,9 +287,12 @@ ResponseEntity updatePet( consumes = "application/x-www-form-urlencoded" ) ResponseEntity updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, + @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name +, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status + ); @@ -319,9 +329,12 @@ ResponseEntity updatePetWithForm( consumes = "multipart/form-data" ) ResponseEntity uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file + ); } diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java index 85a0049c445e..89c239bfa1c2 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java @@ -50,6 +50,7 @@ public interface StoreApi { ) ResponseEntity deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") String orderId + ); @@ -113,6 +114,7 @@ ResponseEntity> getInventory( ) ResponseEntity getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") Long orderId + ); @@ -144,6 +146,7 @@ ResponseEntity getOrderById( ) ResponseEntity placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order + ); } diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java index f7147e9b480a..f3232d6bb486 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java @@ -52,6 +52,7 @@ public interface UserApi { ) ResponseEntity createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user + ); @@ -82,6 +83,7 @@ ResponseEntity createUser( ) ResponseEntity createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ); @@ -112,6 +114,7 @@ ResponseEntity createUsersWithArrayInput( ) ResponseEntity createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ); @@ -143,6 +146,7 @@ ResponseEntity createUsersWithListInput( ) ResponseEntity deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username + ); @@ -175,6 +179,7 @@ ResponseEntity deleteUser( ) ResponseEntity getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username + ); @@ -205,8 +210,10 @@ ResponseEntity getUserByName( produces = { "application/json", "application/xml" } ) ResponseEntity loginUser( - @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password + ); @@ -267,8 +274,10 @@ ResponseEntity logoutUser( consumes = "application/json" ) ResponseEntity updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username +, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user + ); } diff --git a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/PetController.java b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/PetController.java index 5217b02c7ba4..9048fc8f65ca 100644 --- a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/PetController.java +++ b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/PetController.java @@ -57,6 +57,7 @@ public interface PetController { ) ResponseEntity addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + ); @@ -88,8 +89,10 @@ ResponseEntity addPet( value = PetController.PATH_DELETE_PET ) ResponseEntity deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, + @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId +, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ); @@ -126,7 +129,8 @@ ResponseEntity deletePet( produces = { "application/json", "application/xml" } ) ResponseEntity> findPetsByStatus( - @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status, + @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status +, @ApiIgnore final Pageable pageable ); @@ -166,7 +170,8 @@ ResponseEntity> findPetsByStatus( produces = { "application/json", "application/xml" } ) ResponseEntity> findPetsByTags( - @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags, + @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags +, @ApiIgnore final Pageable pageable ); @@ -203,6 +208,7 @@ ResponseEntity> findPetsByTags( ) ResponseEntity getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId + ); @@ -239,6 +245,7 @@ ResponseEntity getPetById( ) ResponseEntity updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + ); @@ -272,9 +279,12 @@ ResponseEntity updatePet( consumes = "application/x-www-form-urlencoded" ) ResponseEntity updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, + @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name +, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status + ); @@ -310,9 +320,12 @@ ResponseEntity updatePetWithForm( consumes = "multipart/form-data" ) ResponseEntity uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file + ); } diff --git a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/StoreController.java b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/StoreController.java index ac95a5ddb77a..bde124fc5886 100644 --- a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/StoreController.java +++ b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/StoreController.java @@ -50,6 +50,7 @@ public interface StoreController { ) ResponseEntity deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") String orderId + ); @@ -113,6 +114,7 @@ ResponseEntity> getInventory( ) ResponseEntity getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") Long orderId + ); @@ -142,6 +144,7 @@ ResponseEntity getOrderById( ) ResponseEntity placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body + ); } diff --git a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/UserController.java b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/UserController.java index a9c772b5ba80..9eff041ec089 100644 --- a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/UserController.java +++ b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/UserController.java @@ -48,6 +48,7 @@ public interface UserController { ) ResponseEntity createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User body + ); @@ -73,6 +74,7 @@ ResponseEntity createUser( ) ResponseEntity createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body + ); @@ -98,6 +100,7 @@ ResponseEntity createUsersWithArrayInput( ) ResponseEntity createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body + ); @@ -126,6 +129,7 @@ ResponseEntity createUsersWithListInput( ) ResponseEntity deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username + ); @@ -157,6 +161,7 @@ ResponseEntity deleteUser( ) ResponseEntity getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username + ); @@ -186,8 +191,10 @@ ResponseEntity getUserByName( produces = { "application/json", "application/xml" } ) ResponseEntity loginUser( - @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password + ); @@ -264,8 +271,10 @@ ResponseEntity logoutUserOptions( value = UserController.PATH_UPDATE_USER ) ResponseEntity updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username +, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User body + ); } diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java index f28f16aa267e..583c03ed5ea5 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java @@ -60,6 +60,7 @@ public interface PetApi { ) ResponseEntity addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ); @@ -92,8 +93,10 @@ ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) ResponseEntity deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, + @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId +, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ); @@ -130,6 +133,7 @@ ResponseEntity deletePet( ) ResponseEntity> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) @Deprecated List status + ); @@ -168,6 +172,7 @@ ResponseEntity> findPetsByStatus( ) ResponseEntity> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags + ); @@ -203,6 +208,7 @@ ResponseEntity> findPetsByTags( ) ResponseEntity getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId + ); @@ -246,6 +252,7 @@ ResponseEntity getPetById( ) ResponseEntity updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ); @@ -280,9 +287,12 @@ ResponseEntity updatePet( consumes = "application/x-www-form-urlencoded" ) ResponseEntity updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, + @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name +, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status + ); @@ -319,9 +329,12 @@ ResponseEntity updatePetWithForm( consumes = "multipart/form-data" ) ResponseEntity uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file + ); } diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java index 85a0049c445e..89c239bfa1c2 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java @@ -50,6 +50,7 @@ public interface StoreApi { ) ResponseEntity deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") String orderId + ); @@ -113,6 +114,7 @@ ResponseEntity> getInventory( ) ResponseEntity getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") Long orderId + ); @@ -144,6 +146,7 @@ ResponseEntity getOrderById( ) ResponseEntity placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order + ); } diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java index f7147e9b480a..f3232d6bb486 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java @@ -52,6 +52,7 @@ public interface UserApi { ) ResponseEntity createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user + ); @@ -82,6 +83,7 @@ ResponseEntity createUser( ) ResponseEntity createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ); @@ -112,6 +114,7 @@ ResponseEntity createUsersWithArrayInput( ) ResponseEntity createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ); @@ -143,6 +146,7 @@ ResponseEntity createUsersWithListInput( ) ResponseEntity deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username + ); @@ -175,6 +179,7 @@ ResponseEntity deleteUser( ) ResponseEntity getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username + ); @@ -205,8 +210,10 @@ ResponseEntity getUserByName( produces = { "application/json", "application/xml" } ) ResponseEntity loginUser( - @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password + ); @@ -267,8 +274,10 @@ ResponseEntity logoutUser( consumes = "application/json" ) ResponseEntity updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username +, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user + ); } diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/AnotherFakeApi.java index 0c8efbbd1064..87191cb367db 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -36,6 +36,7 @@ public interface AnotherFakeApi { ) ClientDto call123testSpecialTags( @RequestBody ClientDto clientDto + ); } diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/FakeApi.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/FakeApi.java index 9b89a2cd597d..eaeaeb23b5ea 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/FakeApi.java @@ -47,6 +47,7 @@ public interface FakeApi { ) void createXmlItem( @RequestBody XmlItemDto xmlItemDto + ); @@ -66,6 +67,7 @@ void createXmlItem( ) Boolean fakeOuterBooleanSerialize( @RequestBody(required = false) @Nullable Boolean body + ); @@ -85,6 +87,7 @@ Boolean fakeOuterBooleanSerialize( ) OuterCompositeDto fakeOuterCompositeSerialize( @RequestBody(required = false) @Nullable OuterCompositeDto outerCompositeDto + ); @@ -104,6 +107,7 @@ OuterCompositeDto fakeOuterCompositeSerialize( ) BigDecimal fakeOuterNumberSerialize( @RequestBody(required = false) @Nullable BigDecimal body + ); @@ -123,6 +127,7 @@ BigDecimal fakeOuterNumberSerialize( ) String fakeOuterStringSerialize( @RequestBody(required = false) @Nullable String body + ); @@ -142,6 +147,7 @@ String fakeOuterStringSerialize( ) void testBodyWithFileSchema( @RequestBody FileSchemaTestClassDto fileSchemaTestClassDto + ); @@ -160,8 +166,10 @@ void testBodyWithFileSchema( contentType = "application/json" ) void testBodyWithQueryParams( - @RequestParam(value = "query", required = true) String query, + @RequestParam(value = "query", required = true) String query +, @RequestBody UserDto userDto + ); @@ -181,6 +189,7 @@ void testBodyWithQueryParams( ) ClientDto testClientModel( @RequestBody ClientDto clientDto + ); @@ -213,20 +222,34 @@ ClientDto testClientModel( contentType = "application/x-www-form-urlencoded" ) void testEndpointParameters( - @RequestParam(value = "number", required = true) BigDecimal number, - @RequestParam(value = "double", required = true) Double _double, - @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @RequestParam(value = "byte", required = true) byte[] _byte, - @RequestParam(value = "integer", required = false) Integer integer, - @RequestParam(value = "int32", required = false) Integer int32, - @RequestParam(value = "int64", required = false) Long int64, - @RequestParam(value = "float", required = false) Float _float, - @RequestParam(value = "string", required = false) String string, - @RequestPart(value = "binary", required = false) MultipartFile binary, - @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, - @RequestParam(value = "password", required = false) String password, + @RequestParam(value = "number", required = true) BigDecimal number +, + @RequestParam(value = "double", required = true) Double _double +, + @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter +, + @RequestParam(value = "byte", required = true) byte[] _byte +, + @RequestParam(value = "integer", required = false) Integer integer +, + @RequestParam(value = "int32", required = false) Integer int32 +, + @RequestParam(value = "int64", required = false) Long int64 +, + @RequestParam(value = "float", required = false) Float _float +, + @RequestParam(value = "string", required = false) String string +, + @RequestPart(value = "binary", required = false) MultipartFile binary +, + @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date +, + @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime +, + @RequestParam(value = "password", required = false) String password +, @RequestParam(value = "callback", required = false) String paramCallback + ); @@ -253,14 +276,22 @@ void testEndpointParameters( contentType = "application/x-www-form-urlencoded" ) void testEnumParameters( - @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, - @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, - @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray, - @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString, - @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, - @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, - @RequestParam(value = "enum_form_string", required = false) String enumFormString + @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray +, + @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString +, + @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray +, + @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString +, + @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger +, + @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble +, + @RequestPart(value = "enum_form_string_array", required = false, defaultValue = "$") List enumFormStringArray +, + @RequestParam(value = "enum_form_string", required = false, defaultValue = "-efg") String enumFormString + ); @@ -283,12 +314,18 @@ void testEnumParameters( accept = { "application/json" } ) void testGroupParameters( - @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, - @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, - @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group, - @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup, - @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup, + @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup +, + @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup +, + @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group +, + @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup +, + @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup +, @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group + ); @@ -308,6 +345,7 @@ void testGroupParameters( ) void testInlineAdditionalProperties( @RequestBody Map requestBody + ); @@ -327,8 +365,10 @@ void testInlineAdditionalProperties( contentType = "application/x-www-form-urlencoded" ) void testJsonFormData( - @RequestParam(value = "param", required = true) String param, + @RequestParam(value = "param", required = true) String param +, @RequestParam(value = "param2", required = true) String param2 + ); @@ -348,6 +388,7 @@ void testJsonFormData( ) void testNullable( @RequestBody ChildWithNullableDto childWithNullableDto + ); @@ -368,10 +409,14 @@ void testNullable( accept = { "application/json" } ) void testQueryParameterCollectionFormat( - @RequestParam(value = "pipe", required = true) List pipe, - @RequestParam(value = "http", required = true) List http, - @RequestParam(value = "url", required = true) List url, + @RequestParam(value = "pipe", required = true) List pipe +, + @RequestParam(value = "http", required = true) List http +, + @RequestParam(value = "url", required = true) List url +, @RequestParam(value = "context", required = true) List context + ); diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java index 05ab2fde6b22..b16bb98764c1 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java @@ -36,6 +36,7 @@ public interface FakeClassnameTags123Api { ) ClientDto testClassname( @RequestBody ClientDto clientDto + ); } diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/PetApi.java index afad26704ca4..5c3e999c3209 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/PetApi.java @@ -41,6 +41,7 @@ public interface PetApi { ) void addPet( @RequestBody PetDto petDto + ); @@ -60,8 +61,10 @@ void addPet( accept = { "application/json" } ) void deletePet( - @PathVariable("petId") Long petId, + @PathVariable("petId") Long petId +, @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ); @@ -81,6 +84,7 @@ void deletePet( ) List findPetsByStatus( @RequestParam(value = "status", required = true) List status + ); @@ -102,6 +106,7 @@ List findPetsByStatus( ) Set findPetsByTags( @RequestParam(value = "tags", required = true) Set tags + ); @@ -122,6 +127,7 @@ Set findPetsByTags( ) PetDto getPetById( @PathVariable("petId") Long petId + ); @@ -139,6 +145,7 @@ PetDto getPetById( ) ResponseObjectWithDifferentFieldNamesDto responseObjectDifferentNames( @PathVariable("petId") Long petId + ); @@ -161,6 +168,7 @@ ResponseObjectWithDifferentFieldNamesDto responseObjectDifferentNames( ) void updatePet( @RequestBody PetDto petDto + ); @@ -181,9 +189,12 @@ void updatePet( contentType = "application/x-www-form-urlencoded" ) void updatePetWithForm( - @PathVariable("petId") Long petId, - @RequestParam(value = "name", required = false) String name, + @PathVariable("petId") Long petId +, + @RequestParam(value = "name", required = false) String name +, @RequestParam(value = "status", required = false) String status + ); @@ -204,9 +215,12 @@ void updatePetWithForm( contentType = "multipart/form-data" ) ApiResponseDto uploadFile( - @PathVariable("petId") Long petId, - @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @PathVariable("petId") Long petId +, + @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @RequestPart(value = "file", required = false) MultipartFile file + ); @@ -227,9 +241,12 @@ ApiResponseDto uploadFile( contentType = "multipart/form-data" ) ApiResponseDto uploadFileWithRequiredFile( - @PathVariable("petId") Long petId, - @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, + @PathVariable("petId") Long petId +, + @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile +, @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata + ); } diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/StoreApi.java index 7fcf2e128a74..adec9d412d05 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/StoreApi.java @@ -37,6 +37,7 @@ public interface StoreApi { ) void deleteOrder( @PathVariable("order_id") String orderId + ); @@ -74,6 +75,7 @@ Map getInventory( ) OrderDto getOrderById( @PathVariable("order_id") Long orderId + ); @@ -94,6 +96,7 @@ OrderDto getOrderById( ) OrderDto placeOrder( @RequestBody OrderDto orderDto + ); } diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/UserApi.java index 343afd6dbe6f..618c3a222c4c 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/UserApi.java @@ -37,6 +37,7 @@ public interface UserApi { ) void createUser( @RequestBody UserDto userDto + ); @@ -56,6 +57,7 @@ void createUser( ) void createUsersWithArrayInput( @RequestBody List userDto + ); @@ -75,6 +77,7 @@ void createUsersWithArrayInput( ) void createUsersWithListInput( @RequestBody List userDto + ); @@ -94,6 +97,7 @@ void createUsersWithListInput( ) void deleteUser( @PathVariable("username") String username + ); @@ -114,6 +118,7 @@ void deleteUser( ) UserDto getUserByName( @PathVariable("username") String username + ); @@ -133,8 +138,10 @@ UserDto getUserByName( accept = { "application/json", "application/xml" } ) String loginUser( - @RequestParam(value = "username", required = true) String username, + @RequestParam(value = "username", required = true) String username +, @RequestParam(value = "password", required = true) String password + ); @@ -172,8 +179,10 @@ void logoutUser( contentType = "application/json" ) void updateUser( - @PathVariable("username") String username, + @PathVariable("username") String username +, @RequestBody UserDto userDto + ); } diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/api/AnotherFakeApi.java index 7070e620467a..5bfcbc7b7c30 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -40,6 +40,7 @@ public interface AnotherFakeApi { ) Mono call123testSpecialTags( @RequestBody Mono client + ); } diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApi.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApi.java index 6bc2326f1951..6fd56ece6252 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApi.java @@ -51,6 +51,7 @@ public interface FakeApi { ) Mono createXmlItem( @RequestBody Mono xmlItem + ); @@ -70,6 +71,7 @@ Mono createXmlItem( ) Mono fakeOuterBooleanSerialize( @RequestBody(required = false) Mono body + ); @@ -89,6 +91,7 @@ Mono fakeOuterBooleanSerialize( ) Mono fakeOuterCompositeSerialize( @RequestBody(required = false) Mono outerComposite + ); @@ -108,6 +111,7 @@ Mono fakeOuterCompositeSerialize( ) Mono fakeOuterNumberSerialize( @RequestBody(required = false) Mono body + ); @@ -127,6 +131,7 @@ Mono fakeOuterNumberSerialize( ) Mono fakeOuterStringSerialize( @RequestBody(required = false) Mono body + ); @@ -146,6 +151,7 @@ Mono fakeOuterStringSerialize( ) Mono testBodyWithFileSchema( @RequestBody Mono fileSchemaTestClass + ); @@ -164,8 +170,10 @@ Mono testBodyWithFileSchema( contentType = "application/json" ) Mono testBodyWithQueryParams( - @RequestParam(value = "query", required = true) String query, + @RequestParam(value = "query", required = true) String query +, @RequestBody Mono user + ); @@ -185,6 +193,7 @@ Mono testBodyWithQueryParams( ) Mono testClientModel( @RequestBody Mono client + ); @@ -217,20 +226,34 @@ Mono testClientModel( contentType = "application/x-www-form-urlencoded" ) Mono testEndpointParameters( - @RequestPart(value = "number", required = true) BigDecimal number, - @RequestPart(value = "double", required = true) Double _double, - @RequestPart(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @RequestPart(value = "byte", required = true) byte[] _byte, - @RequestPart(value = "integer", required = false) Integer integer, - @RequestPart(value = "int32", required = false) Integer int32, - @RequestPart(value = "int64", required = false) Long int64, - @RequestPart(value = "float", required = false) Float _float, - @RequestPart(value = "string", required = false) String string, - @RequestPart(value = "binary", required = false) Part binary, - @RequestPart(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @RequestPart(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, - @RequestPart(value = "password", required = false) String password, + @RequestPart(value = "number", required = true) BigDecimal number +, + @RequestPart(value = "double", required = true) Double _double +, + @RequestPart(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter +, + @RequestPart(value = "byte", required = true) byte[] _byte +, + @RequestPart(value = "integer", required = false) Integer integer +, + @RequestPart(value = "int32", required = false) Integer int32 +, + @RequestPart(value = "int64", required = false) Long int64 +, + @RequestPart(value = "float", required = false) Float _float +, + @RequestPart(value = "string", required = false) String string +, + @RequestPart(value = "binary", required = false) Part binary +, + @RequestPart(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date +, + @RequestPart(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime +, + @RequestPart(value = "password", required = false) String password +, @RequestPart(value = "callback", required = false) String paramCallback + ); @@ -257,14 +280,22 @@ Mono testEndpointParameters( contentType = "application/x-www-form-urlencoded" ) Mono testEnumParameters( - @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, - @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, - @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray, - @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString, - @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, - @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, - @RequestPart(value = "enum_form_string", required = false) String enumFormString + @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray +, + @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString +, + @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray +, + @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString +, + @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger +, + @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble +, + @RequestPart(value = "enum_form_string_array", required = false, defaultValue = "$") List enumFormStringArray +, + @RequestPart(value = "enum_form_string", required = false, defaultValue = "-efg") String enumFormString + ); @@ -287,12 +318,18 @@ Mono testEnumParameters( accept = { "application/json" } ) Mono testGroupParameters( - @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, - @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, - @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group, - @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup, - @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup, + @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup +, + @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup +, + @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group +, + @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup +, + @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup +, @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group + ); @@ -312,6 +349,7 @@ Mono testGroupParameters( ) Mono testInlineAdditionalProperties( @RequestBody Mono> requestBody + ); @@ -331,8 +369,10 @@ Mono testInlineAdditionalProperties( contentType = "application/x-www-form-urlencoded" ) Mono testJsonFormData( - @RequestPart(value = "param", required = true) String param, + @RequestPart(value = "param", required = true) String param +, @RequestPart(value = "param2", required = true) String param2 + ); @@ -352,6 +392,7 @@ Mono testJsonFormData( ) Mono testNullable( @RequestBody Mono childWithNullable + ); @@ -372,10 +413,14 @@ Mono testNullable( accept = { "application/json" } ) Mono testQueryParameterCollectionFormat( - @RequestParam(value = "pipe", required = true) List pipe, - @RequestParam(value = "http", required = true) List http, - @RequestParam(value = "url", required = true) List url, + @RequestParam(value = "pipe", required = true) List pipe +, + @RequestParam(value = "http", required = true) List http +, + @RequestParam(value = "url", required = true) List url +, @RequestParam(value = "context", required = true) List context + ); diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java index 992364ebed21..bce126bbf9ed 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java @@ -40,6 +40,7 @@ public interface FakeClassnameTags123Api { ) Mono testClassname( @RequestBody Mono client + ); } diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/api/PetApi.java index fbd79fbbe74a..387dd98a21ae 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/api/PetApi.java @@ -45,6 +45,7 @@ public interface PetApi { ) Mono addPet( @RequestBody Mono pet + ); @@ -64,8 +65,10 @@ Mono addPet( accept = { "application/json" } ) Mono deletePet( - @PathVariable("petId") Long petId, + @PathVariable("petId") Long petId +, @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ); @@ -85,6 +88,7 @@ Mono deletePet( ) Flux findPetsByStatus( @RequestParam(value = "status", required = true) List status + ); @@ -106,6 +110,7 @@ Flux findPetsByStatus( ) Flux findPetsByTags( @RequestParam(value = "tags", required = true) Set tags + ); @@ -126,6 +131,7 @@ Flux findPetsByTags( ) Mono getPetById( @PathVariable("petId") Long petId + ); @@ -143,6 +149,7 @@ Mono getPetById( ) Mono responseObjectDifferentNames( @PathVariable("petId") Long petId + ); @@ -165,6 +172,7 @@ Mono responseObjectDifferentNames( ) Mono updatePet( @RequestBody Mono pet + ); @@ -185,9 +193,12 @@ Mono updatePet( contentType = "application/x-www-form-urlencoded" ) Mono updatePetWithForm( - @PathVariable("petId") Long petId, - @RequestPart(value = "name", required = false) String name, + @PathVariable("petId") Long petId +, + @RequestPart(value = "name", required = false) String name +, @RequestPart(value = "status", required = false) String status + ); @@ -208,9 +219,12 @@ Mono updatePetWithForm( contentType = "multipart/form-data" ) Mono uploadFile( - @PathVariable("petId") Long petId, - @RequestPart(value = "additionalMetadata", required = false) String additionalMetadata, + @PathVariable("petId") Long petId +, + @RequestPart(value = "additionalMetadata", required = false) String additionalMetadata +, @RequestPart(value = "file", required = false) Part file + ); @@ -231,9 +245,12 @@ Mono uploadFile( contentType = "multipart/form-data" ) Mono uploadFileWithRequiredFile( - @PathVariable("petId") Long petId, - @RequestPart(value = "requiredFile", required = true) Part requiredFile, + @PathVariable("petId") Long petId +, + @RequestPart(value = "requiredFile", required = true) Part requiredFile +, @RequestPart(value = "additionalMetadata", required = false) String additionalMetadata + ); } diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/api/StoreApi.java index 329144dc6941..675c2f490be1 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/api/StoreApi.java @@ -41,6 +41,7 @@ public interface StoreApi { ) Mono deleteOrder( @PathVariable("order_id") String orderId + ); @@ -78,6 +79,7 @@ Mono> getInventory( ) Mono getOrderById( @PathVariable("order_id") Long orderId + ); @@ -98,6 +100,7 @@ Mono getOrderById( ) Mono placeOrder( @RequestBody Mono order + ); } diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/api/UserApi.java index fe5db1c66b6f..2bfb3260fb32 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/api/UserApi.java @@ -41,6 +41,7 @@ public interface UserApi { ) Mono createUser( @RequestBody Mono user + ); @@ -60,6 +61,7 @@ Mono createUser( ) Mono createUsersWithArrayInput( @RequestBody Flux user + ); @@ -79,6 +81,7 @@ Mono createUsersWithArrayInput( ) Mono createUsersWithListInput( @RequestBody Flux user + ); @@ -98,6 +101,7 @@ Mono createUsersWithListInput( ) Mono deleteUser( @PathVariable("username") String username + ); @@ -118,6 +122,7 @@ Mono deleteUser( ) Mono getUserByName( @PathVariable("username") String username + ); @@ -137,8 +142,10 @@ Mono getUserByName( accept = { "application/json", "application/xml" } ) Mono loginUser( - @RequestParam(value = "username", required = true) String username, + @RequestParam(value = "username", required = true) String username +, @RequestParam(value = "password", required = true) String password + ); @@ -176,8 +183,10 @@ Mono logoutUser( contentType = "application/json" ) Mono updateUser( - @PathVariable("username") String username, + @PathVariable("username") String username +, @RequestBody Mono user + ); } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java index f811edaee06d..b154f058914d 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -39,6 +39,7 @@ public interface AnotherFakeApi { ) Mono> call123testSpecialTags( @RequestBody Mono client + ); } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeApi.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeApi.java index 57ef1f0973b8..726c76fb0377 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeApi.java @@ -50,6 +50,7 @@ public interface FakeApi { ) Mono> createXmlItem( @RequestBody Mono xmlItem + ); @@ -68,6 +69,7 @@ Mono> createXmlItem( ) Mono> fakeOuterBooleanSerialize( @RequestBody(required = false) Mono body + ); @@ -86,6 +88,7 @@ Mono> fakeOuterBooleanSerialize( ) Mono> fakeOuterCompositeSerialize( @RequestBody(required = false) Mono outerComposite + ); @@ -104,6 +107,7 @@ Mono> fakeOuterCompositeSerialize( ) Mono> fakeOuterNumberSerialize( @RequestBody(required = false) Mono body + ); @@ -122,6 +126,7 @@ Mono> fakeOuterNumberSerialize( ) Mono> fakeOuterStringSerialize( @RequestBody(required = false) Mono body + ); @@ -140,6 +145,7 @@ Mono> fakeOuterStringSerialize( ) Mono> testBodyWithFileSchema( @RequestBody Mono fileSchemaTestClass + ); @@ -157,8 +163,10 @@ Mono> testBodyWithFileSchema( contentType = "application/json" ) Mono> testBodyWithQueryParams( - @RequestParam(value = "query", required = true) String query, + @RequestParam(value = "query", required = true) String query +, @RequestBody Mono user + ); @@ -177,6 +185,7 @@ Mono> testBodyWithQueryParams( ) Mono> testClientModel( @RequestBody Mono client + ); @@ -208,20 +217,34 @@ Mono> testClientModel( contentType = "application/x-www-form-urlencoded" ) Mono> testEndpointParameters( - @RequestPart(value = "number", required = true) BigDecimal number, - @RequestPart(value = "double", required = true) Double _double, - @RequestPart(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @RequestPart(value = "byte", required = true) byte[] _byte, - @RequestPart(value = "integer", required = false) Integer integer, - @RequestPart(value = "int32", required = false) Integer int32, - @RequestPart(value = "int64", required = false) Long int64, - @RequestPart(value = "float", required = false) Float _float, - @RequestPart(value = "string", required = false) String string, - @RequestPart(value = "binary", required = false) Part binary, - @RequestPart(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @RequestPart(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, - @RequestPart(value = "password", required = false) String password, + @RequestPart(value = "number", required = true) BigDecimal number +, + @RequestPart(value = "double", required = true) Double _double +, + @RequestPart(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter +, + @RequestPart(value = "byte", required = true) byte[] _byte +, + @RequestPart(value = "integer", required = false) Integer integer +, + @RequestPart(value = "int32", required = false) Integer int32 +, + @RequestPart(value = "int64", required = false) Long int64 +, + @RequestPart(value = "float", required = false) Float _float +, + @RequestPart(value = "string", required = false) String string +, + @RequestPart(value = "binary", required = false) Part binary +, + @RequestPart(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date +, + @RequestPart(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime +, + @RequestPart(value = "password", required = false) String password +, @RequestPart(value = "callback", required = false) String paramCallback + ); @@ -247,14 +270,22 @@ Mono> testEndpointParameters( contentType = "application/x-www-form-urlencoded" ) Mono> testEnumParameters( - @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, - @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, - @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray, - @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString, - @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, - @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, - @RequestPart(value = "enum_form_string", required = false) String enumFormString + @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray +, + @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString +, + @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray +, + @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString +, + @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger +, + @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble +, + @RequestPart(value = "enum_form_string_array", required = false, defaultValue = "$") List enumFormStringArray +, + @RequestPart(value = "enum_form_string", required = false, defaultValue = "-efg") String enumFormString + ); @@ -276,12 +307,18 @@ Mono> testEnumParameters( accept = { "application/json" } ) Mono> testGroupParameters( - @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, - @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, - @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group, - @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup, - @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup, + @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup +, + @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup +, + @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group +, + @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup +, + @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup +, @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group + ); @@ -300,6 +337,7 @@ Mono> testGroupParameters( ) Mono> testInlineAdditionalProperties( @RequestBody Mono> requestBody + ); @@ -318,8 +356,10 @@ Mono> testInlineAdditionalProperties( contentType = "application/x-www-form-urlencoded" ) Mono> testJsonFormData( - @RequestPart(value = "param", required = true) String param, + @RequestPart(value = "param", required = true) String param +, @RequestPart(value = "param2", required = true) String param2 + ); @@ -338,6 +378,7 @@ Mono> testJsonFormData( ) Mono> testNullable( @RequestBody Mono childWithNullable + ); @@ -357,10 +398,14 @@ Mono> testNullable( accept = { "application/json" } ) Mono> testQueryParameterCollectionFormat( - @RequestParam(value = "pipe", required = true) List pipe, - @RequestParam(value = "http", required = true) List http, - @RequestParam(value = "url", required = true) List url, + @RequestParam(value = "pipe", required = true) List pipe +, + @RequestParam(value = "http", required = true) List http +, + @RequestParam(value = "url", required = true) List url +, @RequestParam(value = "context", required = true) List context + ); diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java index d8d1ca28f6f9..fc61c2482260 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java @@ -39,6 +39,7 @@ public interface FakeClassnameTags123Api { ) Mono> testClassname( @RequestBody Mono client + ); } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/PetApi.java index 81f456a2badf..28cd6816998d 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/PetApi.java @@ -44,6 +44,7 @@ public interface PetApi { ) Mono> addPet( @RequestBody Mono pet + ); @@ -62,8 +63,10 @@ Mono> addPet( accept = { "application/json" } ) Mono> deletePet( - @PathVariable("petId") Long petId, + @PathVariable("petId") Long petId +, @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ); @@ -82,6 +85,7 @@ Mono> deletePet( ) Mono>> findPetsByStatus( @RequestParam(value = "status", required = true) List status + ); @@ -102,6 +106,7 @@ Mono>> findPetsByStatus( ) Mono>> findPetsByTags( @RequestParam(value = "tags", required = true) Set tags + ); @@ -121,6 +126,7 @@ Mono>> findPetsByTags( ) Mono> getPetById( @PathVariable("petId") Long petId + ); @@ -137,6 +143,7 @@ Mono> getPetById( ) Mono> responseObjectDifferentNames( @PathVariable("petId") Long petId + ); @@ -158,6 +165,7 @@ Mono> responseObjectDiffer ) Mono> updatePet( @RequestBody Mono pet + ); @@ -177,9 +185,12 @@ Mono> updatePet( contentType = "application/x-www-form-urlencoded" ) Mono> updatePetWithForm( - @PathVariable("petId") Long petId, - @RequestPart(value = "name", required = false) String name, + @PathVariable("petId") Long petId +, + @RequestPart(value = "name", required = false) String name +, @RequestPart(value = "status", required = false) String status + ); @@ -199,9 +210,12 @@ Mono> updatePetWithForm( contentType = "multipart/form-data" ) Mono> uploadFile( - @PathVariable("petId") Long petId, - @RequestPart(value = "additionalMetadata", required = false) String additionalMetadata, + @PathVariable("petId") Long petId +, + @RequestPart(value = "additionalMetadata", required = false) String additionalMetadata +, @RequestPart(value = "file", required = false) Part file + ); @@ -221,9 +235,12 @@ Mono> uploadFile( contentType = "multipart/form-data" ) Mono> uploadFileWithRequiredFile( - @PathVariable("petId") Long petId, - @RequestPart(value = "requiredFile", required = true) Part requiredFile, + @PathVariable("petId") Long petId +, + @RequestPart(value = "requiredFile", required = true) Part requiredFile +, @RequestPart(value = "additionalMetadata", required = false) String additionalMetadata + ); } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/StoreApi.java index dcbffc47c79d..3a9fa1a7600d 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/StoreApi.java @@ -40,6 +40,7 @@ public interface StoreApi { ) Mono> deleteOrder( @PathVariable("order_id") String orderId + ); @@ -75,6 +76,7 @@ Mono>> getInventory( ) Mono> getOrderById( @PathVariable("order_id") Long orderId + ); @@ -94,6 +96,7 @@ Mono> getOrderById( ) Mono> placeOrder( @RequestBody Mono order + ); } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/UserApi.java index 9aefd61016a7..6db4cd3c69ec 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/UserApi.java @@ -40,6 +40,7 @@ public interface UserApi { ) Mono> createUser( @RequestBody Mono user + ); @@ -58,6 +59,7 @@ Mono> createUser( ) Mono> createUsersWithArrayInput( @RequestBody Flux user + ); @@ -76,6 +78,7 @@ Mono> createUsersWithArrayInput( ) Mono> createUsersWithListInput( @RequestBody Flux user + ); @@ -94,6 +97,7 @@ Mono> createUsersWithListInput( ) Mono> deleteUser( @PathVariable("username") String username + ); @@ -113,6 +117,7 @@ Mono> deleteUser( ) Mono> getUserByName( @PathVariable("username") String username + ); @@ -131,8 +136,10 @@ Mono> getUserByName( accept = { "application/json", "application/xml" } ) Mono> loginUser( - @RequestParam(value = "username", required = true) String username, + @RequestParam(value = "username", required = true) String username +, @RequestParam(value = "password", required = true) String password + ); @@ -168,8 +175,10 @@ Mono> logoutUser( contentType = "application/json" ) Mono> updateUser( - @PathVariable("username") String username, + @PathVariable("username") String username +, @RequestBody Mono user + ); } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/AnotherFakeApi.java index 48d7b35b742a..7050e5bebf0b 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -35,6 +35,7 @@ public interface AnotherFakeApi { ) ResponseEntity call123testSpecialTags( @RequestBody ClientDto clientDto + ); } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeApi.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeApi.java index 4146f18e3e32..2e858d5e8926 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeApi.java @@ -46,6 +46,7 @@ public interface FakeApi { ) ResponseEntity createXmlItem( @RequestBody XmlItemDto xmlItemDto + ); @@ -64,6 +65,7 @@ ResponseEntity createXmlItem( ) ResponseEntity fakeOuterBooleanSerialize( @RequestBody(required = false) @Nullable Boolean body + ); @@ -82,6 +84,7 @@ ResponseEntity fakeOuterBooleanSerialize( ) ResponseEntity fakeOuterCompositeSerialize( @RequestBody(required = false) @Nullable OuterCompositeDto outerCompositeDto + ); @@ -100,6 +103,7 @@ ResponseEntity fakeOuterCompositeSerialize( ) ResponseEntity fakeOuterNumberSerialize( @RequestBody(required = false) @Nullable BigDecimal body + ); @@ -118,6 +122,7 @@ ResponseEntity fakeOuterNumberSerialize( ) ResponseEntity fakeOuterStringSerialize( @RequestBody(required = false) @Nullable String body + ); @@ -136,6 +141,7 @@ ResponseEntity fakeOuterStringSerialize( ) ResponseEntity testBodyWithFileSchema( @RequestBody FileSchemaTestClassDto fileSchemaTestClassDto + ); @@ -153,8 +159,10 @@ ResponseEntity testBodyWithFileSchema( contentType = "application/json" ) ResponseEntity testBodyWithQueryParams( - @RequestParam(value = "query", required = true) String query, + @RequestParam(value = "query", required = true) String query +, @RequestBody UserDto userDto + ); @@ -173,6 +181,7 @@ ResponseEntity testBodyWithQueryParams( ) ResponseEntity testClientModel( @RequestBody ClientDto clientDto + ); @@ -204,20 +213,34 @@ ResponseEntity testClientModel( contentType = "application/x-www-form-urlencoded" ) ResponseEntity testEndpointParameters( - @RequestParam(value = "number", required = true) BigDecimal number, - @RequestParam(value = "double", required = true) Double _double, - @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @RequestParam(value = "byte", required = true) byte[] _byte, - @RequestParam(value = "integer", required = false) Integer integer, - @RequestParam(value = "int32", required = false) Integer int32, - @RequestParam(value = "int64", required = false) Long int64, - @RequestParam(value = "float", required = false) Float _float, - @RequestParam(value = "string", required = false) String string, - @RequestPart(value = "binary", required = false) MultipartFile binary, - @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, - @RequestParam(value = "password", required = false) String password, + @RequestParam(value = "number", required = true) BigDecimal number +, + @RequestParam(value = "double", required = true) Double _double +, + @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter +, + @RequestParam(value = "byte", required = true) byte[] _byte +, + @RequestParam(value = "integer", required = false) Integer integer +, + @RequestParam(value = "int32", required = false) Integer int32 +, + @RequestParam(value = "int64", required = false) Long int64 +, + @RequestParam(value = "float", required = false) Float _float +, + @RequestParam(value = "string", required = false) String string +, + @RequestPart(value = "binary", required = false) MultipartFile binary +, + @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date +, + @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime +, + @RequestParam(value = "password", required = false) String password +, @RequestParam(value = "callback", required = false) String paramCallback + ); @@ -243,14 +266,22 @@ ResponseEntity testEndpointParameters( contentType = "application/x-www-form-urlencoded" ) ResponseEntity testEnumParameters( - @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, - @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, - @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray, - @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString, - @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, - @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, - @RequestParam(value = "enum_form_string", required = false) String enumFormString + @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray +, + @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString +, + @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray +, + @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString +, + @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger +, + @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble +, + @RequestPart(value = "enum_form_string_array", required = false, defaultValue = "$") List enumFormStringArray +, + @RequestParam(value = "enum_form_string", required = false, defaultValue = "-efg") String enumFormString + ); @@ -272,12 +303,18 @@ ResponseEntity testEnumParameters( accept = { "application/json" } ) ResponseEntity testGroupParameters( - @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, - @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, - @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group, - @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup, - @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup, + @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup +, + @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup +, + @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group +, + @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup +, + @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup +, @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group + ); @@ -296,6 +333,7 @@ ResponseEntity testGroupParameters( ) ResponseEntity testInlineAdditionalProperties( @RequestBody Map requestBody + ); @@ -314,8 +352,10 @@ ResponseEntity testInlineAdditionalProperties( contentType = "application/x-www-form-urlencoded" ) ResponseEntity testJsonFormData( - @RequestParam(value = "param", required = true) String param, + @RequestParam(value = "param", required = true) String param +, @RequestParam(value = "param2", required = true) String param2 + ); @@ -334,6 +374,7 @@ ResponseEntity testJsonFormData( ) ResponseEntity testNullable( @RequestBody ChildWithNullableDto childWithNullableDto + ); @@ -353,10 +394,14 @@ ResponseEntity testNullable( accept = { "application/json" } ) ResponseEntity testQueryParameterCollectionFormat( - @RequestParam(value = "pipe", required = true) List pipe, - @RequestParam(value = "http", required = true) List http, - @RequestParam(value = "url", required = true) List url, + @RequestParam(value = "pipe", required = true) List pipe +, + @RequestParam(value = "http", required = true) List http +, + @RequestParam(value = "url", required = true) List url +, @RequestParam(value = "context", required = true) List context + ); diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java index 545711798af0..04fd810f0eee 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java @@ -35,6 +35,7 @@ public interface FakeClassnameTags123Api { ) ResponseEntity testClassname( @RequestBody ClientDto clientDto + ); } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/PetApi.java index 4c5e99f5bdf7..4d8d6d3394cc 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/PetApi.java @@ -40,6 +40,7 @@ public interface PetApi { ) ResponseEntity addPet( @RequestBody PetDto petDto + ); @@ -58,8 +59,10 @@ ResponseEntity addPet( accept = { "application/json" } ) ResponseEntity deletePet( - @PathVariable("petId") Long petId, + @PathVariable("petId") Long petId +, @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ); @@ -78,6 +81,7 @@ ResponseEntity deletePet( ) ResponseEntity> findPetsByStatus( @RequestParam(value = "status", required = true) List status + ); @@ -98,6 +102,7 @@ ResponseEntity> findPetsByStatus( ) ResponseEntity> findPetsByTags( @RequestParam(value = "tags", required = true) Set tags + ); @@ -117,6 +122,7 @@ ResponseEntity> findPetsByTags( ) ResponseEntity getPetById( @PathVariable("petId") Long petId + ); @@ -133,6 +139,7 @@ ResponseEntity getPetById( ) ResponseEntity responseObjectDifferentNames( @PathVariable("petId") Long petId + ); @@ -154,6 +161,7 @@ ResponseEntity responseObjectDifferent ) ResponseEntity updatePet( @RequestBody PetDto petDto + ); @@ -173,9 +181,12 @@ ResponseEntity updatePet( contentType = "application/x-www-form-urlencoded" ) ResponseEntity updatePetWithForm( - @PathVariable("petId") Long petId, - @RequestParam(value = "name", required = false) String name, + @PathVariable("petId") Long petId +, + @RequestParam(value = "name", required = false) String name +, @RequestParam(value = "status", required = false) String status + ); @@ -195,9 +206,12 @@ ResponseEntity updatePetWithForm( contentType = "multipart/form-data" ) ResponseEntity uploadFile( - @PathVariable("petId") Long petId, - @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @PathVariable("petId") Long petId +, + @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @RequestPart(value = "file", required = false) MultipartFile file + ); @@ -217,9 +231,12 @@ ResponseEntity uploadFile( contentType = "multipart/form-data" ) ResponseEntity uploadFileWithRequiredFile( - @PathVariable("petId") Long petId, - @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, + @PathVariable("petId") Long petId +, + @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile +, @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata + ); } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/StoreApi.java index 296ad6b01acc..a261b975de7e 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/StoreApi.java @@ -36,6 +36,7 @@ public interface StoreApi { ) ResponseEntity deleteOrder( @PathVariable("order_id") String orderId + ); @@ -71,6 +72,7 @@ ResponseEntity> getInventory( ) ResponseEntity getOrderById( @PathVariable("order_id") Long orderId + ); @@ -90,6 +92,7 @@ ResponseEntity getOrderById( ) ResponseEntity placeOrder( @RequestBody OrderDto orderDto + ); } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/UserApi.java index 81f27f575a3b..8c63ac4ffbde 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/UserApi.java @@ -36,6 +36,7 @@ public interface UserApi { ) ResponseEntity createUser( @RequestBody UserDto userDto + ); @@ -54,6 +55,7 @@ ResponseEntity createUser( ) ResponseEntity createUsersWithArrayInput( @RequestBody List userDto + ); @@ -72,6 +74,7 @@ ResponseEntity createUsersWithArrayInput( ) ResponseEntity createUsersWithListInput( @RequestBody List userDto + ); @@ -90,6 +93,7 @@ ResponseEntity createUsersWithListInput( ) ResponseEntity deleteUser( @PathVariable("username") String username + ); @@ -109,6 +113,7 @@ ResponseEntity deleteUser( ) ResponseEntity getUserByName( @PathVariable("username") String username + ); @@ -127,8 +132,10 @@ ResponseEntity getUserByName( accept = { "application/json", "application/xml" } ) ResponseEntity loginUser( - @RequestParam(value = "username", required = true) String username, + @RequestParam(value = "username", required = true) String username +, @RequestParam(value = "password", required = true) String password + ); @@ -164,8 +171,10 @@ ResponseEntity logoutUser( contentType = "application/json" ) ResponseEntity updateUser( - @PathVariable("username") String username, + @PathVariable("username") String username +, @RequestBody UserDto userDto + ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/PetApi.java index 6b83c634c61a..dc747f727e37 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/PetApi.java @@ -41,6 +41,7 @@ public interface PetApi { ) ResponseEntity addPet( @Valid @RequestBody Pet pet + ); @@ -58,8 +59,10 @@ ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) ResponseEntity deletePet( - @NotNull @PathVariable("petId") Long petId, + @NotNull @PathVariable("petId") Long petId +, @RequestHeader(value = "api_key", required = false) Optional apiKey + ); @@ -79,6 +82,7 @@ ResponseEntity deletePet( ) ResponseEntity> findPetsByStatus( @NotNull @Valid @RequestParam(value = "status", required = true) @Deprecated List status + ); @@ -100,6 +104,7 @@ ResponseEntity> findPetsByStatus( ) ResponseEntity> findPetsByTags( @NotNull @Valid @RequestParam(value = "tags", required = true) List tags + ); @@ -120,6 +125,7 @@ ResponseEntity> findPetsByTags( ) ResponseEntity getPetById( @NotNull @PathVariable("petId") Long petId + ); @@ -144,6 +150,7 @@ ResponseEntity getPetById( ) ResponseEntity updatePet( @Valid @RequestBody Pet pet + ); @@ -163,9 +170,12 @@ ResponseEntity updatePet( consumes = "application/x-www-form-urlencoded" ) ResponseEntity updatePetWithForm( - @NotNull @PathVariable("petId") Long petId, - @Valid @RequestParam(value = "name", required = false) Optional name, + @NotNull @PathVariable("petId") Long petId +, + @Valid @RequestParam(value = "name", required = false) Optional name +, @Valid @RequestParam(value = "status", required = false) Optional status + ); @@ -186,9 +196,12 @@ ResponseEntity updatePetWithForm( consumes = "multipart/form-data" ) ResponseEntity uploadFile( - @NotNull @PathVariable("petId") Long petId, - @Valid @RequestParam(value = "additionalMetadata", required = false) Optional additionalMetadata, + @NotNull @PathVariable("petId") Long petId +, + @Valid @RequestParam(value = "additionalMetadata", required = false) Optional additionalMetadata +, @RequestPart(value = "file", required = false) MultipartFile file + ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/StoreApi.java index 4b51833351b0..c082417ad4fc 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/StoreApi.java @@ -38,6 +38,7 @@ public interface StoreApi { ) ResponseEntity deleteOrder( @NotNull @PathVariable("orderId") String orderId + ); @@ -75,6 +76,7 @@ ResponseEntity> getInventory( ) ResponseEntity getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @PathVariable("orderId") Long orderId + ); @@ -95,6 +97,7 @@ ResponseEntity getOrderById( ) ResponseEntity placeOrder( @Valid @RequestBody Order order + ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/UserApi.java index eaa48da4cf06..93f6d5e72624 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/UserApi.java @@ -38,6 +38,7 @@ public interface UserApi { ) ResponseEntity createUser( @Valid @RequestBody User user + ); @@ -56,6 +57,7 @@ ResponseEntity createUser( ) ResponseEntity createUsersWithArrayInput( @Valid @RequestBody List<@Valid User> user + ); @@ -74,6 +76,7 @@ ResponseEntity createUsersWithArrayInput( ) ResponseEntity createUsersWithListInput( @Valid @RequestBody List<@Valid User> user + ); @@ -92,6 +95,7 @@ ResponseEntity createUsersWithListInput( ) ResponseEntity deleteUser( @NotNull @PathVariable("username") String username + ); @@ -112,6 +116,7 @@ ResponseEntity deleteUser( ) ResponseEntity getUserByName( @NotNull @PathVariable("username") String username + ); @@ -131,8 +136,10 @@ ResponseEntity getUserByName( produces = { "application/json", "application/xml" } ) ResponseEntity loginUser( - @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @Valid @RequestParam(value = "password", required = true) String password + ); @@ -168,8 +175,10 @@ ResponseEntity logoutUser( consumes = "application/json" ) ResponseEntity updateUser( - @NotNull @PathVariable("username") String username, + @NotNull @PathVariable("username") String username +, @Valid @RequestBody User user + ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/PetApi.java index ea5353c19cf3..77d84ef5feea 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/PetApi.java @@ -70,6 +70,7 @@ public interface PetApi { ) ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ); @@ -99,8 +100,10 @@ ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) ResponseEntity deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ); @@ -136,6 +139,7 @@ ResponseEntity deletePet( ) ResponseEntity> findPetsByStatus( @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) @Deprecated List status + ); @@ -174,6 +178,7 @@ ResponseEntity> findPetsByStatus( ) ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List tags + ); @@ -211,6 +216,7 @@ ResponseEntity> findPetsByTags( ) ResponseEntity getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + ); @@ -254,6 +260,7 @@ ResponseEntity getPetById( ) ResponseEntity updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ); @@ -285,9 +292,12 @@ ResponseEntity updatePet( consumes = "application/x-www-form-urlencoded" ) ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, + @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name +, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status + ); @@ -322,9 +332,12 @@ ResponseEntity updatePetWithForm( consumes = "multipart/form-data" ) ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file + ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java index aa939d57058b..3f67664795a1 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java @@ -61,6 +61,7 @@ public interface StoreApi { ) ResponseEntity deleteOrder( @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId + ); @@ -126,6 +127,7 @@ ResponseEntity> getInventory( ) ResponseEntity getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId + ); @@ -159,6 +161,7 @@ ResponseEntity getOrderById( ) ResponseEntity placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order + ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java index 6035237324a2..c896011c576a 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java @@ -63,6 +63,7 @@ public interface UserApi { ) ResponseEntity createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user + ); @@ -93,6 +94,7 @@ ResponseEntity createUser( ) ResponseEntity createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ); @@ -123,6 +125,7 @@ ResponseEntity createUsersWithArrayInput( ) ResponseEntity createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ); @@ -154,6 +157,7 @@ ResponseEntity createUsersWithListInput( ) ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ); @@ -188,6 +192,7 @@ ResponseEntity deleteUser( ) ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ); @@ -220,8 +225,10 @@ ResponseEntity getUserByName( produces = { "application/json", "application/xml" } ) ResponseEntity loginUser( - @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password + ); @@ -282,8 +289,10 @@ ResponseEntity logoutUser( consumes = "application/json" ) ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username +, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user + ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java index 86e5acb31932..1e6f2c670f72 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java @@ -71,6 +71,7 @@ public interface PetApi { ) CompletableFuture> addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ); @@ -100,8 +101,10 @@ CompletableFuture> addPet( value = PetApi.PATH_DELETE_PET ) CompletableFuture> deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ); @@ -137,6 +140,7 @@ CompletableFuture> deletePet( ) CompletableFuture>> findPetsByStatus( @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) @Deprecated List status + ); @@ -175,6 +179,7 @@ CompletableFuture>> findPetsByStatus( ) CompletableFuture>> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List tags + ); @@ -212,6 +217,7 @@ CompletableFuture>> findPetsByTags( ) CompletableFuture> getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + ); @@ -255,6 +261,7 @@ CompletableFuture> getPetById( ) CompletableFuture> updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ); @@ -286,9 +293,12 @@ CompletableFuture> updatePet( consumes = "application/x-www-form-urlencoded" ) CompletableFuture> updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, + @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name +, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status + ); @@ -323,9 +333,12 @@ CompletableFuture> updatePetWithForm( consumes = "multipart/form-data" ) CompletableFuture> uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file + ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java index 3b397bc33fe2..1a5169ae3c1c 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java @@ -62,6 +62,7 @@ public interface StoreApi { ) CompletableFuture> deleteOrder( @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId + ); @@ -127,6 +128,7 @@ CompletableFuture>> getInventory( ) CompletableFuture> getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId + ); @@ -160,6 +162,7 @@ CompletableFuture> getOrderById( ) CompletableFuture> placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order + ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java index a40dc05ed7c9..485e60b8afc1 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java @@ -64,6 +64,7 @@ public interface UserApi { ) CompletableFuture> createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user + ); @@ -94,6 +95,7 @@ CompletableFuture> createUser( ) CompletableFuture> createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ); @@ -124,6 +126,7 @@ CompletableFuture> createUsersWithArrayInput( ) CompletableFuture> createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ); @@ -155,6 +158,7 @@ CompletableFuture> createUsersWithListInput( ) CompletableFuture> deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ); @@ -189,6 +193,7 @@ CompletableFuture> deleteUser( ) CompletableFuture> getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ); @@ -221,8 +226,10 @@ CompletableFuture> getUserByName( produces = { "application/json", "application/xml" } ) CompletableFuture> loginUser( - @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password + ); @@ -283,8 +290,10 @@ CompletableFuture> logoutUser( consumes = "application/json" ) CompletableFuture> updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username +, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user + ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java index 136cc16eb397..f98dc507a61e 100644 --- a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java @@ -59,10 +59,14 @@ public interface DefaultApi { value = DefaultApi.PATH_GET ) ResponseEntity get( - @NotNull @Parameter(name = "date", description = "A date path parameter", required = true, in = ParameterIn.PATH) @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @NotNull @Parameter(name = "dateTime", description = "A date-time query parameter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "dateTime", required = true, defaultValue = "1973-12-19T03:39:57-08:00") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, - @NotNull @Parameter(name = "X-Order-Date", description = "A date header parameter", required = true, in = ParameterIn.HEADER) @RequestHeader(value = "X-Order-Date", required = true, defaultValue = "1974-01-01") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate xOrderDate, - @Parameter(name = "loginDate", description = "A date cookie parameter", in = ParameterIn.COOKIE) @CookieValue(name = "loginDate", required = false, defaultValue = "1975-01-01") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate loginDate + @NotNull @Parameter(name = "date", description = "A date path parameter", required = true, in = ParameterIn.PATH) @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date +, + @NotNull @Parameter(name = "dateTime", description = "A date-time query parameter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "dateTime", required = true, defaultValue = "1973-12-19T03:39:57-08:00") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime +, + @NotNull @Parameter(name = "X-Order-Date", description = "A date header parameter", required = true, in = ParameterIn.HEADER) @RequestHeader(value = "X-Order-Date", required = true, defaultValue = "1974-01-01") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate xOrderDate +, + +@Parameter(name = "loginDate", description = "A date cookie parameter", in = ParameterIn.COOKIE) @CookieValue(name = "loginDate", required = false, defaultValue = "1975-01-01") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate loginDate ); @@ -88,8 +92,10 @@ ResponseEntity get( consumes = "application/x-www-form-urlencoded" ) ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "date", description = "A date path parameter", required = true, in = ParameterIn.PATH) @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @Parameter(name = "visitDate", description = "Updated last visit timestamp") @Valid @RequestParam(value = "visitDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime visitDate + @NotNull @Parameter(name = "date", description = "A date path parameter", required = true, in = ParameterIn.PATH) @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date +, + @Parameter(name = "visitDate", description = "Updated last visit timestamp") @Valid @RequestParam(value = "visitDate", required = false, defaultValue = "1971-12-19T03:39:57-08:00") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime visitDate + ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/api/PetApi.java index 69d772682f34..5710d8144c90 100644 --- a/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/api/PetApi.java @@ -68,6 +68,7 @@ public interface PetApi { ) ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java index 7c0f5533d6e2..5ce625d264ad 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -62,6 +62,7 @@ public interface AnotherFakeApi { ) ResponseEntity call123testSpecialTags( @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client + ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java index c8828faf51a3..57b45a2bd548 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java @@ -70,6 +70,7 @@ public interface FakeApi { ) ResponseEntity createXmlItem( @Parameter(name = "XmlItem", description = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem + ); @@ -99,6 +100,7 @@ ResponseEntity createXmlItem( ) ResponseEntity fakeOuterBooleanSerialize( @Parameter(name = "body", description = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body + ); @@ -128,6 +130,7 @@ ResponseEntity fakeOuterBooleanSerialize( ) ResponseEntity fakeOuterCompositeSerialize( @Parameter(name = "OuterComposite", description = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite outerComposite + ); @@ -157,6 +160,7 @@ ResponseEntity fakeOuterCompositeSerialize( ) ResponseEntity fakeOuterNumberSerialize( @Parameter(name = "body", description = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body + ); @@ -186,6 +190,7 @@ ResponseEntity fakeOuterNumberSerialize( ) ResponseEntity fakeOuterStringSerialize( @Parameter(name = "body", description = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body + ); @@ -212,6 +217,7 @@ ResponseEntity fakeOuterStringSerialize( ) ResponseEntity testBodyWithFileSchema( @Parameter(name = "FileSchemaTestClass", description = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass + ); @@ -236,8 +242,10 @@ ResponseEntity testBodyWithFileSchema( consumes = "application/json" ) ResponseEntity testBodyWithQueryParams( - @NotNull @Parameter(name = "query", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "query", required = true) String query, + @NotNull @Parameter(name = "query", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "query", required = true) String query +, @Parameter(name = "User", description = "", required = true) @Valid @RequestBody User user + ); @@ -268,6 +276,7 @@ ResponseEntity testBodyWithQueryParams( ) ResponseEntity testClientModel( @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client + ); @@ -312,20 +321,34 @@ ResponseEntity testClientModel( consumes = "application/x-www-form-urlencoded" ) ResponseEntity testEndpointParameters( - @Parameter(name = "number", description = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @Parameter(name = "double", description = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, - @Parameter(name = "pattern_without_delimiter", description = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @Parameter(name = "byte", description = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @Parameter(name = "integer", description = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer, - @Parameter(name = "int32", description = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32, - @Parameter(name = "int64", description = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, - @Parameter(name = "float", description = "None") @DecimalMax(value = "987.6") @Valid @RequestParam(value = "float", required = false) Float _float, - @Parameter(name = "string", description = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestParam(value = "string", required = false) String string, - @Parameter(name = "binary", description = "None") @RequestPart(value = "binary", required = false) MultipartFile binary, - @Parameter(name = "date", description = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @Parameter(name = "dateTime", description = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, - @Parameter(name = "password", description = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password, + @Parameter(name = "number", description = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number +, + @Parameter(name = "double", description = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double +, + @Parameter(name = "pattern_without_delimiter", description = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter +, + @Parameter(name = "byte", description = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte +, + @Parameter(name = "integer", description = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer +, + @Parameter(name = "int32", description = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32 +, + @Parameter(name = "int64", description = "None") @Valid @RequestParam(value = "int64", required = false) Long int64 +, + @Parameter(name = "float", description = "None") @DecimalMax(value = "987.6") @Valid @RequestParam(value = "float", required = false) Float _float +, + @Parameter(name = "string", description = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestParam(value = "string", required = false) String string +, + @Parameter(name = "binary", description = "None") @RequestPart(value = "binary", required = false) MultipartFile binary +, + @Parameter(name = "date", description = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date +, + @Parameter(name = "dateTime", description = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime +, + @Parameter(name = "password", description = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password +, @Parameter(name = "callback", description = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback + ); @@ -361,14 +384,22 @@ ResponseEntity testEndpointParameters( consumes = "application/x-www-form-urlencoded" ) ResponseEntity testEnumParameters( - @Parameter(name = "enum_header_string_array", description = "Header parameter enum test (string array)", in = ParameterIn.HEADER) @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, - @Parameter(name = "enum_header_string", description = "Header parameter enum test (string)", in = ParameterIn.HEADER) @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, - @Parameter(name = "enum_query_string_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray, - @Parameter(name = "enum_query_string", description = "Query parameter enum test (string)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString, - @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, - @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @Parameter(name = "enum_form_string_array", description = "Form parameter enum test (string array)") @Valid @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, - @Parameter(name = "enum_form_string", description = "Form parameter enum test (string)") @Valid @RequestParam(value = "enum_form_string", required = false) String enumFormString + @Parameter(name = "enum_header_string_array", description = "Header parameter enum test (string array)", in = ParameterIn.HEADER) @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray +, + @Parameter(name = "enum_header_string", description = "Header parameter enum test (string)", in = ParameterIn.HEADER) @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString +, + @Parameter(name = "enum_query_string_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray +, + @Parameter(name = "enum_query_string", description = "Query parameter enum test (string)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString +, + @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger +, + @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble +, + @Parameter(name = "enum_form_string_array", description = "Form parameter enum test (string array)") @Valid @RequestPart(value = "enum_form_string_array", required = false, defaultValue = "$") List enumFormStringArray +, + @Parameter(name = "enum_form_string", description = "Form parameter enum test (string)") @Valid @RequestParam(value = "enum_form_string", required = false, defaultValue = "-efg") String enumFormString + ); @@ -399,12 +430,18 @@ ResponseEntity testEnumParameters( value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) ResponseEntity testGroupParameters( - @NotNull @Parameter(name = "required_string_group", description = "Required String in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, - @NotNull @Parameter(name = "required_boolean_group", description = "Required Boolean in group parameters", required = true, in = ParameterIn.HEADER) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, - @NotNull @Parameter(name = "required_int64_group", description = "Required Integer in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group, - @Parameter(name = "string_group", description = "String in group parameters", in = ParameterIn.QUERY) @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup, - @Parameter(name = "boolean_group", description = "Boolean in group parameters", in = ParameterIn.HEADER) @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup, + @NotNull @Parameter(name = "required_string_group", description = "Required String in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup +, + @NotNull @Parameter(name = "required_boolean_group", description = "Required Boolean in group parameters", required = true, in = ParameterIn.HEADER) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup +, + @NotNull @Parameter(name = "required_int64_group", description = "Required Integer in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group +, + @Parameter(name = "string_group", description = "String in group parameters", in = ParameterIn.QUERY) @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup +, + @Parameter(name = "boolean_group", description = "Boolean in group parameters", in = ParameterIn.HEADER) @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup +, @Parameter(name = "int64_group", description = "Integer in group parameters", in = ParameterIn.QUERY) @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group + ); @@ -432,6 +469,7 @@ ResponseEntity testGroupParameters( ) ResponseEntity testInlineAdditionalProperties( @Parameter(name = "request_body", description = "request body", required = true) @Valid @RequestBody Map requestBody + ); @@ -459,8 +497,10 @@ ResponseEntity testInlineAdditionalProperties( consumes = "application/x-www-form-urlencoded" ) ResponseEntity testJsonFormData( - @Parameter(name = "param", description = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, + @Parameter(name = "param", description = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param +, @Parameter(name = "param2", description = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 + ); @@ -488,6 +528,7 @@ ResponseEntity testJsonFormData( ) ResponseEntity testNullable( @Parameter(name = "ChildWithNullable", description = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable + ); @@ -515,10 +556,14 @@ ResponseEntity testNullable( value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) ResponseEntity testQueryParameterCollectionFormat( - @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "http", required = true) List http, - @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "url", required = true) List url, + @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "pipe", required = true) List pipe +, + @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "http", required = true) List http +, + @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "url", required = true) List url +, @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "context", required = true) List context + ); diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java index 64cf50f5b36b..c14655539571 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java @@ -65,6 +65,7 @@ public interface FakeClassnameTags123Api { ) ResponseEntity testClassname( @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client + ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java index 74b6ff7dd373..2aae3ca6b7c1 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java @@ -68,6 +68,7 @@ public interface PetApi { ) ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ); @@ -99,8 +100,10 @@ ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) ResponseEntity deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ); @@ -136,6 +139,7 @@ ResponseEntity deletePet( ) ResponseEntity> findPetsByStatus( @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) List status + ); @@ -174,6 +178,7 @@ ResponseEntity> findPetsByStatus( ) ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) Set tags + ); @@ -211,6 +216,7 @@ ResponseEntity> findPetsByTags( ) ResponseEntity getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + ); @@ -237,6 +243,7 @@ ResponseEntity getPetById( ) ResponseEntity responseObjectDifferentNames( @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + ); @@ -273,6 +280,7 @@ ResponseEntity responseObjectDifferentNam ) ResponseEntity updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ); @@ -304,9 +312,12 @@ ResponseEntity updatePet( consumes = "application/x-www-form-urlencoded" ) ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, + @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name +, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status + ); @@ -341,9 +352,12 @@ ResponseEntity updatePetWithForm( consumes = "multipart/form-data" ) ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file + ); @@ -378,9 +392,12 @@ ResponseEntity uploadFile( consumes = "multipart/form-data" ) ResponseEntity uploadFileWithRequiredFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "requiredFile", description = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, + @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "requiredFile", description = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile +, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata + ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java index 762fe5d22ca6..3bf147e610b8 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java @@ -61,6 +61,7 @@ public interface StoreApi { ) ResponseEntity deleteOrder( @NotNull @Parameter(name = "order_id", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("order_id") String orderId + ); @@ -126,6 +127,7 @@ ResponseEntity> getInventory( ) ResponseEntity getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "order_id", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("order_id") Long orderId + ); @@ -159,6 +161,7 @@ ResponseEntity getOrderById( ) ResponseEntity placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order + ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java index af7c1ee6da59..0d6a794eb4fb 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java @@ -60,6 +60,7 @@ public interface UserApi { ) ResponseEntity createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user + ); @@ -87,6 +88,7 @@ ResponseEntity createUser( ) ResponseEntity createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ); @@ -114,6 +116,7 @@ ResponseEntity createUsersWithArrayInput( ) ResponseEntity createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ); @@ -142,6 +145,7 @@ ResponseEntity createUsersWithListInput( ) ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ); @@ -176,6 +180,7 @@ ResponseEntity deleteUser( ) ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ); @@ -208,8 +213,10 @@ ResponseEntity getUserByName( produces = { "application/json", "application/xml" } ) ResponseEntity loginUser( - @NotNull @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password + ); @@ -264,8 +271,10 @@ ResponseEntity logoutUser( consumes = "application/json" ) ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username +, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user + ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java index baad3f42e585..b5544a7695f4 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java @@ -64,6 +64,7 @@ public interface PetApi { ) ResponseEntity addPet( @Parameter(name = "body", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + ); @@ -91,8 +92,10 @@ ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) ResponseEntity deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ); @@ -127,7 +130,8 @@ ResponseEntity deletePet( produces = { "application/json", "application/xml" } ) ResponseEntity> findPetsByStatus( - @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) List status, + @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) List status +, @ParameterObject final Pageable pageable ); @@ -167,8 +171,10 @@ ResponseEntity> findPetsByStatus( produces = { "application/json", "application/xml" } ) ResponseEntity> findPetsByTags( - @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List tags, - @Parameter(name = "size", description = "A test HeaderParam for issue #8315 - must NOT be removed when x-spring-paginated:true is used.", in = ParameterIn.HEADER) @RequestHeader(value = "size", required = false) @Nullable String size, + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List tags +, + @Parameter(name = "size", description = "A test HeaderParam for issue #8315 - must NOT be removed when x-spring-paginated:true is used.", in = ParameterIn.HEADER) @RequestHeader(value = "size", required = false) @Nullable String size +, @ParameterObject final Pageable pageable ); @@ -207,6 +213,7 @@ ResponseEntity> findPetsByTags( ) ResponseEntity getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + ); @@ -239,6 +246,7 @@ ResponseEntity getPetById( ) ResponseEntity updatePet( @Parameter(name = "body", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + ); @@ -268,9 +276,12 @@ ResponseEntity updatePet( consumes = "application/x-www-form-urlencoded" ) ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, + @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name +, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status + ); @@ -303,9 +314,12 @@ ResponseEntity updatePetWithForm( consumes = "multipart/form-data" ) ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file + ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java index b4751039169b..b6a5908d5620 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java @@ -61,6 +61,7 @@ public interface StoreApi { ) ResponseEntity deleteOrder( @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId + ); @@ -126,6 +127,7 @@ ResponseEntity> getInventory( ) ResponseEntity getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId + ); @@ -156,6 +158,7 @@ ResponseEntity getOrderById( ) ResponseEntity placeOrder( @Parameter(name = "body", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body + ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java index bc641a690daf..783407418897 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java @@ -59,6 +59,7 @@ public interface UserApi { ) ResponseEntity createUser( @Parameter(name = "body", description = "Created user object", required = true) @Valid @RequestBody User body + ); @@ -83,6 +84,7 @@ ResponseEntity createUser( ) ResponseEntity createUsersWithArrayInput( @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body + ); @@ -107,6 +109,7 @@ ResponseEntity createUsersWithArrayInput( ) ResponseEntity createUsersWithListInput( @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body + ); @@ -135,6 +138,7 @@ ResponseEntity createUsersWithListInput( ) ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ); @@ -167,6 +171,7 @@ ResponseEntity deleteUser( ) ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ); @@ -197,8 +202,10 @@ ResponseEntity getUserByName( produces = { "application/json", "application/xml" } ) ResponseEntity loginUser( - @NotNull @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password + ); @@ -273,8 +280,10 @@ ResponseEntity logoutUserOptions( value = UserApi.PATH_UPDATE_USER ) ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username +, @Parameter(name = "body", description = "Updated user object", required = true) @Valid @RequestBody User body + ); } diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java index 45d0eb4f4666..865ce6187f14 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java @@ -70,6 +70,7 @@ public interface PetApi { ) ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ); @@ -99,8 +100,10 @@ ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) ResponseEntity deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ); @@ -136,6 +139,7 @@ ResponseEntity deletePet( ) ResponseEntity> findPetsByStatus( @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) @Deprecated List status + ); @@ -174,6 +178,7 @@ ResponseEntity> findPetsByStatus( ) ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List tags + ); @@ -211,6 +216,7 @@ ResponseEntity> findPetsByTags( ) ResponseEntity getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + ); @@ -254,6 +260,7 @@ ResponseEntity getPetById( ) ResponseEntity updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ); @@ -285,9 +292,12 @@ ResponseEntity updatePet( consumes = "application/x-www-form-urlencoded" ) ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, + @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name +, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status + ); @@ -322,9 +332,12 @@ ResponseEntity updatePetWithForm( consumes = "multipart/form-data" ) ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file + ); } diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java index 7e16b0de54cc..07ac660d0c1d 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java @@ -61,6 +61,7 @@ public interface StoreApi { ) ResponseEntity deleteOrder( @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId + ); @@ -126,6 +127,7 @@ ResponseEntity> getInventory( ) ResponseEntity getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId + ); @@ -159,6 +161,7 @@ ResponseEntity getOrderById( ) ResponseEntity placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order + ); } diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java index 24d4c63d0e01..7c47ac89bfe8 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java @@ -63,6 +63,7 @@ public interface UserApi { ) ResponseEntity createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user + ); @@ -93,6 +94,7 @@ ResponseEntity createUser( ) ResponseEntity createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ); @@ -123,6 +125,7 @@ ResponseEntity createUsersWithArrayInput( ) ResponseEntity createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ); @@ -154,6 +157,7 @@ ResponseEntity createUsersWithListInput( ) ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ); @@ -188,6 +192,7 @@ ResponseEntity deleteUser( ) ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ); @@ -220,8 +225,10 @@ ResponseEntity getUserByName( produces = { "application/json", "application/xml" } ) ResponseEntity loginUser( - @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password + ); @@ -282,8 +289,10 @@ ResponseEntity logoutUser( consumes = "application/json" ) ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username +, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user + ); } diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/PetApi.java index ca302f3c11ab..946299c9bf3e 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/PetApi.java @@ -70,6 +70,7 @@ public interface PetApi { ) ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) throws Exception; @@ -99,8 +100,10 @@ ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) ResponseEntity deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ) throws Exception; @@ -136,6 +139,7 @@ ResponseEntity deletePet( ) ResponseEntity> findPetsByStatus( @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) @Deprecated List status + ) throws Exception; @@ -174,6 +178,7 @@ ResponseEntity> findPetsByStatus( ) ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List tags + ) throws Exception; @@ -211,6 +216,7 @@ ResponseEntity> findPetsByTags( ) ResponseEntity getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + ) throws Exception; @@ -254,6 +260,7 @@ ResponseEntity getPetById( ) ResponseEntity updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) throws Exception; @@ -285,9 +292,12 @@ ResponseEntity updatePet( consumes = "application/x-www-form-urlencoded" ) ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, + @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name +, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status + ) throws Exception; @@ -322,9 +332,12 @@ ResponseEntity updatePetWithForm( consumes = "multipart/form-data" ) ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file + ) throws Exception; } diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java index 7dca49aa0e97..35209276780f 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java @@ -61,6 +61,7 @@ public interface StoreApi { ) ResponseEntity deleteOrder( @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId + ) throws Exception; @@ -126,6 +127,7 @@ ResponseEntity> getInventory( ) ResponseEntity getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId + ) throws Exception; @@ -159,6 +161,7 @@ ResponseEntity getOrderById( ) ResponseEntity placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order + ) throws Exception; } diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java index b527426c6cb9..fd6db7b314b9 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java @@ -63,6 +63,7 @@ public interface UserApi { ) ResponseEntity createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user + ) throws Exception; @@ -93,6 +94,7 @@ ResponseEntity createUser( ) ResponseEntity createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) throws Exception; @@ -123,6 +125,7 @@ ResponseEntity createUsersWithArrayInput( ) ResponseEntity createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) throws Exception; @@ -154,6 +157,7 @@ ResponseEntity createUsersWithListInput( ) ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ) throws Exception; @@ -188,6 +192,7 @@ ResponseEntity deleteUser( ) ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ) throws Exception; @@ -220,8 +225,10 @@ ResponseEntity getUserByName( produces = { "application/json", "application/xml" } ) ResponseEntity loginUser( - @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password + ) throws Exception; @@ -282,8 +289,10 @@ ResponseEntity logoutUser( consumes = "application/json" ) ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username +, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user + ) throws Exception; } diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java index b8f54ac5b593..e6aa98ef3c40 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java @@ -77,6 +77,7 @@ default Optional getRequest() { ) default ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -123,8 +124,10 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -163,6 +166,7 @@ default ResponseEntity deletePet( ) default ResponseEntity> findPetsByStatus( @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) @Deprecated List status + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -218,6 +222,7 @@ default ResponseEntity> findPetsByStatus( ) default ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List tags + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -272,6 +277,7 @@ default ResponseEntity> findPetsByTags( ) default ResponseEntity getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -332,6 +338,7 @@ default ResponseEntity getPetById( ) default ResponseEntity updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -380,9 +387,12 @@ default ResponseEntity updatePet( consumes = "application/x-www-form-urlencoded" ) default ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, + @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name +, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -420,9 +430,12 @@ default ResponseEntity updatePetWithForm( consumes = "multipart/form-data" ) default ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java index a68c2e8a3185..3de05da22a2f 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java @@ -68,6 +68,7 @@ default Optional getRequest() { ) default ResponseEntity deleteOrder( @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -139,6 +140,7 @@ default ResponseEntity> getInventory( ) default ResponseEntity getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -189,6 +191,7 @@ default ResponseEntity getOrderById( ) default ResponseEntity placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java index 6144dc1f5da2..eabd08573b2b 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java @@ -70,6 +70,7 @@ default Optional getRequest() { ) default ResponseEntity createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -103,6 +104,7 @@ default ResponseEntity createUser( ) default ResponseEntity createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -136,6 +138,7 @@ default ResponseEntity createUsersWithArrayInput( ) default ResponseEntity createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -170,6 +173,7 @@ default ResponseEntity createUsersWithListInput( ) default ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -207,6 +211,7 @@ default ResponseEntity deleteUser( ) default ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -256,8 +261,10 @@ default ResponseEntity getUserByName( produces = { "application/json", "application/xml" } ) default ResponseEntity loginUser( - @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -324,8 +331,10 @@ default ResponseEntity logoutUser( consumes = "application/json" ) default ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username +, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/BarApi.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/BarApi.java index 77203b440aa1..b4747fc345eb 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/BarApi.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/BarApi.java @@ -68,6 +68,7 @@ default Optional getRequest() { ) default ResponseEntity createBar( @Parameter(name = "BarCreate", description = "", required = true) @Valid @RequestBody BarCreate barCreate + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/FooApi.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/FooApi.java index edaf06788b71..31c0f6bb6a0b 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/FooApi.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/FooApi.java @@ -69,6 +69,7 @@ default Optional getRequest() { ) default ResponseEntity createFoo( @Parameter(name = "Foo", description = "The Foo to be created") @Valid @RequestBody(required = false) @Nullable Foo foo + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/BarApi.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/BarApi.java index 77203b440aa1..b4747fc345eb 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/BarApi.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/BarApi.java @@ -68,6 +68,7 @@ default Optional getRequest() { ) default ResponseEntity createBar( @Parameter(name = "BarCreate", description = "", required = true) @Valid @RequestBody BarCreate barCreate + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/FooApi.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/FooApi.java index edaf06788b71..31c0f6bb6a0b 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/FooApi.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/FooApi.java @@ -69,6 +69,7 @@ default Optional getRequest() { ) default ResponseEntity createFoo( @Parameter(name = "Foo", description = "The Foo to be created") @Valid @RequestBody(required = false) @Nullable Foo foo + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java index 77203b440aa1..b4747fc345eb 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java @@ -68,6 +68,7 @@ default Optional getRequest() { ) default ResponseEntity createBar( @Parameter(name = "BarCreate", description = "", required = true) @Valid @RequestBody BarCreate barCreate + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java index edaf06788b71..31c0f6bb6a0b 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java @@ -69,6 +69,7 @@ default Optional getRequest() { ) default ResponseEntity createFoo( @Parameter(name = "Foo", description = "The Foo to be created") @Valid @RequestBody(required = false) @Nullable Foo foo + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApi.java index b996cdfae1b2..2f26f87b8dba 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApi.java @@ -77,6 +77,7 @@ default Optional getRequest() { ) default ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -123,8 +124,10 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -163,6 +166,7 @@ default ResponseEntity deletePet( ) default ResponseEntity> findPetsByStatus( @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) @Deprecated List status + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -218,6 +222,7 @@ default ResponseEntity> findPetsByStatus( ) default ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List tags + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -272,6 +277,7 @@ default ResponseEntity> findPetsByTags( ) default ResponseEntity getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -332,6 +338,7 @@ default ResponseEntity getPetById( ) default ResponseEntity updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -380,9 +387,12 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, + @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name +, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -420,9 +430,12 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java index 6445a3195401..091349d8f12f 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java @@ -68,6 +68,7 @@ default Optional getRequest() { ) default ResponseEntity deleteOrder( @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -139,6 +140,7 @@ default ResponseEntity> getInventory( ) default ResponseEntity getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -189,6 +191,7 @@ default ResponseEntity getOrderById( ) default ResponseEntity placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApi.java index 6b15e3298e80..aad62c78f891 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApi.java @@ -70,6 +70,7 @@ default Optional getRequest() { ) default ResponseEntity createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -103,6 +104,7 @@ default ResponseEntity createUser( ) default ResponseEntity createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -136,6 +138,7 @@ default ResponseEntity createUsersWithArrayInput( ) default ResponseEntity createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -170,6 +173,7 @@ default ResponseEntity createUsersWithListInput( ) default ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -207,6 +211,7 @@ default ResponseEntity deleteUser( ) default ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -256,8 +261,10 @@ default ResponseEntity getUserByName( produces = { "application/xml", "application/json" } ) default ResponseEntity loginUser( - @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -324,8 +331,10 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username +, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApi.java index 0d23f2e8832a..78f28688d50b 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApi.java @@ -77,6 +77,7 @@ default Optional getRequest() { ) default ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -123,8 +124,10 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -163,6 +166,7 @@ default ResponseEntity deletePet( ) default ResponseEntity> findPetsByStatus( @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) @Deprecated List status + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -218,6 +222,7 @@ default ResponseEntity> findPetsByStatus( ) default ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List tags + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -272,6 +277,7 @@ default ResponseEntity> findPetsByTags( ) default ResponseEntity getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -332,6 +338,7 @@ default ResponseEntity getPetById( ) default ResponseEntity updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -380,9 +387,12 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, + @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name +, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -420,9 +430,12 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java index d1fa8cce8fd3..0f16fa04dc1a 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java @@ -68,6 +68,7 @@ default Optional getRequest() { ) default ResponseEntity deleteOrder( @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -139,6 +140,7 @@ default ResponseEntity> getInventory( ) default ResponseEntity getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -189,6 +191,7 @@ default ResponseEntity getOrderById( ) default ResponseEntity placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApi.java index 83476943a427..91d61eb649f3 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApi.java @@ -70,6 +70,7 @@ default Optional getRequest() { ) default ResponseEntity createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -103,6 +104,7 @@ default ResponseEntity createUser( ) default ResponseEntity createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -136,6 +138,7 @@ default ResponseEntity createUsersWithArrayInput( ) default ResponseEntity createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -170,6 +173,7 @@ default ResponseEntity createUsersWithListInput( ) default ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -207,6 +211,7 @@ default ResponseEntity deleteUser( ) default ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -256,8 +261,10 @@ default ResponseEntity getUserByName( produces = { "application/xml", "application/json" } ) default ResponseEntity loginUser( - @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -324,8 +331,10 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username +, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java index 388461fde291..3dda184b81ad 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -65,6 +65,7 @@ default AnotherFakeApiDelegate getDelegate() { ) default ResponseEntity call123testSpecialTags( @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client + ) { return getDelegate().call123testSpecialTags(client); } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java index e04d7e540bf8..7b7a06efd340 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java @@ -75,6 +75,7 @@ default FakeApiDelegate getDelegate() { ) default ResponseEntity createXmlItem( @Parameter(name = "XmlItem", description = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem + ) { return getDelegate().createXmlItem(xmlItem); } @@ -106,6 +107,7 @@ default ResponseEntity createXmlItem( ) default ResponseEntity fakeOuterBooleanSerialize( @Parameter(name = "body", description = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body + ) { return getDelegate().fakeOuterBooleanSerialize(body); } @@ -137,6 +139,7 @@ default ResponseEntity fakeOuterBooleanSerialize( ) default ResponseEntity fakeOuterCompositeSerialize( @Parameter(name = "OuterComposite", description = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite outerComposite + ) { return getDelegate().fakeOuterCompositeSerialize(outerComposite); } @@ -168,6 +171,7 @@ default ResponseEntity fakeOuterCompositeSerialize( ) default ResponseEntity fakeOuterNumberSerialize( @Parameter(name = "body", description = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body + ) { return getDelegate().fakeOuterNumberSerialize(body); } @@ -199,6 +203,7 @@ default ResponseEntity fakeOuterNumberSerialize( ) default ResponseEntity fakeOuterStringSerialize( @Parameter(name = "body", description = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body + ) { return getDelegate().fakeOuterStringSerialize(body); } @@ -227,6 +232,7 @@ default ResponseEntity fakeOuterStringSerialize( ) default ResponseEntity responseObjectDifferentNames( @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + ) { return getDelegate().responseObjectDifferentNames(petId); } @@ -255,6 +261,7 @@ default ResponseEntity responseObjectDiff ) default ResponseEntity testBodyWithFileSchema( @Parameter(name = "FileSchemaTestClass", description = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass + ) { return getDelegate().testBodyWithFileSchema(fileSchemaTestClass); } @@ -281,8 +288,10 @@ default ResponseEntity testBodyWithFileSchema( consumes = { "application/json" } ) default ResponseEntity testBodyWithQueryParams( - @NotNull @Parameter(name = "query", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "query", required = true) String query, + @NotNull @Parameter(name = "query", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "query", required = true) String query +, @Parameter(name = "User", description = "", required = true) @Valid @RequestBody User user + ) { return getDelegate().testBodyWithQueryParams(query, user); } @@ -315,6 +324,7 @@ default ResponseEntity testBodyWithQueryParams( ) default ResponseEntity testClientModel( @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client + ) { return getDelegate().testClientModel(client); } @@ -361,20 +371,34 @@ default ResponseEntity testClientModel( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEndpointParameters( - @Parameter(name = "number", description = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @Parameter(name = "double", description = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, - @Parameter(name = "pattern_without_delimiter", description = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @Parameter(name = "byte", description = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @Parameter(name = "integer", description = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer, - @Parameter(name = "int32", description = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32, - @Parameter(name = "int64", description = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, - @Parameter(name = "float", description = "None") @DecimalMax(value = "987.6") @Valid @RequestParam(value = "float", required = false) Float _float, - @Parameter(name = "string", description = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestParam(value = "string", required = false) String string, - @Parameter(name = "binary", description = "None") @RequestPart(value = "binary", required = false) MultipartFile binary, - @Parameter(name = "date", description = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @Parameter(name = "dateTime", description = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, - @Parameter(name = "password", description = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password, + @Parameter(name = "number", description = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number +, + @Parameter(name = "double", description = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double +, + @Parameter(name = "pattern_without_delimiter", description = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter +, + @Parameter(name = "byte", description = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte +, + @Parameter(name = "integer", description = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer +, + @Parameter(name = "int32", description = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32 +, + @Parameter(name = "int64", description = "None") @Valid @RequestParam(value = "int64", required = false) Long int64 +, + @Parameter(name = "float", description = "None") @DecimalMax(value = "987.6") @Valid @RequestParam(value = "float", required = false) Float _float +, + @Parameter(name = "string", description = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestParam(value = "string", required = false) String string +, + @Parameter(name = "binary", description = "None") @RequestPart(value = "binary", required = false) MultipartFile binary +, + @Parameter(name = "date", description = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date +, + @Parameter(name = "dateTime", description = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime +, + @Parameter(name = "password", description = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password +, @Parameter(name = "callback", description = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback + ) { return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); } @@ -412,14 +436,22 @@ default ResponseEntity testEndpointParameters( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEnumParameters( - @Parameter(name = "enum_header_string_array", description = "Header parameter enum test (string array)", in = ParameterIn.HEADER) @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, - @Parameter(name = "enum_header_string", description = "Header parameter enum test (string)", in = ParameterIn.HEADER) @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, - @Parameter(name = "enum_query_string_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray, - @Parameter(name = "enum_query_string", description = "Query parameter enum test (string)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString, - @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, - @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @Parameter(name = "enum_form_string_array", description = "Form parameter enum test (string array)") @Valid @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, - @Parameter(name = "enum_form_string", description = "Form parameter enum test (string)") @Valid @RequestParam(value = "enum_form_string", required = false) String enumFormString + @Parameter(name = "enum_header_string_array", description = "Header parameter enum test (string array)", in = ParameterIn.HEADER) @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray +, + @Parameter(name = "enum_header_string", description = "Header parameter enum test (string)", in = ParameterIn.HEADER) @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString +, + @Parameter(name = "enum_query_string_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray +, + @Parameter(name = "enum_query_string", description = "Query parameter enum test (string)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString +, + @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger +, + @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble +, + @Parameter(name = "enum_form_string_array", description = "Form parameter enum test (string array)") @Valid @RequestPart(value = "enum_form_string_array", required = false, defaultValue = "$") List enumFormStringArray +, + @Parameter(name = "enum_form_string", description = "Form parameter enum test (string)") @Valid @RequestParam(value = "enum_form_string", required = false, defaultValue = "-efg") String enumFormString + ) { return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); } @@ -452,12 +484,18 @@ default ResponseEntity testEnumParameters( value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) default ResponseEntity testGroupParameters( - @NotNull @Parameter(name = "required_string_group", description = "Required String in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, - @NotNull @Parameter(name = "required_boolean_group", description = "Required Boolean in group parameters", required = true, in = ParameterIn.HEADER) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, - @NotNull @Parameter(name = "required_int64_group", description = "Required Integer in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group, - @Parameter(name = "string_group", description = "String in group parameters", in = ParameterIn.QUERY) @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup, - @Parameter(name = "boolean_group", description = "Boolean in group parameters", in = ParameterIn.HEADER) @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup, + @NotNull @Parameter(name = "required_string_group", description = "Required String in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup +, + @NotNull @Parameter(name = "required_boolean_group", description = "Required Boolean in group parameters", required = true, in = ParameterIn.HEADER) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup +, + @NotNull @Parameter(name = "required_int64_group", description = "Required Integer in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group +, + @Parameter(name = "string_group", description = "String in group parameters", in = ParameterIn.QUERY) @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup +, + @Parameter(name = "boolean_group", description = "Boolean in group parameters", in = ParameterIn.HEADER) @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup +, @Parameter(name = "int64_group", description = "Integer in group parameters", in = ParameterIn.QUERY) @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group + ) { return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); } @@ -487,6 +525,7 @@ default ResponseEntity testGroupParameters( ) default ResponseEntity testInlineAdditionalProperties( @Parameter(name = "request_body", description = "request body", required = true) @Valid @RequestBody Map requestBody + ) { return getDelegate().testInlineAdditionalProperties(requestBody); } @@ -516,8 +555,10 @@ default ResponseEntity testInlineAdditionalProperties( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testJsonFormData( - @Parameter(name = "param", description = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, + @Parameter(name = "param", description = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param +, @Parameter(name = "param2", description = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 + ) { return getDelegate().testJsonFormData(param, param2); } @@ -547,6 +588,7 @@ default ResponseEntity testJsonFormData( ) default ResponseEntity testNullable( @Parameter(name = "ChildWithNullable", description = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable + ) { return getDelegate().testNullable(childWithNullable); } @@ -576,10 +618,14 @@ default ResponseEntity testNullable( value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) default ResponseEntity testQueryParameterCollectionFormat( - @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "http", required = true) List http, - @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "url", required = true) List url, + @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "pipe", required = true) List pipe +, + @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "http", required = true) List http +, + @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "url", required = true) List url +, @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "context", required = true) List context + ) { return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context); } @@ -645,9 +691,12 @@ default ResponseEntity testWithResultExample( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFileWithRequiredFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "requiredFile", description = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, + @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "requiredFile", description = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile +, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata + ) { return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 68a6980a7c1b..6316f836cdde 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -68,6 +68,7 @@ default FakeClassnameTestApiDelegate getDelegate() { ) default ResponseEntity testClassname( @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client + ) { return getDelegate().testClassname(client); } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java index 292258d84b9c..fd1ca7dad31a 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java @@ -70,6 +70,7 @@ default PetApiDelegate getDelegate() { ) default ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { return getDelegate().addPet(pet); } @@ -103,8 +104,10 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ) { return getDelegate().deletePet(petId, apiKey); } @@ -142,6 +145,7 @@ default ResponseEntity deletePet( ) default ResponseEntity> findPetsByStatus( @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) List status + ) { return getDelegate().findPetsByStatus(status); } @@ -182,6 +186,7 @@ default ResponseEntity> findPetsByStatus( ) default ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) Set tags + ) { return getDelegate().findPetsByTags(tags); } @@ -221,6 +226,7 @@ default ResponseEntity> findPetsByTags( ) default ResponseEntity getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + ) { return getDelegate().getPetById(petId); } @@ -259,6 +265,7 @@ default ResponseEntity getPetById( ) default ResponseEntity updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { return getDelegate().updatePet(pet); } @@ -292,9 +299,12 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, + @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name +, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status + ) { return getDelegate().updatePetWithForm(petId, name, status); } @@ -331,9 +341,12 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file + ) { return getDelegate().uploadFile(petId, additionalMetadata, file); } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java index 476e1ee4150a..44403e35f8cf 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java @@ -64,6 +64,7 @@ default StoreApiDelegate getDelegate() { ) default ResponseEntity deleteOrder( @NotNull @Parameter(name = "order_id", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("order_id") String orderId + ) { return getDelegate().deleteOrder(orderId); } @@ -133,6 +134,7 @@ default ResponseEntity> getInventory( ) default ResponseEntity getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "order_id", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("order_id") Long orderId + ) { return getDelegate().getOrderById(orderId); } @@ -168,6 +170,7 @@ default ResponseEntity getOrderById( ) default ResponseEntity placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order + ) { return getDelegate().placeOrder(order); } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java index 01474b166141..5c85b6649f4c 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java @@ -63,6 +63,7 @@ default UserApiDelegate getDelegate() { ) default ResponseEntity createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user + ) { return getDelegate().createUser(user); } @@ -92,6 +93,7 @@ default ResponseEntity createUser( ) default ResponseEntity createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { return getDelegate().createUsersWithArrayInput(user); } @@ -121,6 +123,7 @@ default ResponseEntity createUsersWithArrayInput( ) default ResponseEntity createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { return getDelegate().createUsersWithListInput(user); } @@ -151,6 +154,7 @@ default ResponseEntity createUsersWithListInput( ) default ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ) { return getDelegate().deleteUser(username); } @@ -187,6 +191,7 @@ default ResponseEntity deleteUser( ) default ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ) { return getDelegate().getUserByName(username); } @@ -221,8 +226,10 @@ default ResponseEntity getUserByName( produces = { "application/xml", "application/json" } ) default ResponseEntity loginUser( - @NotNull @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password + ) { return getDelegate().loginUser(username, password); } @@ -281,8 +288,10 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username +, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user + ) { return getDelegate().updateUser(username, user); } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java index 45a5ad6f3903..192526202dd8 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -69,6 +69,7 @@ default Optional getRequest() { ) default ResponseEntity call123testSpecialTags( @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java index c18ee66f15f3..f08a92dd1710 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java @@ -79,6 +79,7 @@ default Optional getRequest() { ) default ResponseEntity createXmlItem( @Parameter(name = "XmlItem", description = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -111,6 +112,7 @@ default ResponseEntity createXmlItem( ) default ResponseEntity fakeOuterBooleanSerialize( @Parameter(name = "body", description = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -143,6 +145,7 @@ default ResponseEntity fakeOuterBooleanSerialize( ) default ResponseEntity fakeOuterCompositeSerialize( @Parameter(name = "OuterComposite", description = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite outerComposite + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -184,6 +187,7 @@ default ResponseEntity fakeOuterCompositeSerialize( ) default ResponseEntity fakeOuterNumberSerialize( @Parameter(name = "body", description = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -216,6 +220,7 @@ default ResponseEntity fakeOuterNumberSerialize( ) default ResponseEntity fakeOuterStringSerialize( @Parameter(name = "body", description = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -245,6 +250,7 @@ default ResponseEntity fakeOuterStringSerialize( ) default ResponseEntity responseObjectDifferentNames( @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -283,6 +289,7 @@ default ResponseEntity responseObjectDiff ) default ResponseEntity testBodyWithFileSchema( @Parameter(name = "FileSchemaTestClass", description = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -310,8 +317,10 @@ default ResponseEntity testBodyWithFileSchema( consumes = { "application/json" } ) default ResponseEntity testBodyWithQueryParams( - @NotNull @Parameter(name = "query", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "query", required = true) String query, + @NotNull @Parameter(name = "query", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "query", required = true) String query +, @Parameter(name = "User", description = "", required = true) @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -345,6 +354,7 @@ default ResponseEntity testBodyWithQueryParams( ) default ResponseEntity testClientModel( @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -401,20 +411,34 @@ default ResponseEntity testClientModel( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEndpointParameters( - @Parameter(name = "number", description = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @Parameter(name = "double", description = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, - @Parameter(name = "pattern_without_delimiter", description = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @Parameter(name = "byte", description = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @Parameter(name = "integer", description = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer, - @Parameter(name = "int32", description = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32, - @Parameter(name = "int64", description = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, - @Parameter(name = "float", description = "None") @DecimalMax(value = "987.6") @Valid @RequestParam(value = "float", required = false) Float _float, - @Parameter(name = "string", description = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestParam(value = "string", required = false) String string, - @Parameter(name = "binary", description = "None") @RequestPart(value = "binary", required = false) MultipartFile binary, - @Parameter(name = "date", description = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @Parameter(name = "dateTime", description = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, - @Parameter(name = "password", description = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password, + @Parameter(name = "number", description = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number +, + @Parameter(name = "double", description = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double +, + @Parameter(name = "pattern_without_delimiter", description = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter +, + @Parameter(name = "byte", description = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte +, + @Parameter(name = "integer", description = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer +, + @Parameter(name = "int32", description = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32 +, + @Parameter(name = "int64", description = "None") @Valid @RequestParam(value = "int64", required = false) Long int64 +, + @Parameter(name = "float", description = "None") @DecimalMax(value = "987.6") @Valid @RequestParam(value = "float", required = false) Float _float +, + @Parameter(name = "string", description = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestParam(value = "string", required = false) String string +, + @Parameter(name = "binary", description = "None") @RequestPart(value = "binary", required = false) MultipartFile binary +, + @Parameter(name = "date", description = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date +, + @Parameter(name = "dateTime", description = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime +, + @Parameter(name = "password", description = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password +, @Parameter(name = "callback", description = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -455,12 +479,18 @@ default ResponseEntity testEndpointParameters( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEnumParameters( - @Parameter(name = "enum_query_string_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray, - @Parameter(name = "enum_query_string", description = "Query parameter enum test (string)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString, - @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, - @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @Parameter(name = "enum_form_string_array", description = "Form parameter enum test (string array)") @Valid @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, - @Parameter(name = "enum_form_string", description = "Form parameter enum test (string)") @Valid @RequestParam(value = "enum_form_string", required = false) String enumFormString + @Parameter(name = "enum_query_string_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray +, + @Parameter(name = "enum_query_string", description = "Query parameter enum test (string)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString +, + @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger +, + @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble +, + @Parameter(name = "enum_form_string_array", description = "Form parameter enum test (string array)") @Valid @RequestPart(value = "enum_form_string_array", required = false, defaultValue = "$") List enumFormStringArray +, + @Parameter(name = "enum_form_string", description = "Form parameter enum test (string)") @Valid @RequestParam(value = "enum_form_string", required = false, defaultValue = "-efg") String enumFormString + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -496,10 +526,14 @@ default ResponseEntity testEnumParameters( value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) default ResponseEntity testGroupParameters( - @NotNull @Parameter(name = "required_string_group", description = "Required String in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, - @NotNull @Parameter(name = "required_int64_group", description = "Required Integer in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group, - @Parameter(name = "string_group", description = "String in group parameters", in = ParameterIn.QUERY) @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup, + @NotNull @Parameter(name = "required_string_group", description = "Required String in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup +, + @NotNull @Parameter(name = "required_int64_group", description = "Required Integer in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group +, + @Parameter(name = "string_group", description = "String in group parameters", in = ParameterIn.QUERY) @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup +, @Parameter(name = "int64_group", description = "Integer in group parameters", in = ParameterIn.QUERY) @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -530,6 +564,7 @@ default ResponseEntity testGroupParameters( ) default ResponseEntity testInlineAdditionalProperties( @Parameter(name = "request_body", description = "request body", required = true) @Valid @RequestBody Map requestBody + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -560,8 +595,10 @@ default ResponseEntity testInlineAdditionalProperties( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testJsonFormData( - @Parameter(name = "param", description = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, + @Parameter(name = "param", description = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param +, @Parameter(name = "param2", description = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -592,6 +629,7 @@ default ResponseEntity testJsonFormData( ) default ResponseEntity testNullable( @Parameter(name = "ChildWithNullable", description = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -622,10 +660,14 @@ default ResponseEntity testNullable( value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) default ResponseEntity testQueryParameterCollectionFormat( - @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "http", required = true) List http, - @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "url", required = true) List url, + @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "pipe", required = true) List pipe +, + @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "http", required = true) List http +, + @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "url", required = true) List url +, @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "context", required = true) List context + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -702,9 +744,12 @@ default ResponseEntity testWithResultExample( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFileWithRequiredFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "requiredFile", description = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, + @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "requiredFile", description = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile +, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 24e07cb5385e..0b7ab23555b1 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -72,6 +72,7 @@ default Optional getRequest() { ) default ResponseEntity testClassname( @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java index 9d2b912600f2..90b5ae5199ba 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java @@ -74,6 +74,7 @@ default Optional getRequest() { ) default ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -111,6 +112,7 @@ default ResponseEntity addPet( ) default ResponseEntity deletePet( @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -149,6 +151,7 @@ default ResponseEntity deletePet( ) default ResponseEntity> findPetsByStatus( @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) List status + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -204,6 +207,7 @@ default ResponseEntity> findPetsByStatus( ) default ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) Set tags + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -258,6 +262,7 @@ default ResponseEntity> findPetsByTags( ) default ResponseEntity getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -311,6 +316,7 @@ default ResponseEntity getPetById( ) default ResponseEntity updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -345,9 +351,12 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, + @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name +, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -385,9 +394,12 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java index 9b77f3631ec0..b47eafb962b7 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java @@ -68,6 +68,7 @@ default Optional getRequest() { ) default ResponseEntity deleteOrder( @NotNull @Parameter(name = "order_id", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("order_id") String orderId + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -139,6 +140,7 @@ default ResponseEntity> getInventory( ) default ResponseEntity getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "order_id", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("order_id") Long orderId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -189,6 +191,7 @@ default ResponseEntity getOrderById( ) default ResponseEntity placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java index 62f41d81ae84..beae6fd92974 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java @@ -67,6 +67,7 @@ default Optional getRequest() { ) default ResponseEntity createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -97,6 +98,7 @@ default ResponseEntity createUser( ) default ResponseEntity createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -127,6 +129,7 @@ default ResponseEntity createUsersWithArrayInput( ) default ResponseEntity createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -158,6 +161,7 @@ default ResponseEntity createUsersWithListInput( ) default ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -195,6 +199,7 @@ default ResponseEntity deleteUser( ) default ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -244,8 +249,10 @@ default ResponseEntity getUserByName( produces = { "application/xml", "application/json" } ) default ResponseEntity loginUser( - @NotNull @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -306,8 +313,10 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username +, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApi.java index 9094aae95284..a7a2da07a651 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApi.java @@ -48,6 +48,7 @@ default Optional getRequest() { ) default ResponseEntity addPet( @Valid @RequestBody Pet pet + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -82,8 +83,10 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @PathVariable("petId") Long petId, + @NotNull @PathVariable("petId") Long petId +, @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -106,6 +109,7 @@ default ResponseEntity deletePet( ) default ResponseEntity> findPetsByStatus( @NotNull @Valid @RequestParam(value = "status", required = true) @Deprecated List status + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -144,6 +148,7 @@ default ResponseEntity> findPetsByStatus( ) default ResponseEntity> findPetsByTags( @NotNull @Valid @RequestParam(value = "tags", required = true) List tags + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -181,6 +186,7 @@ default ResponseEntity> findPetsByTags( ) default ResponseEntity getPetById( @NotNull @PathVariable("petId") Long petId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -222,6 +228,7 @@ default ResponseEntity getPetById( ) default ResponseEntity updatePet( @Valid @RequestBody Pet pet + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -258,9 +265,12 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @PathVariable("petId") Long petId, - @Valid @RequestParam(value = "name", required = false) String name, + @NotNull @PathVariable("petId") Long petId +, + @Valid @RequestParam(value = "name", required = false) String name +, @Valid @RequestParam(value = "status", required = false) String status + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -284,9 +294,12 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @PathVariable("petId") Long petId, - @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @PathVariable("petId") Long petId +, + @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @RequestPart(value = "file", required = false) MultipartFile file + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java index 35946f8cd267..5295e5ad0677 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java @@ -45,6 +45,7 @@ default Optional getRequest() { ) default ResponseEntity deleteOrder( @NotNull @PathVariable("orderId") String orderId + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -88,6 +89,7 @@ default ResponseEntity> getInventory( ) default ResponseEntity getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @PathVariable("orderId") Long orderId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -125,6 +127,7 @@ default ResponseEntity getOrderById( ) default ResponseEntity placeOrder( @Valid @RequestBody Order order + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApi.java index 7133ac485487..6e7664deba4c 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApi.java @@ -45,6 +45,7 @@ default Optional getRequest() { ) default ResponseEntity createUser( @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -66,6 +67,7 @@ default ResponseEntity createUser( ) default ResponseEntity createUsersWithArrayInput( @Valid @RequestBody List<@Valid User> user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -87,6 +89,7 @@ default ResponseEntity createUsersWithArrayInput( ) default ResponseEntity createUsersWithListInput( @Valid @RequestBody List<@Valid User> user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -108,6 +111,7 @@ default ResponseEntity createUsersWithListInput( ) default ResponseEntity deleteUser( @NotNull @PathVariable("username") String username + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -131,6 +135,7 @@ default ResponseEntity deleteUser( ) default ResponseEntity getUserByName( @NotNull @PathVariable("username") String username + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -167,8 +172,10 @@ default ResponseEntity getUserByName( produces = { "application/xml", "application/json" } ) default ResponseEntity loginUser( - @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @Valid @RequestParam(value = "password", required = true) String password + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -210,8 +217,10 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @PathVariable("username") String username, + @NotNull @PathVariable("username") String username +, @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java index 93ba799f77f1..45bc20459fdf 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java @@ -78,6 +78,7 @@ default Optional getRequest() { ) default ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -124,8 +125,10 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -164,6 +167,7 @@ default ResponseEntity deletePet( ) default ResponseEntity> findPetsByStatus( @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) @Deprecated List status + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -219,6 +223,7 @@ default ResponseEntity> findPetsByStatus( ) default ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List tags + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -273,6 +278,7 @@ default ResponseEntity> findPetsByTags( ) default ResponseEntity getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -333,6 +339,7 @@ default ResponseEntity getPetById( ) default ResponseEntity updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -381,9 +388,12 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, + @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name +, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -421,9 +431,12 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java index e6375501b6d0..980e8a7df275 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java @@ -69,6 +69,7 @@ default Optional getRequest() { ) default ResponseEntity deleteOrder( @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -140,6 +141,7 @@ default ResponseEntity> getInventory( ) default ResponseEntity getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -190,6 +192,7 @@ default ResponseEntity getOrderById( ) default ResponseEntity placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java index e6205e249969..8e36bce7fcd7 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java @@ -71,6 +71,7 @@ default Optional getRequest() { ) default ResponseEntity createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -104,6 +105,7 @@ default ResponseEntity createUser( ) default ResponseEntity createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -137,6 +139,7 @@ default ResponseEntity createUsersWithArrayInput( ) default ResponseEntity createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -171,6 +174,7 @@ default ResponseEntity createUsersWithListInput( ) default ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -208,6 +212,7 @@ default ResponseEntity deleteUser( ) default ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -257,8 +262,10 @@ default ResponseEntity getUserByName( produces = { "application/xml", "application/json" } ) default ResponseEntity loginUser( - @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -325,8 +332,10 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username +, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java index e0f6a3bfb849..edb67fd068b4 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -62,6 +62,7 @@ public interface AnotherFakeApi { ) ResponseEntity call123testSpecialTags( @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client + ) throws Exception; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java index 3998abf9645d..8df130773d13 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java @@ -72,6 +72,7 @@ public interface FakeApi { ) ResponseEntity createXmlItem( @Parameter(name = "XmlItem", description = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem + ) throws Exception; @@ -101,6 +102,7 @@ ResponseEntity createXmlItem( ) ResponseEntity fakeOuterBooleanSerialize( @Parameter(name = "body", description = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body + ) throws Exception; @@ -130,6 +132,7 @@ ResponseEntity fakeOuterBooleanSerialize( ) ResponseEntity fakeOuterCompositeSerialize( @Parameter(name = "OuterComposite", description = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite outerComposite + ) throws Exception; @@ -159,6 +162,7 @@ ResponseEntity fakeOuterCompositeSerialize( ) ResponseEntity fakeOuterNumberSerialize( @Parameter(name = "body", description = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body + ) throws Exception; @@ -188,6 +192,7 @@ ResponseEntity fakeOuterNumberSerialize( ) ResponseEntity fakeOuterStringSerialize( @Parameter(name = "body", description = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body + ) throws Exception; @@ -214,6 +219,7 @@ ResponseEntity fakeOuterStringSerialize( ) ResponseEntity responseObjectDifferentNames( @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + ) throws Exception; @@ -240,6 +246,7 @@ ResponseEntity responseObjectDifferentNam ) ResponseEntity testBodyWithFileSchema( @Parameter(name = "FileSchemaTestClass", description = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass + ) throws Exception; @@ -264,8 +271,10 @@ ResponseEntity testBodyWithFileSchema( consumes = { "application/json" } ) ResponseEntity testBodyWithQueryParams( - @NotNull @Parameter(name = "query", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "query", required = true) String query, + @NotNull @Parameter(name = "query", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "query", required = true) String query +, @Parameter(name = "User", description = "", required = true) @Valid @RequestBody User user + ) throws Exception; @@ -296,6 +305,7 @@ ResponseEntity testBodyWithQueryParams( ) ResponseEntity testClientModel( @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client + ) throws Exception; @@ -340,20 +350,34 @@ ResponseEntity testClientModel( consumes = { "application/x-www-form-urlencoded" } ) ResponseEntity testEndpointParameters( - @Parameter(name = "number", description = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @Parameter(name = "double", description = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, - @Parameter(name = "pattern_without_delimiter", description = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @Parameter(name = "byte", description = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @Parameter(name = "integer", description = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer, - @Parameter(name = "int32", description = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32, - @Parameter(name = "int64", description = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, - @Parameter(name = "float", description = "None") @DecimalMax(value = "987.6") @Valid @RequestParam(value = "float", required = false) Float _float, - @Parameter(name = "string", description = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestParam(value = "string", required = false) String string, - @Parameter(name = "binary", description = "None") @RequestPart(value = "binary", required = false) MultipartFile binary, - @Parameter(name = "date", description = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @Parameter(name = "dateTime", description = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, - @Parameter(name = "password", description = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password, + @Parameter(name = "number", description = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number +, + @Parameter(name = "double", description = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double +, + @Parameter(name = "pattern_without_delimiter", description = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter +, + @Parameter(name = "byte", description = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte +, + @Parameter(name = "integer", description = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer +, + @Parameter(name = "int32", description = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32 +, + @Parameter(name = "int64", description = "None") @Valid @RequestParam(value = "int64", required = false) Long int64 +, + @Parameter(name = "float", description = "None") @DecimalMax(value = "987.6") @Valid @RequestParam(value = "float", required = false) Float _float +, + @Parameter(name = "string", description = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestParam(value = "string", required = false) String string +, + @Parameter(name = "binary", description = "None") @RequestPart(value = "binary", required = false) MultipartFile binary +, + @Parameter(name = "date", description = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date +, + @Parameter(name = "dateTime", description = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime +, + @Parameter(name = "password", description = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password +, @Parameter(name = "callback", description = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback + ) throws Exception; @@ -389,14 +413,22 @@ ResponseEntity testEndpointParameters( consumes = { "application/x-www-form-urlencoded" } ) ResponseEntity testEnumParameters( - @Parameter(name = "enum_header_string_array", description = "Header parameter enum test (string array)", in = ParameterIn.HEADER) @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, - @Parameter(name = "enum_header_string", description = "Header parameter enum test (string)", in = ParameterIn.HEADER) @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, - @Parameter(name = "enum_query_string_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray, - @Parameter(name = "enum_query_string", description = "Query parameter enum test (string)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString, - @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, - @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @Parameter(name = "enum_form_string_array", description = "Form parameter enum test (string array)") @Valid @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, - @Parameter(name = "enum_form_string", description = "Form parameter enum test (string)") @Valid @RequestParam(value = "enum_form_string", required = false) String enumFormString + @Parameter(name = "enum_header_string_array", description = "Header parameter enum test (string array)", in = ParameterIn.HEADER) @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray +, + @Parameter(name = "enum_header_string", description = "Header parameter enum test (string)", in = ParameterIn.HEADER) @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString +, + @Parameter(name = "enum_query_string_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray +, + @Parameter(name = "enum_query_string", description = "Query parameter enum test (string)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString +, + @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger +, + @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble +, + @Parameter(name = "enum_form_string_array", description = "Form parameter enum test (string array)") @Valid @RequestPart(value = "enum_form_string_array", required = false, defaultValue = "$") List enumFormStringArray +, + @Parameter(name = "enum_form_string", description = "Form parameter enum test (string)") @Valid @RequestParam(value = "enum_form_string", required = false, defaultValue = "-efg") String enumFormString + ) throws Exception; @@ -427,12 +459,18 @@ ResponseEntity testEnumParameters( value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) ResponseEntity testGroupParameters( - @NotNull @Parameter(name = "required_string_group", description = "Required String in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, - @NotNull @Parameter(name = "required_boolean_group", description = "Required Boolean in group parameters", required = true, in = ParameterIn.HEADER) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, - @NotNull @Parameter(name = "required_int64_group", description = "Required Integer in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group, - @Parameter(name = "string_group", description = "String in group parameters", in = ParameterIn.QUERY) @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup, - @Parameter(name = "boolean_group", description = "Boolean in group parameters", in = ParameterIn.HEADER) @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup, + @NotNull @Parameter(name = "required_string_group", description = "Required String in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup +, + @NotNull @Parameter(name = "required_boolean_group", description = "Required Boolean in group parameters", required = true, in = ParameterIn.HEADER) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup +, + @NotNull @Parameter(name = "required_int64_group", description = "Required Integer in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group +, + @Parameter(name = "string_group", description = "String in group parameters", in = ParameterIn.QUERY) @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup +, + @Parameter(name = "boolean_group", description = "Boolean in group parameters", in = ParameterIn.HEADER) @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup +, @Parameter(name = "int64_group", description = "Integer in group parameters", in = ParameterIn.QUERY) @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group + ) throws Exception; @@ -460,6 +498,7 @@ ResponseEntity testGroupParameters( ) ResponseEntity testInlineAdditionalProperties( @Parameter(name = "request_body", description = "request body", required = true) @Valid @RequestBody Map requestBody + ) throws Exception; @@ -487,8 +526,10 @@ ResponseEntity testInlineAdditionalProperties( consumes = { "application/x-www-form-urlencoded" } ) ResponseEntity testJsonFormData( - @Parameter(name = "param", description = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, + @Parameter(name = "param", description = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param +, @Parameter(name = "param2", description = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 + ) throws Exception; @@ -516,6 +557,7 @@ ResponseEntity testJsonFormData( ) ResponseEntity testNullable( @Parameter(name = "ChildWithNullable", description = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable + ) throws Exception; @@ -543,10 +585,14 @@ ResponseEntity testNullable( value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) ResponseEntity testQueryParameterCollectionFormat( - @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "http", required = true) List http, - @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "url", required = true) List url, + @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "pipe", required = true) List pipe +, + @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "http", required = true) List http +, + @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "url", required = true) List url +, @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "context", required = true) List context + ) throws Exception; @@ -608,9 +654,12 @@ ResponseEntity testWithResultExample( consumes = { "multipart/form-data" } ) ResponseEntity uploadFileWithRequiredFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "requiredFile", description = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, + @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "requiredFile", description = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile +, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata + ) throws Exception; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 04098afa3bdb..a13b1deba40f 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -65,6 +65,7 @@ public interface FakeClassnameTestApi { ) ResponseEntity testClassname( @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client + ) throws Exception; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/PetApi.java index ff877b33d848..fbf449b4abe8 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/PetApi.java @@ -67,6 +67,7 @@ public interface PetApi { ) ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) throws Exception; @@ -98,8 +99,10 @@ ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) ResponseEntity deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ) throws Exception; @@ -135,6 +138,7 @@ ResponseEntity deletePet( ) ResponseEntity> findPetsByStatus( @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) List status + ) throws Exception; @@ -173,6 +177,7 @@ ResponseEntity> findPetsByStatus( ) ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) Set tags + ) throws Exception; @@ -210,6 +215,7 @@ ResponseEntity> findPetsByTags( ) ResponseEntity getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + ) throws Exception; @@ -246,6 +252,7 @@ ResponseEntity getPetById( ) ResponseEntity updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) throws Exception; @@ -277,9 +284,12 @@ ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, + @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name +, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status + ) throws Exception; @@ -314,9 +324,12 @@ ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file + ) throws Exception; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java index 3de9066093c9..e416f0cbf999 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java @@ -61,6 +61,7 @@ public interface StoreApi { ) ResponseEntity deleteOrder( @NotNull @Parameter(name = "order_id", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("order_id") String orderId + ) throws Exception; @@ -126,6 +127,7 @@ ResponseEntity> getInventory( ) ResponseEntity getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "order_id", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("order_id") Long orderId + ) throws Exception; @@ -159,6 +161,7 @@ ResponseEntity getOrderById( ) ResponseEntity placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order + ) throws Exception; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java index fa8ea71351ea..7228fcc61d85 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java @@ -60,6 +60,7 @@ public interface UserApi { ) ResponseEntity createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user + ) throws Exception; @@ -87,6 +88,7 @@ ResponseEntity createUser( ) ResponseEntity createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) throws Exception; @@ -114,6 +116,7 @@ ResponseEntity createUsersWithArrayInput( ) ResponseEntity createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) throws Exception; @@ -142,6 +145,7 @@ ResponseEntity createUsersWithListInput( ) ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ) throws Exception; @@ -176,6 +180,7 @@ ResponseEntity deleteUser( ) ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ) throws Exception; @@ -208,8 +213,10 @@ ResponseEntity getUserByName( produces = { "application/xml", "application/json" } ) ResponseEntity loginUser( - @NotNull @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password + ) throws Exception; @@ -264,8 +271,10 @@ ResponseEntity logoutUser( consumes = { "application/json" } ) ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username +, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user + ) throws Exception; } diff --git a/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/api/NullableApi.java b/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/api/NullableApi.java index 31942329f54b..bb2c7e5cd67a 100644 --- a/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/api/NullableApi.java +++ b/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/api/NullableApi.java @@ -67,6 +67,7 @@ default Optional getRequest() { ) default ResponseEntity nullableTest( @Parameter(name = "ObjectWithUniqueItems", description = "") @Valid @RequestBody(required = false) @Nullable ObjectWithUniqueItems objectWithUniqueItems + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-api-response-examples/src/main/java/org/openapitools/api/DogsApi.java b/samples/server/petstore/springboot-api-response-examples/src/main/java/org/openapitools/api/DogsApi.java index b884af228d5a..af12f2978270 100644 --- a/samples/server/petstore/springboot-api-response-examples/src/main/java/org/openapitools/api/DogsApi.java +++ b/samples/server/petstore/springboot-api-response-examples/src/main/java/org/openapitools/api/DogsApi.java @@ -82,6 +82,7 @@ default DogsApiDelegate getDelegate() { ) default ResponseEntity createDog( @Parameter(name = "Dog", description = "") @Valid @RequestBody(required = false) @Nullable Dog dog + ) { return getDelegate().createDog(dog); } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java index ede9da33f0df..7592338c073a 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -57,6 +57,7 @@ default Optional getRequest() { ) default ResponseEntity call123testSpecialTags( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java index 1cc75de7b1c7..fabb1d215a0c 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java @@ -68,6 +68,7 @@ default Optional getRequest() { ) default ResponseEntity createXmlItem( @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -100,6 +101,7 @@ default ResponseEntity createXmlItem( ) default ResponseEntity fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -132,6 +134,7 @@ default ResponseEntity fakeOuterBooleanSerialize( ) default ResponseEntity fakeOuterCompositeSerialize( @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite outerComposite + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -173,6 +176,7 @@ default ResponseEntity fakeOuterCompositeSerialize( ) default ResponseEntity fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -205,6 +209,7 @@ default ResponseEntity fakeOuterNumberSerialize( ) default ResponseEntity fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -235,6 +240,7 @@ default ResponseEntity fakeOuterStringSerialize( ) default ResponseEntity responseObjectDifferentNames( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -274,6 +280,7 @@ default ResponseEntity responseObjectDiff ) default ResponseEntity testBodyWithFileSchema( @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -303,8 +310,10 @@ default ResponseEntity testBodyWithFileSchema( consumes = { "application/json" } ) default ResponseEntity testBodyWithQueryParams( - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query +, @ApiParam(value = "", required = true) @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -337,6 +346,7 @@ default ResponseEntity testBodyWithQueryParams( ) default ResponseEntity testClientModel( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -393,20 +403,34 @@ default ResponseEntity testClientModel( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEndpointParameters( - @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, - @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer, - @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32, - @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, - @ApiParam(value = "None") @DecimalMax(value = "987.6") @Valid @RequestParam(value = "float", required = false) Float _float, - @ApiParam(value = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestParam(value = "string", required = false) String string, - @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary, - @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, - @ApiParam(value = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password, + @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number +, + @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double +, + @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter +, + @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte +, + @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer +, + @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32 +, + @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64 +, + @ApiParam(value = "None") @DecimalMax(value = "987.6") @Valid @RequestParam(value = "float", required = false) Float _float +, + @ApiParam(value = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestParam(value = "string", required = false) String string +, + @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary +, + @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date +, + @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime +, + @ApiParam(value = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password +, @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -445,14 +469,22 @@ default ResponseEntity testEndpointParameters( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEnumParameters( - @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, - @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, - @ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray, - @ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString, - @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, - @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1.1, -1.2") @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, - @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_form_string", required = false) String enumFormString + @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray +, + @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString +, + @ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray +, + @ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString +, + @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger +, + @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1.1, -1.2") @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble +, + @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false, defaultValue = "$") List enumFormStringArray +, + @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_form_string", required = false, defaultValue = "-efg") String enumFormString + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -486,12 +518,18 @@ default ResponseEntity testEnumParameters( value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) default ResponseEntity testGroupParameters( - @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, - @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, - @NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group, - @ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup, - @ApiParam(value = "Boolean in group parameters") @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup, + @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup +, + @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup +, + @NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group +, + @ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup +, + @ApiParam(value = "Boolean in group parameters") @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup +, @ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -522,6 +560,7 @@ default ResponseEntity testGroupParameters( ) default ResponseEntity testInlineAdditionalProperties( @ApiParam(value = "request body", required = true) @Valid @RequestBody Map requestBody + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -552,8 +591,10 @@ default ResponseEntity testInlineAdditionalProperties( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testJsonFormData( - @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, + @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param +, @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -584,6 +625,7 @@ default ResponseEntity testJsonFormData( ) default ResponseEntity testNullable( @ApiParam(value = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -615,10 +657,14 @@ default ResponseEntity testNullable( value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) default ResponseEntity testQueryParameterCollectionFormat( - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url +, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -697,9 +743,12 @@ default ResponseEntity testWithResultExample( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFileWithRequiredFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, + @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile +, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 09cd7208502b..f3b22e176d77 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -60,6 +60,7 @@ default Optional getRequest() { ) default ResponseEntity testClassname( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java index 4a1bfaf26c61..ced8f1ab2f18 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java @@ -66,6 +66,7 @@ default Optional getRequest() { ) default ResponseEntity addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -103,8 +104,10 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, + @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId +, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -145,6 +148,7 @@ default ResponseEntity deletePet( ) default ResponseEntity> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -201,6 +205,7 @@ default ResponseEntity> findPetsByStatus( ) default ResponseEntity> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -253,6 +258,7 @@ default ResponseEntity> findPetsByTags( ) default ResponseEntity getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -309,6 +315,7 @@ default ResponseEntity getPetById( ) default ResponseEntity updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -346,9 +353,12 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, + @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name +, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -388,9 +398,12 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java index 5e700381edae..17584c61a909 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java @@ -57,6 +57,7 @@ default Optional getRequest() { ) default ResponseEntity deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -126,6 +127,7 @@ default ResponseEntity> getInventory( ) default ResponseEntity getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -174,6 +176,7 @@ default ResponseEntity getOrderById( ) default ResponseEntity placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java index 87f660929e6b..58203d901787 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java @@ -56,6 +56,7 @@ default Optional getRequest() { ) default ResponseEntity createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -86,6 +87,7 @@ default ResponseEntity createUser( ) default ResponseEntity createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -116,6 +118,7 @@ default ResponseEntity createUsersWithArrayInput( ) default ResponseEntity createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -147,6 +150,7 @@ default ResponseEntity createUsersWithListInput( ) default ResponseEntity deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -182,6 +186,7 @@ default ResponseEntity deleteUser( ) default ResponseEntity getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -229,8 +234,10 @@ default ResponseEntity getUserByName( produces = { "application/xml", "application/json" } ) default ResponseEntity loginUser( - @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -291,8 +298,10 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username +, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java index ede9da33f0df..7592338c073a 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -57,6 +57,7 @@ default Optional getRequest() { ) default ResponseEntity call123testSpecialTags( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java index 1cc75de7b1c7..fabb1d215a0c 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java @@ -68,6 +68,7 @@ default Optional getRequest() { ) default ResponseEntity createXmlItem( @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -100,6 +101,7 @@ default ResponseEntity createXmlItem( ) default ResponseEntity fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -132,6 +134,7 @@ default ResponseEntity fakeOuterBooleanSerialize( ) default ResponseEntity fakeOuterCompositeSerialize( @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite outerComposite + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -173,6 +176,7 @@ default ResponseEntity fakeOuterCompositeSerialize( ) default ResponseEntity fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -205,6 +209,7 @@ default ResponseEntity fakeOuterNumberSerialize( ) default ResponseEntity fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -235,6 +240,7 @@ default ResponseEntity fakeOuterStringSerialize( ) default ResponseEntity responseObjectDifferentNames( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -274,6 +280,7 @@ default ResponseEntity responseObjectDiff ) default ResponseEntity testBodyWithFileSchema( @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -303,8 +310,10 @@ default ResponseEntity testBodyWithFileSchema( consumes = { "application/json" } ) default ResponseEntity testBodyWithQueryParams( - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query +, @ApiParam(value = "", required = true) @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -337,6 +346,7 @@ default ResponseEntity testBodyWithQueryParams( ) default ResponseEntity testClientModel( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -393,20 +403,34 @@ default ResponseEntity testClientModel( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEndpointParameters( - @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, - @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer, - @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32, - @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, - @ApiParam(value = "None") @DecimalMax(value = "987.6") @Valid @RequestParam(value = "float", required = false) Float _float, - @ApiParam(value = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestParam(value = "string", required = false) String string, - @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary, - @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, - @ApiParam(value = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password, + @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number +, + @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double +, + @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter +, + @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte +, + @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer +, + @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32 +, + @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64 +, + @ApiParam(value = "None") @DecimalMax(value = "987.6") @Valid @RequestParam(value = "float", required = false) Float _float +, + @ApiParam(value = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestParam(value = "string", required = false) String string +, + @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary +, + @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date +, + @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime +, + @ApiParam(value = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password +, @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -445,14 +469,22 @@ default ResponseEntity testEndpointParameters( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEnumParameters( - @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, - @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, - @ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray, - @ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString, - @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, - @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1.1, -1.2") @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, - @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_form_string", required = false) String enumFormString + @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray +, + @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString +, + @ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray +, + @ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString +, + @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger +, + @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1.1, -1.2") @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble +, + @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false, defaultValue = "$") List enumFormStringArray +, + @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_form_string", required = false, defaultValue = "-efg") String enumFormString + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -486,12 +518,18 @@ default ResponseEntity testEnumParameters( value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) default ResponseEntity testGroupParameters( - @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, - @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, - @NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group, - @ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup, - @ApiParam(value = "Boolean in group parameters") @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup, + @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup +, + @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup +, + @NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group +, + @ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup +, + @ApiParam(value = "Boolean in group parameters") @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup +, @ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -522,6 +560,7 @@ default ResponseEntity testGroupParameters( ) default ResponseEntity testInlineAdditionalProperties( @ApiParam(value = "request body", required = true) @Valid @RequestBody Map requestBody + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -552,8 +591,10 @@ default ResponseEntity testInlineAdditionalProperties( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testJsonFormData( - @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, + @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param +, @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -584,6 +625,7 @@ default ResponseEntity testJsonFormData( ) default ResponseEntity testNullable( @ApiParam(value = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -615,10 +657,14 @@ default ResponseEntity testNullable( value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) default ResponseEntity testQueryParameterCollectionFormat( - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url +, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -697,9 +743,12 @@ default ResponseEntity testWithResultExample( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFileWithRequiredFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, + @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile +, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 09cd7208502b..f3b22e176d77 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -60,6 +60,7 @@ default Optional getRequest() { ) default ResponseEntity testClassname( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java index 4a1bfaf26c61..ced8f1ab2f18 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java @@ -66,6 +66,7 @@ default Optional getRequest() { ) default ResponseEntity addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -103,8 +104,10 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, + @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId +, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -145,6 +148,7 @@ default ResponseEntity deletePet( ) default ResponseEntity> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -201,6 +205,7 @@ default ResponseEntity> findPetsByStatus( ) default ResponseEntity> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -253,6 +258,7 @@ default ResponseEntity> findPetsByTags( ) default ResponseEntity getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -309,6 +315,7 @@ default ResponseEntity getPetById( ) default ResponseEntity updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -346,9 +353,12 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, + @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name +, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -388,9 +398,12 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java index 5e700381edae..17584c61a909 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java @@ -57,6 +57,7 @@ default Optional getRequest() { ) default ResponseEntity deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -126,6 +127,7 @@ default ResponseEntity> getInventory( ) default ResponseEntity getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -174,6 +176,7 @@ default ResponseEntity getOrderById( ) default ResponseEntity placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java index 87f660929e6b..58203d901787 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java @@ -56,6 +56,7 @@ default Optional getRequest() { ) default ResponseEntity createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -86,6 +87,7 @@ default ResponseEntity createUser( ) default ResponseEntity createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -116,6 +118,7 @@ default ResponseEntity createUsersWithArrayInput( ) default ResponseEntity createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -147,6 +150,7 @@ default ResponseEntity createUsersWithListInput( ) default ResponseEntity deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -182,6 +186,7 @@ default ResponseEntity deleteUser( ) default ResponseEntity getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -229,8 +234,10 @@ default ResponseEntity getUserByName( produces = { "application/xml", "application/json" } ) default ResponseEntity loginUser( - @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -291,8 +298,10 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username +, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/AnotherFakeApi.java index 08c7d2733d11..19e3f6f89700 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -57,6 +57,7 @@ default Optional getRequest() { ) default ResponseEntity call123testSpecialTags( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/FakeApi.java index 280397cfd7b9..4c821417ad6f 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/FakeApi.java @@ -68,6 +68,7 @@ default Optional getRequest() { ) default ResponseEntity createXmlItem( @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -100,6 +101,7 @@ default ResponseEntity createXmlItem( ) default ResponseEntity fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -132,6 +134,7 @@ default ResponseEntity fakeOuterBooleanSerialize( ) default ResponseEntity fakeOuterCompositeSerialize( @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite outerComposite + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -173,6 +176,7 @@ default ResponseEntity fakeOuterCompositeSerialize( ) default ResponseEntity fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -205,6 +209,7 @@ default ResponseEntity fakeOuterNumberSerialize( ) default ResponseEntity fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -235,6 +240,7 @@ default ResponseEntity fakeOuterStringSerialize( ) default ResponseEntity responseObjectDifferentNames( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -274,6 +280,7 @@ default ResponseEntity responseObjectDiff ) default ResponseEntity testBodyWithFileSchema( @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -303,8 +310,10 @@ default ResponseEntity testBodyWithFileSchema( consumes = { "application/json" } ) default ResponseEntity testBodyWithQueryParams( - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query +, @ApiParam(value = "", required = true) @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -337,6 +346,7 @@ default ResponseEntity testBodyWithQueryParams( ) default ResponseEntity testClientModel( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -393,20 +403,34 @@ default ResponseEntity testClientModel( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEndpointParameters( - @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, - @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer, - @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32, - @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, - @ApiParam(value = "None") @DecimalMax(value = "987.6") @Valid @RequestParam(value = "float", required = false) Float _float, - @ApiParam(value = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestParam(value = "string", required = false) String string, - @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary, - @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, - @ApiParam(value = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password, + @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number +, + @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double +, + @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter +, + @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte +, + @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer +, + @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32 +, + @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64 +, + @ApiParam(value = "None") @DecimalMax(value = "987.6") @Valid @RequestParam(value = "float", required = false) Float _float +, + @ApiParam(value = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestParam(value = "string", required = false) String string +, + @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary +, + @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date +, + @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime +, + @ApiParam(value = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password +, @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -445,14 +469,22 @@ default ResponseEntity testEndpointParameters( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEnumParameters( - @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, - @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, - @ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray, - @ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString, - @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, - @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1.1, -1.2") @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, - @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_form_string", required = false) String enumFormString + @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray +, + @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString +, + @ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray +, + @ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString +, + @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger +, + @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1.1, -1.2") @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble +, + @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false, defaultValue = "$") List enumFormStringArray +, + @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_form_string", required = false, defaultValue = "-efg") String enumFormString + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -486,12 +518,18 @@ default ResponseEntity testEnumParameters( value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) default ResponseEntity testGroupParameters( - @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, - @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, - @NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group, - @ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup, - @ApiParam(value = "Boolean in group parameters") @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup, + @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup +, + @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup +, + @NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group +, + @ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup +, + @ApiParam(value = "Boolean in group parameters") @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup +, @ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -522,6 +560,7 @@ default ResponseEntity testGroupParameters( ) default ResponseEntity testInlineAdditionalProperties( @ApiParam(value = "request body", required = true) @Valid @RequestBody Map requestBody + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -552,8 +591,10 @@ default ResponseEntity testInlineAdditionalProperties( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testJsonFormData( - @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, + @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param +, @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -584,6 +625,7 @@ default ResponseEntity testJsonFormData( ) default ResponseEntity testNullable( @ApiParam(value = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -615,10 +657,14 @@ default ResponseEntity testNullable( value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) default ResponseEntity testQueryParameterCollectionFormat( - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url +, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -697,9 +743,12 @@ default ResponseEntity testWithResultExample( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFileWithRequiredFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, + @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile +, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index e92230820e88..64a983269dcc 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -60,6 +60,7 @@ default Optional getRequest() { ) default ResponseEntity testClassname( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/PetApi.java index 3bae88c3acbb..fdcdb962060b 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/PetApi.java @@ -66,6 +66,7 @@ default Optional getRequest() { ) default ResponseEntity addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -103,8 +104,10 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, + @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId +, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -145,6 +148,7 @@ default ResponseEntity deletePet( ) default ResponseEntity> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -201,6 +205,7 @@ default ResponseEntity> findPetsByStatus( ) default ResponseEntity> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -253,6 +258,7 @@ default ResponseEntity> findPetsByTags( ) default ResponseEntity getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -309,6 +315,7 @@ default ResponseEntity getPetById( ) default ResponseEntity updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -346,9 +353,12 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, + @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name +, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -388,9 +398,12 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/StoreApi.java index b52cbc244235..b4797e68a07e 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/StoreApi.java @@ -57,6 +57,7 @@ default Optional getRequest() { ) default ResponseEntity deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -126,6 +127,7 @@ default ResponseEntity> getInventory( ) default ResponseEntity getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -174,6 +176,7 @@ default ResponseEntity getOrderById( ) default ResponseEntity placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/UserApi.java index 210c662f08c7..6b44b33e9555 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/UserApi.java @@ -56,6 +56,7 @@ default Optional getRequest() { ) default ResponseEntity createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -86,6 +87,7 @@ default ResponseEntity createUser( ) default ResponseEntity createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -116,6 +118,7 @@ default ResponseEntity createUsersWithArrayInput( ) default ResponseEntity createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -147,6 +150,7 @@ default ResponseEntity createUsersWithListInput( ) default ResponseEntity deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -182,6 +186,7 @@ default ResponseEntity deleteUser( ) default ResponseEntity getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -229,8 +234,10 @@ default ResponseEntity getUserByName( produces = { "application/xml", "application/json" } ) default ResponseEntity loginUser( - @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -291,8 +298,10 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username +, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java index 4be8dc60a27d..dd1a1b7d50f8 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -53,6 +53,7 @@ default AnotherFakeApiDelegate getDelegate() { ) default ResponseEntity call123testSpecialTags( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client + ) { return getDelegate().call123testSpecialTags(client); } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java index 02a1b916aa39..05d112fc8aa7 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -64,6 +64,7 @@ default FakeApiDelegate getDelegate() { ) default ResponseEntity createXmlItem( @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem + ) { return getDelegate().createXmlItem(xmlItem); } @@ -95,6 +96,7 @@ default ResponseEntity createXmlItem( ) default ResponseEntity fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body + ) { return getDelegate().fakeOuterBooleanSerialize(body); } @@ -126,6 +128,7 @@ default ResponseEntity fakeOuterBooleanSerialize( ) default ResponseEntity fakeOuterCompositeSerialize( @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite outerComposite + ) { return getDelegate().fakeOuterCompositeSerialize(outerComposite); } @@ -157,6 +160,7 @@ default ResponseEntity fakeOuterCompositeSerialize( ) default ResponseEntity fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body + ) { return getDelegate().fakeOuterNumberSerialize(body); } @@ -188,6 +192,7 @@ default ResponseEntity fakeOuterNumberSerialize( ) default ResponseEntity fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body + ) { return getDelegate().fakeOuterStringSerialize(body); } @@ -217,6 +222,7 @@ default ResponseEntity fakeOuterStringSerialize( ) default ResponseEntity responseObjectDifferentNames( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + ) { return getDelegate().responseObjectDifferentNames(petId); } @@ -246,6 +252,7 @@ default ResponseEntity responseObjectDiff ) default ResponseEntity testBodyWithFileSchema( @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass + ) { return getDelegate().testBodyWithFileSchema(fileSchemaTestClass); } @@ -274,8 +281,10 @@ default ResponseEntity testBodyWithFileSchema( consumes = { "application/json" } ) default ResponseEntity testBodyWithQueryParams( - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query +, @ApiParam(value = "", required = true) @Valid @RequestBody User user + ) { return getDelegate().testBodyWithQueryParams(query, user); } @@ -307,6 +316,7 @@ default ResponseEntity testBodyWithQueryParams( ) default ResponseEntity testClientModel( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client + ) { return getDelegate().testClientModel(client); } @@ -353,20 +363,34 @@ default ResponseEntity testClientModel( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEndpointParameters( - @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, - @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer, - @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32, - @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, - @ApiParam(value = "None") @DecimalMax(value = "987.6") @Valid @RequestParam(value = "float", required = false) Float _float, - @ApiParam(value = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestParam(value = "string", required = false) String string, - @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary, - @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, - @ApiParam(value = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password, + @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number +, + @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double +, + @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter +, + @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte +, + @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer +, + @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32 +, + @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64 +, + @ApiParam(value = "None") @DecimalMax(value = "987.6") @Valid @RequestParam(value = "float", required = false) Float _float +, + @ApiParam(value = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestParam(value = "string", required = false) String string +, + @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary +, + @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date +, + @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime +, + @ApiParam(value = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password +, @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback + ) { return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); } @@ -404,14 +428,22 @@ default ResponseEntity testEndpointParameters( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEnumParameters( - @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, - @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, - @ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray, - @ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString, - @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, - @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1.1, -1.2") @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, - @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_form_string", required = false) String enumFormString + @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray +, + @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString +, + @ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray +, + @ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString +, + @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger +, + @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1.1, -1.2") @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble +, + @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false, defaultValue = "$") List enumFormStringArray +, + @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_form_string", required = false, defaultValue = "-efg") String enumFormString + ) { return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); } @@ -444,12 +476,18 @@ default ResponseEntity testEnumParameters( value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) default ResponseEntity testGroupParameters( - @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, - @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, - @NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group, - @ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup, - @ApiParam(value = "Boolean in group parameters") @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup, + @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup +, + @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup +, + @NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group +, + @ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup +, + @ApiParam(value = "Boolean in group parameters") @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup +, @ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group + ) { return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); } @@ -479,6 +517,7 @@ default ResponseEntity testGroupParameters( ) default ResponseEntity testInlineAdditionalProperties( @ApiParam(value = "request body", required = true) @Valid @RequestBody Map requestBody + ) { return getDelegate().testInlineAdditionalProperties(requestBody); } @@ -508,8 +547,10 @@ default ResponseEntity testInlineAdditionalProperties( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testJsonFormData( - @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, + @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param +, @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 + ) { return getDelegate().testJsonFormData(param, param2); } @@ -539,6 +580,7 @@ default ResponseEntity testJsonFormData( ) default ResponseEntity testNullable( @ApiParam(value = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable + ) { return getDelegate().testNullable(childWithNullable); } @@ -569,10 +611,14 @@ default ResponseEntity testNullable( value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) default ResponseEntity testQueryParameterCollectionFormat( - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url +, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context + ) { return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context); } @@ -640,9 +686,12 @@ default ResponseEntity testWithResultExample( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFileWithRequiredFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, + @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile +, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata + ) { return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 9bf9643acdb0..0f48183cdb6f 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -56,6 +56,7 @@ default FakeClassnameTestApiDelegate getDelegate() { ) default ResponseEntity testClassname( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client + ) { return getDelegate().testClassname(client); } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java index bae4cfe7a8e2..294cd9b65f1e 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java @@ -62,6 +62,7 @@ default PetApiDelegate getDelegate() { ) default ResponseEntity addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { return getDelegate().addPet(pet); } @@ -98,8 +99,10 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, + @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId +, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ) { return getDelegate().deletePet(petId, apiKey); } @@ -139,6 +142,7 @@ default ResponseEntity deletePet( ) default ResponseEntity> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status + ) { return getDelegate().findPetsByStatus(status); } @@ -180,6 +184,7 @@ default ResponseEntity> findPetsByStatus( ) default ResponseEntity> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags + ) { return getDelegate().findPetsByTags(tags); } @@ -217,6 +222,7 @@ default ResponseEntity> findPetsByTags( ) default ResponseEntity getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId + ) { return getDelegate().getPetById(petId); } @@ -258,6 +264,7 @@ default ResponseEntity getPetById( ) default ResponseEntity updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { return getDelegate().updatePet(pet); } @@ -294,9 +301,12 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, + @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name +, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status + ) { return getDelegate().updatePetWithForm(petId, name, status); } @@ -335,9 +345,12 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file + ) { return getDelegate().uploadFile(petId, additionalMetadata, file); } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java index e35eb8c96ab1..c5ffed15792d 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -53,6 +53,7 @@ default StoreApiDelegate getDelegate() { ) default ResponseEntity deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId + ) { return getDelegate().deleteOrder(orderId); } @@ -120,6 +121,7 @@ default ResponseEntity> getInventory( ) default ResponseEntity getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId + ) { return getDelegate().getOrderById(orderId); } @@ -153,6 +155,7 @@ default ResponseEntity getOrderById( ) default ResponseEntity placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order + ) { return getDelegate().placeOrder(order); } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java index 77ceb2dda085..794bc28716bd 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java @@ -52,6 +52,7 @@ default UserApiDelegate getDelegate() { ) default ResponseEntity createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user + ) { return getDelegate().createUser(user); } @@ -81,6 +82,7 @@ default ResponseEntity createUser( ) default ResponseEntity createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { return getDelegate().createUsersWithArrayInput(user); } @@ -110,6 +112,7 @@ default ResponseEntity createUsersWithArrayInput( ) default ResponseEntity createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { return getDelegate().createUsersWithListInput(user); } @@ -140,6 +143,7 @@ default ResponseEntity createUsersWithListInput( ) default ResponseEntity deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username + ) { return getDelegate().deleteUser(username); } @@ -174,6 +178,7 @@ default ResponseEntity deleteUser( ) default ResponseEntity getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username + ) { return getDelegate().getUserByName(username); } @@ -206,8 +211,10 @@ default ResponseEntity getUserByName( produces = { "application/xml", "application/json" } ) default ResponseEntity loginUser( - @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password + ) { return getDelegate().loginUser(username, password); } @@ -266,8 +273,10 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username +, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user + ) { return getDelegate().updateUser(username, user); } diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApi.java index 53f663d6c5ad..d1cbd8808506 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApi.java @@ -64,6 +64,7 @@ default PetApiDelegate getDelegate() { @ResponseStatus(HttpStatus.OK) default Pet addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { return getDelegate().addPet(pet); } @@ -99,8 +100,10 @@ default Pet addPet( ) @ResponseStatus(HttpStatus.BAD_REQUEST) default void deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, + @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId +, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ) { getDelegate().deletePet(petId, apiKey); } @@ -140,6 +143,7 @@ default void deletePet( @ResponseStatus(HttpStatus.OK) default List findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) @Deprecated List status + ) { return getDelegate().findPetsByStatus(status); } @@ -181,6 +185,7 @@ default List findPetsByStatus( @ResponseStatus(HttpStatus.OK) default List findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags + ) { return getDelegate().findPetsByTags(tags); } @@ -219,6 +224,7 @@ default List findPetsByTags( @ResponseStatus(HttpStatus.OK) default Pet getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId + ) { return getDelegate().getPetById(petId); } @@ -265,6 +271,7 @@ default Pet getPetById( @ResponseStatus(HttpStatus.OK) default Pet updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { return getDelegate().updatePet(pet); } @@ -302,9 +309,12 @@ default Pet updatePet( ) @ResponseStatus(HttpStatus.METHOD_NOT_ALLOWED) default void updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, + @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name +, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status + ) { getDelegate().updatePetWithForm(petId, name, status); } @@ -344,9 +354,12 @@ default void updatePetWithForm( ) @ResponseStatus(HttpStatus.OK) default ModelApiResponse uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file + ) { return getDelegate().uploadFile(petId, additionalMetadata, file); } diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApi.java index 36c8ac2a63d2..36ae4afadb26 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApi.java @@ -54,6 +54,7 @@ default StoreApiDelegate getDelegate() { @ResponseStatus(HttpStatus.BAD_REQUEST) default void deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") String orderId + ) { getDelegate().deleteOrder(orderId); } @@ -123,6 +124,7 @@ default Map getInventory( @ResponseStatus(HttpStatus.OK) default Order getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") Long orderId + ) { return getDelegate().getOrderById(orderId); } @@ -157,6 +159,7 @@ default Order getOrderById( @ResponseStatus(HttpStatus.OK) default Order placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order + ) { return getDelegate().placeOrder(order); } diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApi.java index 4de36bd6b7d0..aa61a427a177 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApi.java @@ -56,6 +56,7 @@ default UserApiDelegate getDelegate() { @ResponseStatus(HttpStatus.OK) default void createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user + ) { getDelegate().createUser(user); } @@ -89,6 +90,7 @@ default void createUser( @ResponseStatus(HttpStatus.OK) default void createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { getDelegate().createUsersWithArrayInput(user); } @@ -122,6 +124,7 @@ default void createUsersWithArrayInput( @ResponseStatus(HttpStatus.OK) default void createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { getDelegate().createUsersWithListInput(user); } @@ -156,6 +159,7 @@ default void createUsersWithListInput( @ResponseStatus(HttpStatus.BAD_REQUEST) default void deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username + ) { getDelegate().deleteUser(username); } @@ -191,6 +195,7 @@ default void deleteUser( @ResponseStatus(HttpStatus.OK) default User getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username + ) { return getDelegate().getUserByName(username); } @@ -224,8 +229,10 @@ default User getUserByName( ) @ResponseStatus(HttpStatus.OK) default String loginUser( - @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password + ) { return getDelegate().loginUser(username, password); } @@ -292,8 +299,10 @@ default void logoutUser( ) @ResponseStatus(HttpStatus.BAD_REQUEST) default void updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username +, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user + ) { getDelegate().updateUser(username, user); } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java index 4be8dc60a27d..dd1a1b7d50f8 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -53,6 +53,7 @@ default AnotherFakeApiDelegate getDelegate() { ) default ResponseEntity call123testSpecialTags( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client + ) { return getDelegate().call123testSpecialTags(client); } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java index 02a1b916aa39..05d112fc8aa7 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java @@ -64,6 +64,7 @@ default FakeApiDelegate getDelegate() { ) default ResponseEntity createXmlItem( @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem + ) { return getDelegate().createXmlItem(xmlItem); } @@ -95,6 +96,7 @@ default ResponseEntity createXmlItem( ) default ResponseEntity fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body + ) { return getDelegate().fakeOuterBooleanSerialize(body); } @@ -126,6 +128,7 @@ default ResponseEntity fakeOuterBooleanSerialize( ) default ResponseEntity fakeOuterCompositeSerialize( @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite outerComposite + ) { return getDelegate().fakeOuterCompositeSerialize(outerComposite); } @@ -157,6 +160,7 @@ default ResponseEntity fakeOuterCompositeSerialize( ) default ResponseEntity fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body + ) { return getDelegate().fakeOuterNumberSerialize(body); } @@ -188,6 +192,7 @@ default ResponseEntity fakeOuterNumberSerialize( ) default ResponseEntity fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body + ) { return getDelegate().fakeOuterStringSerialize(body); } @@ -217,6 +222,7 @@ default ResponseEntity fakeOuterStringSerialize( ) default ResponseEntity responseObjectDifferentNames( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + ) { return getDelegate().responseObjectDifferentNames(petId); } @@ -246,6 +252,7 @@ default ResponseEntity responseObjectDiff ) default ResponseEntity testBodyWithFileSchema( @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass + ) { return getDelegate().testBodyWithFileSchema(fileSchemaTestClass); } @@ -274,8 +281,10 @@ default ResponseEntity testBodyWithFileSchema( consumes = { "application/json" } ) default ResponseEntity testBodyWithQueryParams( - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query +, @ApiParam(value = "", required = true) @Valid @RequestBody User user + ) { return getDelegate().testBodyWithQueryParams(query, user); } @@ -307,6 +316,7 @@ default ResponseEntity testBodyWithQueryParams( ) default ResponseEntity testClientModel( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client + ) { return getDelegate().testClientModel(client); } @@ -353,20 +363,34 @@ default ResponseEntity testClientModel( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEndpointParameters( - @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, - @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer, - @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32, - @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, - @ApiParam(value = "None") @DecimalMax(value = "987.6") @Valid @RequestParam(value = "float", required = false) Float _float, - @ApiParam(value = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestParam(value = "string", required = false) String string, - @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary, - @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, - @ApiParam(value = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password, + @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number +, + @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double +, + @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter +, + @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte +, + @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer +, + @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32 +, + @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64 +, + @ApiParam(value = "None") @DecimalMax(value = "987.6") @Valid @RequestParam(value = "float", required = false) Float _float +, + @ApiParam(value = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestParam(value = "string", required = false) String string +, + @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary +, + @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date +, + @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime +, + @ApiParam(value = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password +, @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback + ) { return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); } @@ -404,14 +428,22 @@ default ResponseEntity testEndpointParameters( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEnumParameters( - @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, - @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, - @ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray, - @ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString, - @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, - @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1.1, -1.2") @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, - @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_form_string", required = false) String enumFormString + @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray +, + @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString +, + @ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray +, + @ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString +, + @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger +, + @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1.1, -1.2") @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble +, + @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false, defaultValue = "$") List enumFormStringArray +, + @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_form_string", required = false, defaultValue = "-efg") String enumFormString + ) { return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); } @@ -444,12 +476,18 @@ default ResponseEntity testEnumParameters( value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) default ResponseEntity testGroupParameters( - @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, - @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, - @NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group, - @ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup, - @ApiParam(value = "Boolean in group parameters") @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup, + @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup +, + @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup +, + @NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group +, + @ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup +, + @ApiParam(value = "Boolean in group parameters") @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup +, @ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group + ) { return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); } @@ -479,6 +517,7 @@ default ResponseEntity testGroupParameters( ) default ResponseEntity testInlineAdditionalProperties( @ApiParam(value = "request body", required = true) @Valid @RequestBody Map requestBody + ) { return getDelegate().testInlineAdditionalProperties(requestBody); } @@ -508,8 +547,10 @@ default ResponseEntity testInlineAdditionalProperties( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testJsonFormData( - @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, + @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param +, @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 + ) { return getDelegate().testJsonFormData(param, param2); } @@ -539,6 +580,7 @@ default ResponseEntity testJsonFormData( ) default ResponseEntity testNullable( @ApiParam(value = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable + ) { return getDelegate().testNullable(childWithNullable); } @@ -569,10 +611,14 @@ default ResponseEntity testNullable( value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) default ResponseEntity testQueryParameterCollectionFormat( - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url +, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context + ) { return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context); } @@ -640,9 +686,12 @@ default ResponseEntity testWithResultExample( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFileWithRequiredFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, + @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile +, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata + ) { return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 9bf9643acdb0..0f48183cdb6f 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -56,6 +56,7 @@ default FakeClassnameTestApiDelegate getDelegate() { ) default ResponseEntity testClassname( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client + ) { return getDelegate().testClassname(client); } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java index bae4cfe7a8e2..294cd9b65f1e 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java @@ -62,6 +62,7 @@ default PetApiDelegate getDelegate() { ) default ResponseEntity addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { return getDelegate().addPet(pet); } @@ -98,8 +99,10 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, + @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId +, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ) { return getDelegate().deletePet(petId, apiKey); } @@ -139,6 +142,7 @@ default ResponseEntity deletePet( ) default ResponseEntity> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status + ) { return getDelegate().findPetsByStatus(status); } @@ -180,6 +184,7 @@ default ResponseEntity> findPetsByStatus( ) default ResponseEntity> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags + ) { return getDelegate().findPetsByTags(tags); } @@ -217,6 +222,7 @@ default ResponseEntity> findPetsByTags( ) default ResponseEntity getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId + ) { return getDelegate().getPetById(petId); } @@ -258,6 +264,7 @@ default ResponseEntity getPetById( ) default ResponseEntity updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { return getDelegate().updatePet(pet); } @@ -294,9 +301,12 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, + @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name +, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status + ) { return getDelegate().updatePetWithForm(petId, name, status); } @@ -335,9 +345,12 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file + ) { return getDelegate().uploadFile(petId, additionalMetadata, file); } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java index e35eb8c96ab1..c5ffed15792d 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java @@ -53,6 +53,7 @@ default StoreApiDelegate getDelegate() { ) default ResponseEntity deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId + ) { return getDelegate().deleteOrder(orderId); } @@ -120,6 +121,7 @@ default ResponseEntity> getInventory( ) default ResponseEntity getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId + ) { return getDelegate().getOrderById(orderId); } @@ -153,6 +155,7 @@ default ResponseEntity getOrderById( ) default ResponseEntity placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order + ) { return getDelegate().placeOrder(order); } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java index 77ceb2dda085..794bc28716bd 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java @@ -52,6 +52,7 @@ default UserApiDelegate getDelegate() { ) default ResponseEntity createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user + ) { return getDelegate().createUser(user); } @@ -81,6 +82,7 @@ default ResponseEntity createUser( ) default ResponseEntity createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { return getDelegate().createUsersWithArrayInput(user); } @@ -110,6 +112,7 @@ default ResponseEntity createUsersWithArrayInput( ) default ResponseEntity createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { return getDelegate().createUsersWithListInput(user); } @@ -140,6 +143,7 @@ default ResponseEntity createUsersWithListInput( ) default ResponseEntity deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username + ) { return getDelegate().deleteUser(username); } @@ -174,6 +178,7 @@ default ResponseEntity deleteUser( ) default ResponseEntity getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username + ) { return getDelegate().getUserByName(username); } @@ -206,8 +211,10 @@ default ResponseEntity getUserByName( produces = { "application/xml", "application/json" } ) default ResponseEntity loginUser( - @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password + ) { return getDelegate().loginUser(username, password); } @@ -266,8 +273,10 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username +, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user + ) { return getDelegate().updateUser(username, user); } diff --git a/samples/server/petstore/springboot-file-delegate-optional/src/main/java/org/openapitools/api/DummyApi.java b/samples/server/petstore/springboot-file-delegate-optional/src/main/java/org/openapitools/api/DummyApi.java index 96429b13875e..955a1f3d9aba 100644 --- a/samples/server/petstore/springboot-file-delegate-optional/src/main/java/org/openapitools/api/DummyApi.java +++ b/samples/server/petstore/springboot-file-delegate-optional/src/main/java/org/openapitools/api/DummyApi.java @@ -61,6 +61,7 @@ default DummyApiDelegate getDelegate() { ) default ResponseEntity uploadFile( @Parameter(name = "body", description = "") @Valid @RequestBody(required = false) Optional body + ) { return getDelegate().uploadFile(body); } diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApi.java index b8eda493dbe7..9f39688d6fcc 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApi.java @@ -48,6 +48,7 @@ default Optional getRequest() { ) default ResponseEntity addPet( @Valid @RequestBody Pet pet + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -82,6 +83,7 @@ default ResponseEntity addPet( ) default ResponseEntity deletePet( @NotNull @PathVariable("petId") Long petId + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -104,6 +106,7 @@ default ResponseEntity deletePet( ) default ResponseEntity> findPetsByStatus( @NotNull @Valid @RequestParam(value = "status", required = true) @Deprecated List status + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -142,6 +145,7 @@ default ResponseEntity> findPetsByStatus( ) default ResponseEntity> findPetsByTags( @NotNull @Valid @RequestParam(value = "tags", required = true) List tags + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -179,6 +183,7 @@ default ResponseEntity> findPetsByTags( ) default ResponseEntity getPetById( @NotNull @PathVariable("petId") Long petId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -220,6 +225,7 @@ default ResponseEntity getPetById( ) default ResponseEntity updatePet( @Valid @RequestBody Pet pet + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -256,9 +262,12 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @PathVariable("petId") Long petId, - @Valid @RequestParam(value = "name", required = false) String name, + @NotNull @PathVariable("petId") Long petId +, + @Valid @RequestParam(value = "name", required = false) String name +, @Valid @RequestParam(value = "status", required = false) String status + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -282,9 +291,12 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @PathVariable("petId") Long petId, - @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @PathVariable("petId") Long petId +, + @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @RequestPart(value = "file", required = false) MultipartFile file + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java index 35946f8cd267..5295e5ad0677 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java @@ -45,6 +45,7 @@ default Optional getRequest() { ) default ResponseEntity deleteOrder( @NotNull @PathVariable("orderId") String orderId + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -88,6 +89,7 @@ default ResponseEntity> getInventory( ) default ResponseEntity getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @PathVariable("orderId") Long orderId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -125,6 +127,7 @@ default ResponseEntity getOrderById( ) default ResponseEntity placeOrder( @Valid @RequestBody Order order + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApi.java index 7133ac485487..6e7664deba4c 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApi.java @@ -45,6 +45,7 @@ default Optional getRequest() { ) default ResponseEntity createUser( @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -66,6 +67,7 @@ default ResponseEntity createUser( ) default ResponseEntity createUsersWithArrayInput( @Valid @RequestBody List<@Valid User> user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -87,6 +89,7 @@ default ResponseEntity createUsersWithArrayInput( ) default ResponseEntity createUsersWithListInput( @Valid @RequestBody List<@Valid User> user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -108,6 +111,7 @@ default ResponseEntity createUsersWithListInput( ) default ResponseEntity deleteUser( @NotNull @PathVariable("username") String username + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -131,6 +135,7 @@ default ResponseEntity deleteUser( ) default ResponseEntity getUserByName( @NotNull @PathVariable("username") String username + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -167,8 +172,10 @@ default ResponseEntity getUserByName( produces = { "application/xml", "application/json" } ) default ResponseEntity loginUser( - @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @Valid @RequestParam(value = "password", required = true) String password + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -210,8 +217,10 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @PathVariable("username") String username, + @NotNull @PathVariable("username") String username +, @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java index ede9da33f0df..7592338c073a 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -57,6 +57,7 @@ default Optional getRequest() { ) default ResponseEntity call123testSpecialTags( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java index 295cf3e6c4a4..bee9f7b6c01f 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java @@ -68,6 +68,7 @@ default Optional getRequest() { ) default ResponseEntity createXmlItem( @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -100,6 +101,7 @@ default ResponseEntity createXmlItem( ) default ResponseEntity fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -132,6 +134,7 @@ default ResponseEntity fakeOuterBooleanSerialize( ) default ResponseEntity fakeOuterCompositeSerialize( @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite outerComposite + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -173,6 +176,7 @@ default ResponseEntity fakeOuterCompositeSerialize( ) default ResponseEntity fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -205,6 +209,7 @@ default ResponseEntity fakeOuterNumberSerialize( ) default ResponseEntity fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -235,6 +240,7 @@ default ResponseEntity fakeOuterStringSerialize( ) default ResponseEntity responseObjectDifferentNames( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -274,6 +280,7 @@ default ResponseEntity responseObjectDiff ) default ResponseEntity testBodyWithFileSchema( @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -303,8 +310,10 @@ default ResponseEntity testBodyWithFileSchema( consumes = { "application/json" } ) default ResponseEntity testBodyWithQueryParams( - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query +, @ApiParam(value = "", required = true) @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -337,6 +346,7 @@ default ResponseEntity testBodyWithQueryParams( ) default ResponseEntity testClientModel( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -393,20 +403,34 @@ default ResponseEntity testClientModel( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEndpointParameters( - @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, - @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer, - @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32, - @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, - @ApiParam(value = "None") @DecimalMax(value = "987.6") @Valid @RequestParam(value = "float", required = false) Float _float, - @ApiParam(value = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestParam(value = "string", required = false) String string, - @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary, - @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, - @ApiParam(value = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password, + @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number +, + @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double +, + @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter +, + @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte +, + @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer +, + @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32 +, + @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64 +, + @ApiParam(value = "None") @DecimalMax(value = "987.6") @Valid @RequestParam(value = "float", required = false) Float _float +, + @ApiParam(value = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestParam(value = "string", required = false) String string +, + @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary +, + @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date +, + @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime +, + @ApiParam(value = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password +, @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -447,12 +471,18 @@ default ResponseEntity testEndpointParameters( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEnumParameters( - @ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray, - @ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString, - @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, - @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1.1, -1.2") @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, - @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_form_string", required = false) String enumFormString + @ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray +, + @ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString +, + @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger +, + @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1.1, -1.2") @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble +, + @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false, defaultValue = "$") List enumFormStringArray +, + @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_form_string", required = false, defaultValue = "-efg") String enumFormString + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -488,10 +518,14 @@ default ResponseEntity testEnumParameters( value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) default ResponseEntity testGroupParameters( - @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, - @NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group, - @ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup, + @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup +, + @NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group +, + @ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup +, @ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -522,6 +556,7 @@ default ResponseEntity testGroupParameters( ) default ResponseEntity testInlineAdditionalProperties( @ApiParam(value = "request body", required = true) @Valid @RequestBody Map requestBody + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -552,8 +587,10 @@ default ResponseEntity testInlineAdditionalProperties( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testJsonFormData( - @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, + @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param +, @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -584,6 +621,7 @@ default ResponseEntity testJsonFormData( ) default ResponseEntity testNullable( @ApiParam(value = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -615,10 +653,14 @@ default ResponseEntity testNullable( value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) default ResponseEntity testQueryParameterCollectionFormat( - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url +, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -697,9 +739,12 @@ default ResponseEntity testWithResultExample( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFileWithRequiredFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, + @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile +, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 09cd7208502b..f3b22e176d77 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -60,6 +60,7 @@ default Optional getRequest() { ) default ResponseEntity testClassname( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java index 444b775d6da4..9407262fc15d 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java @@ -66,6 +66,7 @@ default Optional getRequest() { ) default ResponseEntity addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -106,6 +107,7 @@ default ResponseEntity addPet( ) default ResponseEntity deletePet( @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -146,6 +148,7 @@ default ResponseEntity deletePet( ) default ResponseEntity> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -202,6 +205,7 @@ default ResponseEntity> findPetsByStatus( ) default ResponseEntity> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -254,6 +258,7 @@ default ResponseEntity> findPetsByTags( ) default ResponseEntity getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -310,6 +315,7 @@ default ResponseEntity getPetById( ) default ResponseEntity updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -347,9 +353,12 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, + @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name +, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -389,9 +398,12 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java index 5e700381edae..17584c61a909 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java @@ -57,6 +57,7 @@ default Optional getRequest() { ) default ResponseEntity deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -126,6 +127,7 @@ default ResponseEntity> getInventory( ) default ResponseEntity getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -174,6 +176,7 @@ default ResponseEntity getOrderById( ) default ResponseEntity placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java index 87f660929e6b..58203d901787 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java @@ -56,6 +56,7 @@ default Optional getRequest() { ) default ResponseEntity createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -86,6 +87,7 @@ default ResponseEntity createUser( ) default ResponseEntity createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -116,6 +118,7 @@ default ResponseEntity createUsersWithArrayInput( ) default ResponseEntity createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -147,6 +150,7 @@ default ResponseEntity createUsersWithListInput( ) default ResponseEntity deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -182,6 +186,7 @@ default ResponseEntity deleteUser( ) default ResponseEntity getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -229,8 +234,10 @@ default ResponseEntity getUserByName( produces = { "application/xml", "application/json" } ) default ResponseEntity loginUser( - @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -291,8 +298,10 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username +, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/PetApi.java index b996cdfae1b2..2f26f87b8dba 100644 --- a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/PetApi.java @@ -77,6 +77,7 @@ default Optional getRequest() { ) default ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -123,8 +124,10 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -163,6 +166,7 @@ default ResponseEntity deletePet( ) default ResponseEntity> findPetsByStatus( @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) @Deprecated List status + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -218,6 +222,7 @@ default ResponseEntity> findPetsByStatus( ) default ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List tags + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -272,6 +277,7 @@ default ResponseEntity> findPetsByTags( ) default ResponseEntity getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -332,6 +338,7 @@ default ResponseEntity getPetById( ) default ResponseEntity updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -380,9 +387,12 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, + @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name +, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -420,9 +430,12 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/StoreApi.java index 6445a3195401..091349d8f12f 100644 --- a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/StoreApi.java @@ -68,6 +68,7 @@ default Optional getRequest() { ) default ResponseEntity deleteOrder( @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -139,6 +140,7 @@ default ResponseEntity> getInventory( ) default ResponseEntity getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -189,6 +191,7 @@ default ResponseEntity getOrderById( ) default ResponseEntity placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/UserApi.java index 6b15e3298e80..aad62c78f891 100644 --- a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/UserApi.java @@ -70,6 +70,7 @@ default Optional getRequest() { ) default ResponseEntity createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -103,6 +104,7 @@ default ResponseEntity createUser( ) default ResponseEntity createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -136,6 +138,7 @@ default ResponseEntity createUsersWithArrayInput( ) default ResponseEntity createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -170,6 +173,7 @@ default ResponseEntity createUsersWithListInput( ) default ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -207,6 +211,7 @@ default ResponseEntity deleteUser( ) default ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -256,8 +261,10 @@ default ResponseEntity getUserByName( produces = { "application/xml", "application/json" } ) default ResponseEntity loginUser( - @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -324,8 +331,10 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username +, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/PetApi.java index 0d23f2e8832a..78f28688d50b 100644 --- a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/PetApi.java @@ -77,6 +77,7 @@ default Optional getRequest() { ) default ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -123,8 +124,10 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -163,6 +166,7 @@ default ResponseEntity deletePet( ) default ResponseEntity> findPetsByStatus( @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) @Deprecated List status + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -218,6 +222,7 @@ default ResponseEntity> findPetsByStatus( ) default ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List tags + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -272,6 +277,7 @@ default ResponseEntity> findPetsByTags( ) default ResponseEntity getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -332,6 +338,7 @@ default ResponseEntity getPetById( ) default ResponseEntity updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -380,9 +387,12 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, + @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name +, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -420,9 +430,12 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/StoreApi.java index d1fa8cce8fd3..0f16fa04dc1a 100644 --- a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/StoreApi.java @@ -68,6 +68,7 @@ default Optional getRequest() { ) default ResponseEntity deleteOrder( @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -139,6 +140,7 @@ default ResponseEntity> getInventory( ) default ResponseEntity getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -189,6 +191,7 @@ default ResponseEntity getOrderById( ) default ResponseEntity placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/UserApi.java index 83476943a427..91d61eb649f3 100644 --- a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/UserApi.java @@ -70,6 +70,7 @@ default Optional getRequest() { ) default ResponseEntity createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -103,6 +104,7 @@ default ResponseEntity createUser( ) default ResponseEntity createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -136,6 +138,7 @@ default ResponseEntity createUsersWithArrayInput( ) default ResponseEntity createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -170,6 +173,7 @@ default ResponseEntity createUsersWithListInput( ) default ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -207,6 +211,7 @@ default ResponseEntity deleteUser( ) default ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -256,8 +261,10 @@ default ResponseEntity getUserByName( produces = { "application/xml", "application/json" } ) default ResponseEntity loginUser( - @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -324,8 +331,10 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username +, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/PetApi.java index 0af891e2abad..c289f73af939 100644 --- a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/PetApi.java @@ -83,6 +83,7 @@ default PetApiDelegate getDelegate() { ) default ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { return getDelegate().addPet(pet); } @@ -114,8 +115,10 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ) { return getDelegate().deletePet(petId, apiKey); } @@ -159,6 +162,7 @@ default ResponseEntity deletePet( ) default ResponseEntity> findPetsByStatus( @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) @Deprecated List status + ) { return getDelegate().findPetsByStatus(status); } @@ -199,6 +203,7 @@ default ResponseEntity> findPetsByStatus( ) default ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List tags + ) { return getDelegate().findPetsByTags(tags); } @@ -238,6 +243,7 @@ default ResponseEntity> findPetsByTags( ) default ResponseEntity getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + ) { return getDelegate().getPetById(petId); } @@ -283,6 +289,7 @@ default ResponseEntity getPetById( ) default ResponseEntity updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { return getDelegate().updatePet(pet); } @@ -316,9 +323,12 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, + @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name +, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status + ) { return getDelegate().updatePetWithForm(petId, name, status); } @@ -355,9 +365,12 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file + ) { return getDelegate().uploadFile(petId, additionalMetadata, file); } diff --git a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/StoreApi.java index ac76512bc9cf..658e680eeea7 100644 --- a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/StoreApi.java @@ -64,6 +64,7 @@ default StoreApiDelegate getDelegate() { ) default ResponseEntity deleteOrder( @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId + ) { return getDelegate().deleteOrder(orderId); } @@ -133,6 +134,7 @@ default ResponseEntity> getInventory( ) default ResponseEntity getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId + ) { return getDelegate().getOrderById(orderId); } @@ -168,6 +170,7 @@ default ResponseEntity getOrderById( ) default ResponseEntity placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order + ) { return getDelegate().placeOrder(order); } diff --git a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/UserApi.java index 0c0da55fac1b..9c0cb644c8ff 100644 --- a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/UserApi.java @@ -66,6 +66,7 @@ default UserApiDelegate getDelegate() { ) default ResponseEntity createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user + ) { return getDelegate().createUser(user); } @@ -98,6 +99,7 @@ default ResponseEntity createUser( ) default ResponseEntity createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { return getDelegate().createUsersWithArrayInput(user); } @@ -130,6 +132,7 @@ default ResponseEntity createUsersWithArrayInput( ) default ResponseEntity createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { return getDelegate().createUsersWithListInput(user); } @@ -163,6 +166,7 @@ default ResponseEntity createUsersWithListInput( ) default ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ) { return getDelegate().deleteUser(username); } @@ -199,6 +203,7 @@ default ResponseEntity deleteUser( ) default ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ) { return getDelegate().getUserByName(username); } @@ -233,8 +238,10 @@ default ResponseEntity getUserByName( produces = { "application/xml", "application/json" } ) default ResponseEntity loginUser( - @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password + ) { return getDelegate().loginUser(username, password); } @@ -299,8 +306,10 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username +, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user + ) { return getDelegate().updateUser(username, user); } diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/AnotherFakeApi.java index dd88d0b35b02..94210e77701b 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -58,7 +58,8 @@ default AnotherFakeApiDelegate getDelegate() { ) @ResponseStatus(HttpStatus.OK) default Mono call123testSpecialTags( - @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono client, + @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono client +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().call123testSpecialTags(client, exchange); diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApi.java index f377d026046d..59e05ef1f954 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApi.java @@ -69,7 +69,8 @@ default FakeApiDelegate getDelegate() { ) @ResponseStatus(HttpStatus.OK) default Mono createXmlItem( - @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody Mono xmlItem, + @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody Mono xmlItem +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().createXmlItem(xmlItem, exchange); @@ -102,7 +103,8 @@ default Mono createXmlItem( ) @ResponseStatus(HttpStatus.OK) default Mono fakeOuterBooleanSerialize( - @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) Mono body, + @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) Mono body +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().fakeOuterBooleanSerialize(body, exchange); @@ -135,7 +137,8 @@ default Mono fakeOuterBooleanSerialize( ) @ResponseStatus(HttpStatus.OK) default Mono fakeOuterCompositeSerialize( - @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) Mono outerComposite, + @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) Mono outerComposite +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().fakeOuterCompositeSerialize(outerComposite, exchange); @@ -168,7 +171,8 @@ default Mono fakeOuterCompositeSerialize( ) @ResponseStatus(HttpStatus.OK) default Mono fakeOuterNumberSerialize( - @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) Mono body, + @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) Mono body +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().fakeOuterNumberSerialize(body, exchange); @@ -201,7 +205,8 @@ default Mono fakeOuterNumberSerialize( ) @ResponseStatus(HttpStatus.OK) default Mono fakeOuterStringSerialize( - @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) Mono body, + @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) Mono body +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().fakeOuterStringSerialize(body, exchange); @@ -232,7 +237,8 @@ default Mono fakeOuterStringSerialize( ) @ResponseStatus(HttpStatus.OK) default Mono responseObjectDifferentNames( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().responseObjectDifferentNames(petId, exchange); @@ -263,7 +269,8 @@ default Mono responseObjectDifferentNames ) @ResponseStatus(HttpStatus.OK) default Mono testBodyWithFileSchema( - @ApiParam(value = "", required = true) @Valid @RequestBody Mono fileSchemaTestClass, + @ApiParam(value = "", required = true) @Valid @RequestBody Mono fileSchemaTestClass +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().testBodyWithFileSchema(fileSchemaTestClass, exchange); @@ -294,8 +301,10 @@ default Mono testBodyWithFileSchema( ) @ResponseStatus(HttpStatus.OK) default Mono testBodyWithQueryParams( - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, - @ApiParam(value = "", required = true) @Valid @RequestBody Mono user, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query +, + @ApiParam(value = "", required = true) @Valid @RequestBody Mono user +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().testBodyWithQueryParams(query, user, exchange); @@ -328,7 +337,8 @@ default Mono testBodyWithQueryParams( ) @ResponseStatus(HttpStatus.OK) default Mono testClientModel( - @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono client, + @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono client +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().testClientModel(client, exchange); @@ -377,20 +387,34 @@ default Mono testClientModel( ) @ResponseStatus(HttpStatus.BAD_REQUEST) default Mono testEndpointParameters( - @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestPart(value = "number", required = true) BigDecimal number, - @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestPart(value = "double", required = true) Double _double, - @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestPart(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @ApiParam(value = "None", required = true) @Valid @RequestPart(value = "byte", required = true) byte[] _byte, - @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestPart(value = "integer", required = false) Integer integer, - @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestPart(value = "int32", required = false) Integer int32, - @ApiParam(value = "None") @Valid @RequestPart(value = "int64", required = false) Long int64, - @ApiParam(value = "None") @DecimalMax(value = "987.6") @Valid @RequestPart(value = "float", required = false) Float _float, - @ApiParam(value = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestPart(value = "string", required = false) String string, - @ApiParam(value = "None") @RequestPart(value = "binary", required = false) Part binary, - @ApiParam(value = "None") @Valid @RequestPart(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @ApiParam(value = "None") @Valid @RequestPart(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, - @ApiParam(value = "None") @Size(min = 10, max = 64) @Valid @RequestPart(value = "password", required = false) String password, - @ApiParam(value = "None") @Valid @RequestPart(value = "callback", required = false) String paramCallback, + @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestPart(value = "number", required = true) BigDecimal number +, + @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestPart(value = "double", required = true) Double _double +, + @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestPart(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter +, + @ApiParam(value = "None", required = true) @Valid @RequestPart(value = "byte", required = true) byte[] _byte +, + @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestPart(value = "integer", required = false) Integer integer +, + @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestPart(value = "int32", required = false) Integer int32 +, + @ApiParam(value = "None") @Valid @RequestPart(value = "int64", required = false) Long int64 +, + @ApiParam(value = "None") @DecimalMax(value = "987.6") @Valid @RequestPart(value = "float", required = false) Float _float +, + @ApiParam(value = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestPart(value = "string", required = false) String string +, + @ApiParam(value = "None") @RequestPart(value = "binary", required = false) Part binary +, + @ApiParam(value = "None") @Valid @RequestPart(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date +, + @ApiParam(value = "None") @Valid @RequestPart(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime +, + @ApiParam(value = "None") @Size(min = 10, max = 64) @Valid @RequestPart(value = "password", required = false) String password +, + @ApiParam(value = "None") @Valid @RequestPart(value = "callback", required = false) String paramCallback +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, exchange); @@ -430,14 +454,22 @@ default Mono testEndpointParameters( ) @ResponseStatus(HttpStatus.BAD_REQUEST) default Mono testEnumParameters( - @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, - @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, - @ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray, - @ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString, - @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, - @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1.1, -1.2") @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, - @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestPart(value = "enum_form_string", required = false) String enumFormString, + @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray +, + @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString +, + @ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray +, + @ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString +, + @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger +, + @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1.1, -1.2") @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble +, + @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false, defaultValue = "$") List enumFormStringArray +, + @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestPart(value = "enum_form_string", required = false, defaultValue = "-efg") String enumFormString +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, exchange); @@ -472,12 +504,18 @@ default Mono testEnumParameters( ) @ResponseStatus(HttpStatus.BAD_REQUEST) default Mono testGroupParameters( - @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, - @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, - @NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group, - @ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup, - @ApiParam(value = "Boolean in group parameters") @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup, - @ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group, + @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup +, + @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup +, + @NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group +, + @ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup +, + @ApiParam(value = "Boolean in group parameters") @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup +, + @ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, exchange); @@ -508,7 +546,8 @@ default Mono testGroupParameters( ) @ResponseStatus(HttpStatus.OK) default Mono testInlineAdditionalProperties( - @ApiParam(value = "request body", required = true) @Valid @RequestBody Mono> requestBody, + @ApiParam(value = "request body", required = true) @Valid @RequestBody Mono> requestBody +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().testInlineAdditionalProperties(requestBody, exchange); @@ -540,8 +579,10 @@ default Mono testInlineAdditionalProperties( ) @ResponseStatus(HttpStatus.OK) default Mono testJsonFormData( - @ApiParam(value = "field1", required = true) @Valid @RequestPart(value = "param", required = true) String param, - @ApiParam(value = "field2", required = true) @Valid @RequestPart(value = "param2", required = true) String param2, + @ApiParam(value = "field1", required = true) @Valid @RequestPart(value = "param", required = true) String param +, + @ApiParam(value = "field2", required = true) @Valid @RequestPart(value = "param2", required = true) String param2 +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().testJsonFormData(param, param2, exchange); @@ -572,7 +613,8 @@ default Mono testJsonFormData( ) @ResponseStatus(HttpStatus.OK) default Mono testNullable( - @ApiParam(value = "request body", required = true) @Valid @RequestBody Mono childWithNullable, + @ApiParam(value = "request body", required = true) @Valid @RequestBody Mono childWithNullable +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().testNullable(childWithNullable, exchange); @@ -605,10 +647,14 @@ default Mono testNullable( ) @ResponseStatus(HttpStatus.OK) default Mono testQueryParameterCollectionFormat( - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context, exchange); @@ -679,9 +725,12 @@ default Mono testWithResultExample( ) @ResponseStatus(HttpStatus.OK) default Mono uploadFileWithRequiredFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) Part requiredFile, - @ApiParam(value = "Additional data to pass to server") @Valid @RequestPart(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) Part requiredFile +, + @ApiParam(value = "Additional data to pass to server") @Valid @RequestPart(value = "additionalMetadata", required = false) String additionalMetadata +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata, exchange); diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 2d133ee57b59..cca729e3b92d 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -61,7 +61,8 @@ default FakeClassnameTestApiDelegate getDelegate() { ) @ResponseStatus(HttpStatus.OK) default Mono testClassname( - @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono client, + @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono client +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().testClassname(client, exchange); diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/PetApi.java index 547542ecf61c..1324e6ea99a4 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/PetApi.java @@ -67,7 +67,8 @@ default PetApiDelegate getDelegate() { ) @ResponseStatus(HttpStatus.OK) default Mono addPet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Mono pet, + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Mono pet +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().addPet(pet, exchange); @@ -106,8 +107,10 @@ default Mono addPet( ) @ResponseStatus(HttpStatus.OK) default Mono deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey, + @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().deletePet(petId, apiKey, exchange); @@ -148,7 +151,8 @@ default Mono deletePet( ) @ResponseStatus(HttpStatus.OK) default Flux findPetsByStatus( - @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status, + @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().findPetsByStatus(status, exchange); @@ -191,7 +195,8 @@ default Flux findPetsByStatus( ) @ResponseStatus(HttpStatus.OK) default Flux findPetsByTags( - @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags, + @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().findPetsByTags(tags, exchange); @@ -230,7 +235,8 @@ default Flux findPetsByTags( ) @ResponseStatus(HttpStatus.OK) default Mono getPetById( - @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId, + @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().getPetById(petId, exchange); @@ -273,7 +279,8 @@ default Mono getPetById( ) @ResponseStatus(HttpStatus.OK) default Mono updatePet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Mono pet, + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Mono pet +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().updatePet(pet, exchange); @@ -312,9 +319,12 @@ default Mono updatePet( ) @ResponseStatus(HttpStatus.METHOD_NOT_ALLOWED) default Mono updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Updated name of the pet") @Valid @RequestPart(value = "name", required = false) String name, - @ApiParam(value = "Updated status of the pet") @Valid @RequestPart(value = "status", required = false) String status, + @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Updated name of the pet") @Valid @RequestPart(value = "name", required = false) String name +, + @ApiParam(value = "Updated status of the pet") @Valid @RequestPart(value = "status", required = false) String status +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().updatePetWithForm(petId, name, status, exchange); @@ -355,9 +365,12 @@ default Mono updatePetWithForm( ) @ResponseStatus(HttpStatus.OK) default Mono uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Additional data to pass to server") @Valid @RequestPart(value = "additionalMetadata", required = false) String additionalMetadata, - @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) Part file, + @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Additional data to pass to server") @Valid @RequestPart(value = "additionalMetadata", required = false) String additionalMetadata +, + @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) Part file +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().uploadFile(petId, additionalMetadata, file, exchange); diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/StoreApi.java index 308210ebe71b..b1b506fb95f0 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/StoreApi.java @@ -58,7 +58,8 @@ default StoreApiDelegate getDelegate() { ) @ResponseStatus(HttpStatus.BAD_REQUEST) default Mono deleteOrder( - @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId, + @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().deleteOrder(orderId, exchange); @@ -128,7 +129,8 @@ default Mono> getInventory( ) @ResponseStatus(HttpStatus.OK) default Mono getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId, + @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().getOrderById(orderId, exchange); @@ -163,7 +165,8 @@ default Mono getOrderById( ) @ResponseStatus(HttpStatus.OK) default Mono placeOrder( - @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Mono order, + @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Mono order +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().placeOrder(order, exchange); diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/UserApi.java index 7f555ec7879a..7c55f6b40629 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/UserApi.java @@ -57,7 +57,8 @@ default UserApiDelegate getDelegate() { ) @ResponseStatus(HttpStatus.OK) default Mono createUser( - @ApiParam(value = "Created user object", required = true) @Valid @RequestBody Mono user, + @ApiParam(value = "Created user object", required = true) @Valid @RequestBody Mono user +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().createUser(user, exchange); @@ -88,7 +89,8 @@ default Mono createUser( ) @ResponseStatus(HttpStatus.OK) default Mono createUsersWithArrayInput( - @ApiParam(value = "List of user object", required = true) @Valid @RequestBody Flux user, + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody Flux user +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().createUsersWithArrayInput(user, exchange); @@ -119,7 +121,8 @@ default Mono createUsersWithArrayInput( ) @ResponseStatus(HttpStatus.OK) default Mono createUsersWithListInput( - @ApiParam(value = "List of user object", required = true) @Valid @RequestBody Flux user, + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody Flux user +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().createUsersWithListInput(user, exchange); @@ -151,7 +154,8 @@ default Mono createUsersWithListInput( ) @ResponseStatus(HttpStatus.BAD_REQUEST) default Mono deleteUser( - @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username, + @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().deleteUser(username, exchange); @@ -187,7 +191,8 @@ default Mono deleteUser( ) @ResponseStatus(HttpStatus.OK) default Mono getUserByName( - @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username, + @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().getUserByName(username, exchange); @@ -222,8 +227,10 @@ default Mono getUserByName( ) @ResponseStatus(HttpStatus.OK) default Mono loginUser( - @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, - @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password, + @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username +, + @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().loginUser(username, password, exchange); @@ -285,8 +292,10 @@ default Mono logoutUser( ) @ResponseStatus(HttpStatus.BAD_REQUEST) default Mono updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, - @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody Mono user, + @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username +, + @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody Mono user +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().updateUser(username, user, exchange); diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java index 4a11e4b54aeb..d4fa67403d8c 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -57,7 +57,8 @@ default AnotherFakeApiDelegate getDelegate() { consumes = { "application/json" } ) default Mono> call123testSpecialTags( - @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono client, + @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono client +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().call123testSpecialTags(client, exchange); diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java index f40c08d099ec..050c7b7cd032 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java @@ -68,7 +68,8 @@ default FakeApiDelegate getDelegate() { consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) default Mono> createXmlItem( - @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody Mono xmlItem, + @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody Mono xmlItem +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().createXmlItem(xmlItem, exchange); @@ -100,7 +101,8 @@ default Mono> createXmlItem( consumes = { "application/json" } ) default Mono> fakeOuterBooleanSerialize( - @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) Mono body, + @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) Mono body +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().fakeOuterBooleanSerialize(body, exchange); @@ -132,7 +134,8 @@ default Mono> fakeOuterBooleanSerialize( consumes = { "application/json" } ) default Mono> fakeOuterCompositeSerialize( - @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) Mono outerComposite, + @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) Mono outerComposite +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().fakeOuterCompositeSerialize(outerComposite, exchange); @@ -164,7 +167,8 @@ default Mono> fakeOuterCompositeSerialize( consumes = { "application/json" } ) default Mono> fakeOuterNumberSerialize( - @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) Mono body, + @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) Mono body +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().fakeOuterNumberSerialize(body, exchange); @@ -196,7 +200,8 @@ default Mono> fakeOuterNumberSerialize( consumes = { "application/json" } ) default Mono> fakeOuterStringSerialize( - @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) Mono body, + @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) Mono body +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().fakeOuterStringSerialize(body, exchange); @@ -226,7 +231,8 @@ default Mono> fakeOuterStringSerialize( produces = { "application/json" } ) default Mono> responseObjectDifferentNames( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().responseObjectDifferentNames(petId, exchange); @@ -256,7 +262,8 @@ default Mono> responseObje consumes = { "application/json" } ) default Mono> testBodyWithFileSchema( - @ApiParam(value = "", required = true) @Valid @RequestBody Mono fileSchemaTestClass, + @ApiParam(value = "", required = true) @Valid @RequestBody Mono fileSchemaTestClass +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().testBodyWithFileSchema(fileSchemaTestClass, exchange); @@ -286,8 +293,10 @@ default Mono> testBodyWithFileSchema( consumes = { "application/json" } ) default Mono> testBodyWithQueryParams( - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, - @ApiParam(value = "", required = true) @Valid @RequestBody Mono user, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query +, + @ApiParam(value = "", required = true) @Valid @RequestBody Mono user +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().testBodyWithQueryParams(query, user, exchange); @@ -319,7 +328,8 @@ default Mono> testBodyWithQueryParams( consumes = { "application/json" } ) default Mono> testClientModel( - @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono client, + @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono client +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().testClientModel(client, exchange); @@ -367,20 +377,34 @@ default Mono> testClientModel( consumes = { "application/x-www-form-urlencoded" } ) default Mono> testEndpointParameters( - @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestPart(value = "number", required = true) BigDecimal number, - @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestPart(value = "double", required = true) Double _double, - @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestPart(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @ApiParam(value = "None", required = true) @Valid @RequestPart(value = "byte", required = true) byte[] _byte, - @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestPart(value = "integer", required = false) Integer integer, - @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestPart(value = "int32", required = false) Integer int32, - @ApiParam(value = "None") @Valid @RequestPart(value = "int64", required = false) Long int64, - @ApiParam(value = "None") @DecimalMax(value = "987.6") @Valid @RequestPart(value = "float", required = false) Float _float, - @ApiParam(value = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestPart(value = "string", required = false) String string, - @ApiParam(value = "None") @RequestPart(value = "binary", required = false) Part binary, - @ApiParam(value = "None") @Valid @RequestPart(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @ApiParam(value = "None") @Valid @RequestPart(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, - @ApiParam(value = "None") @Size(min = 10, max = 64) @Valid @RequestPart(value = "password", required = false) String password, - @ApiParam(value = "None") @Valid @RequestPart(value = "callback", required = false) String paramCallback, + @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestPart(value = "number", required = true) BigDecimal number +, + @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestPart(value = "double", required = true) Double _double +, + @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestPart(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter +, + @ApiParam(value = "None", required = true) @Valid @RequestPart(value = "byte", required = true) byte[] _byte +, + @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestPart(value = "integer", required = false) Integer integer +, + @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestPart(value = "int32", required = false) Integer int32 +, + @ApiParam(value = "None") @Valid @RequestPart(value = "int64", required = false) Long int64 +, + @ApiParam(value = "None") @DecimalMax(value = "987.6") @Valid @RequestPart(value = "float", required = false) Float _float +, + @ApiParam(value = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestPart(value = "string", required = false) String string +, + @ApiParam(value = "None") @RequestPart(value = "binary", required = false) Part binary +, + @ApiParam(value = "None") @Valid @RequestPart(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date +, + @ApiParam(value = "None") @Valid @RequestPart(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime +, + @ApiParam(value = "None") @Size(min = 10, max = 64) @Valid @RequestPart(value = "password", required = false) String password +, + @ApiParam(value = "None") @Valid @RequestPart(value = "callback", required = false) String paramCallback +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, exchange); @@ -419,14 +443,22 @@ default Mono> testEndpointParameters( consumes = { "application/x-www-form-urlencoded" } ) default Mono> testEnumParameters( - @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, - @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, - @ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray, - @ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString, - @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, - @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1.1, -1.2") @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, - @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestPart(value = "enum_form_string", required = false) String enumFormString, + @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray +, + @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString +, + @ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray +, + @ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString +, + @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger +, + @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1.1, -1.2") @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble +, + @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false, defaultValue = "$") List enumFormStringArray +, + @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestPart(value = "enum_form_string", required = false, defaultValue = "-efg") String enumFormString +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, exchange); @@ -460,12 +492,18 @@ default Mono> testEnumParameters( value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) default Mono> testGroupParameters( - @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, - @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, - @NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group, - @ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup, - @ApiParam(value = "Boolean in group parameters") @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup, - @ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group, + @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup +, + @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup +, + @NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group +, + @ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup +, + @ApiParam(value = "Boolean in group parameters") @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup +, + @ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, exchange); @@ -495,7 +533,8 @@ default Mono> testGroupParameters( consumes = { "application/json" } ) default Mono> testInlineAdditionalProperties( - @ApiParam(value = "request body", required = true) @Valid @RequestBody Mono> requestBody, + @ApiParam(value = "request body", required = true) @Valid @RequestBody Mono> requestBody +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().testInlineAdditionalProperties(requestBody, exchange); @@ -526,8 +565,10 @@ default Mono> testInlineAdditionalProperties( consumes = { "application/x-www-form-urlencoded" } ) default Mono> testJsonFormData( - @ApiParam(value = "field1", required = true) @Valid @RequestPart(value = "param", required = true) String param, - @ApiParam(value = "field2", required = true) @Valid @RequestPart(value = "param2", required = true) String param2, + @ApiParam(value = "field1", required = true) @Valid @RequestPart(value = "param", required = true) String param +, + @ApiParam(value = "field2", required = true) @Valid @RequestPart(value = "param2", required = true) String param2 +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().testJsonFormData(param, param2, exchange); @@ -557,7 +598,8 @@ default Mono> testJsonFormData( consumes = { "application/json" } ) default Mono> testNullable( - @ApiParam(value = "request body", required = true) @Valid @RequestBody Mono childWithNullable, + @ApiParam(value = "request body", required = true) @Valid @RequestBody Mono childWithNullable +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().testNullable(childWithNullable, exchange); @@ -589,10 +631,14 @@ default Mono> testNullable( value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) default Mono> testQueryParameterCollectionFormat( - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context, exchange); @@ -661,9 +707,12 @@ default Mono> testWithResultExample( consumes = { "multipart/form-data" } ) default Mono> uploadFileWithRequiredFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) Part requiredFile, - @ApiParam(value = "Additional data to pass to server") @Valid @RequestPart(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) Part requiredFile +, + @ApiParam(value = "Additional data to pass to server") @Valid @RequestPart(value = "additionalMetadata", required = false) String additionalMetadata +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata, exchange); diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index dfd2cda103ca..9a12c7606a2f 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -60,7 +60,8 @@ default FakeClassnameTestApiDelegate getDelegate() { consumes = { "application/json" } ) default Mono> testClassname( - @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono client, + @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono client +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().testClassname(client, exchange); diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java index b8d65e05c850..c8bfc0717a19 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java @@ -66,7 +66,8 @@ default PetApiDelegate getDelegate() { consumes = { "application/json", "application/xml" } ) default Mono> addPet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Mono pet, + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Mono pet +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().addPet(pet, exchange); @@ -104,8 +105,10 @@ default Mono> addPet( value = PetApi.PATH_DELETE_PET ) default Mono> deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey, + @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().deletePet(petId, apiKey, exchange); @@ -145,7 +148,8 @@ default Mono> deletePet( produces = { "application/xml", "application/json" } ) default Mono>> findPetsByStatus( - @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status, + @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().findPetsByStatus(status, exchange); @@ -187,7 +191,8 @@ default Mono>> findPetsByStatus( produces = { "application/xml", "application/json" } ) default Mono>> findPetsByTags( - @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags, + @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().findPetsByTags(tags, exchange); @@ -225,7 +230,8 @@ default Mono>> findPetsByTags( produces = { "application/xml", "application/json" } ) default Mono> getPetById( - @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId, + @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().getPetById(petId, exchange); @@ -267,7 +273,8 @@ default Mono> getPetById( consumes = { "application/json", "application/xml" } ) default Mono> updatePet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Mono pet, + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Mono pet +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().updatePet(pet, exchange); @@ -305,9 +312,12 @@ default Mono> updatePet( consumes = { "application/x-www-form-urlencoded" } ) default Mono> updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Updated name of the pet") @Valid @RequestPart(value = "name", required = false) String name, - @ApiParam(value = "Updated status of the pet") @Valid @RequestPart(value = "status", required = false) String status, + @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Updated name of the pet") @Valid @RequestPart(value = "name", required = false) String name +, + @ApiParam(value = "Updated status of the pet") @Valid @RequestPart(value = "status", required = false) String status +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().updatePetWithForm(petId, name, status, exchange); @@ -347,9 +357,12 @@ default Mono> updatePetWithForm( consumes = { "multipart/form-data" } ) default Mono> uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Additional data to pass to server") @Valid @RequestPart(value = "additionalMetadata", required = false) String additionalMetadata, - @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) Part file, + @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Additional data to pass to server") @Valid @RequestPart(value = "additionalMetadata", required = false) String additionalMetadata +, + @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) Part file +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().uploadFile(petId, additionalMetadata, file, exchange); diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java index 629da94e0b66..7cd15864635b 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java @@ -57,7 +57,8 @@ default StoreApiDelegate getDelegate() { value = StoreApi.PATH_DELETE_ORDER ) default Mono> deleteOrder( - @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId, + @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().deleteOrder(orderId, exchange); @@ -125,7 +126,8 @@ default Mono>> getInventory( produces = { "application/xml", "application/json" } ) default Mono> getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId, + @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().getOrderById(orderId, exchange); @@ -159,7 +161,8 @@ default Mono> getOrderById( consumes = { "application/json" } ) default Mono> placeOrder( - @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Mono order, + @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Mono order +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().placeOrder(order, exchange); diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java index b1b00df3bf7a..4cba94dc94e9 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java @@ -56,7 +56,8 @@ default UserApiDelegate getDelegate() { consumes = { "application/json" } ) default Mono> createUser( - @ApiParam(value = "Created user object", required = true) @Valid @RequestBody Mono user, + @ApiParam(value = "Created user object", required = true) @Valid @RequestBody Mono user +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().createUser(user, exchange); @@ -86,7 +87,8 @@ default Mono> createUser( consumes = { "application/json" } ) default Mono> createUsersWithArrayInput( - @ApiParam(value = "List of user object", required = true) @Valid @RequestBody Flux user, + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody Flux user +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().createUsersWithArrayInput(user, exchange); @@ -116,7 +118,8 @@ default Mono> createUsersWithArrayInput( consumes = { "application/json" } ) default Mono> createUsersWithListInput( - @ApiParam(value = "List of user object", required = true) @Valid @RequestBody Flux user, + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody Flux user +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().createUsersWithListInput(user, exchange); @@ -147,7 +150,8 @@ default Mono> createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) default Mono> deleteUser( - @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username, + @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().deleteUser(username, exchange); @@ -182,7 +186,8 @@ default Mono> deleteUser( produces = { "application/xml", "application/json" } ) default Mono> getUserByName( - @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username, + @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().getUserByName(username, exchange); @@ -216,8 +221,10 @@ default Mono> getUserByName( produces = { "application/xml", "application/json" } ) default Mono> loginUser( - @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, - @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password, + @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username +, + @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().loginUser(username, password, exchange); @@ -277,8 +284,10 @@ default Mono> logoutUser( consumes = { "application/json" } ) default Mono> updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, - @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody Mono user, + @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username +, + @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody Mono user +, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().updateUser(username, user, exchange); diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java index 29547268309e..33282f4fda36 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -53,6 +53,7 @@ default AnotherFakeApiDelegate getDelegate() { ) default ResponseEntity call123testSpecialTags( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body + ) { return getDelegate().call123testSpecialTags(body); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java index 32bfade00a83..2e5a5425c4f6 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -62,6 +62,7 @@ default FakeApiDelegate getDelegate() { ) default ResponseEntity createXmlItem( @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem + ) { return getDelegate().createXmlItem(xmlItem); } @@ -92,6 +93,7 @@ default ResponseEntity createXmlItem( ) default ResponseEntity fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body + ) { return getDelegate().fakeOuterBooleanSerialize(body); } @@ -122,6 +124,7 @@ default ResponseEntity fakeOuterBooleanSerialize( ) default ResponseEntity fakeOuterCompositeSerialize( @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite body + ) { return getDelegate().fakeOuterCompositeSerialize(body); } @@ -152,6 +155,7 @@ default ResponseEntity fakeOuterCompositeSerialize( ) default ResponseEntity fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body + ) { return getDelegate().fakeOuterNumberSerialize(body); } @@ -182,6 +186,7 @@ default ResponseEntity fakeOuterNumberSerialize( ) default ResponseEntity fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body + ) { return getDelegate().fakeOuterStringSerialize(body); } @@ -211,6 +216,7 @@ default ResponseEntity fakeOuterStringSerialize( ) default ResponseEntity testBodyWithFileSchema( @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass body + ) { return getDelegate().testBodyWithFileSchema(body); } @@ -239,8 +245,10 @@ default ResponseEntity testBodyWithFileSchema( consumes = { "application/json" } ) default ResponseEntity testBodyWithQueryParams( - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query +, @ApiParam(value = "", required = true) @Valid @RequestBody User body + ) { return getDelegate().testBodyWithQueryParams(query, body); } @@ -272,6 +280,7 @@ default ResponseEntity testBodyWithQueryParams( ) default ResponseEntity testClientModel( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body + ) { return getDelegate().testClientModel(body); } @@ -318,20 +327,34 @@ default ResponseEntity testClientModel( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEndpointParameters( - @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, - @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer, - @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32, - @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, - @ApiParam(value = "None") @DecimalMax(value = "987.6") @Valid @RequestParam(value = "float", required = false) Float _float, - @ApiParam(value = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestParam(value = "string", required = false) String string, - @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary, - @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, - @ApiParam(value = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password, + @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number +, + @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double +, + @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter +, + @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte +, + @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer +, + @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32 +, + @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64 +, + @ApiParam(value = "None") @DecimalMax(value = "987.6") @Valid @RequestParam(value = "float", required = false) Float _float +, + @ApiParam(value = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestParam(value = "string", required = false) String string +, + @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary +, + @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date +, + @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime +, + @ApiParam(value = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password +, @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback + ) { return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); } @@ -369,14 +392,22 @@ default ResponseEntity testEndpointParameters( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEnumParameters( - @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, - @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, - @ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray, - @ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString, - @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, - @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1.1, -1.2") @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, - @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_form_string", required = false) String enumFormString + @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray +, + @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString +, + @ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray +, + @ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString +, + @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger +, + @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1.1, -1.2") @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble +, + @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false, defaultValue = "$") List enumFormStringArray +, + @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_form_string", required = false, defaultValue = "-efg") String enumFormString + ) { return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); } @@ -409,12 +440,18 @@ default ResponseEntity testEnumParameters( value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) default ResponseEntity testGroupParameters( - @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, - @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, - @NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group, - @ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup, - @ApiParam(value = "Boolean in group parameters") @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup, + @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup +, + @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup +, + @NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group +, + @ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup +, + @ApiParam(value = "Boolean in group parameters") @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup +, @ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group + ) { return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); } @@ -443,6 +480,7 @@ default ResponseEntity testGroupParameters( ) default ResponseEntity testInlineAdditionalProperties( @ApiParam(value = "request body", required = true) @Valid @RequestBody Map param + ) { return getDelegate().testInlineAdditionalProperties(param); } @@ -471,8 +509,10 @@ default ResponseEntity testInlineAdditionalProperties( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testJsonFormData( - @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, + @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param +, @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 + ) { return getDelegate().testJsonFormData(param, param2); } @@ -504,11 +544,16 @@ default ResponseEntity testJsonFormData( value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) default ResponseEntity testQueryParameterCollectionFormat( - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url +, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context + ) { return getDelegate().testQueryParameterCollectionFormat(pipe, ioutil, http, url, context); } @@ -546,9 +591,12 @@ default ResponseEntity testQueryParameterCollectionFormat( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFileWithRequiredFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, + @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile +, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata + ) { return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 7413d46f5fac..0fdca5519b53 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -56,6 +56,7 @@ default FakeClassnameTestApiDelegate getDelegate() { ) default ResponseEntity testClassname( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body + ) { return getDelegate().testClassname(body); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java index 1449bfce5cc5..8b02465fa354 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java @@ -62,6 +62,7 @@ default PetApiDelegate getDelegate() { ) default ResponseEntity addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + ) { return getDelegate().addPet(body); } @@ -97,8 +98,10 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, + @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId +, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ) { return getDelegate().deletePet(petId, apiKey); } @@ -137,7 +140,8 @@ default ResponseEntity deletePet( produces = { "application/xml", "application/json" } ) default ResponseEntity> findPetsByStatus( - @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status, + @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status +, @ApiIgnore final Pageable pageable ) { return getDelegate().findPetsByStatus(status, pageable); @@ -180,8 +184,10 @@ default ResponseEntity> findPetsByStatus( produces = { "application/xml", "application/json" } ) default ResponseEntity> findPetsByTags( - @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags, - @ApiParam(value = "A test HeaderParam for issue #8315 - must NOT be removed when x-spring-paginated:true is used.") @RequestHeader(value = "size", required = false) @Nullable String size, + @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags +, + @ApiParam(value = "A test HeaderParam for issue #8315 - must NOT be removed when x-spring-paginated:true is used.") @RequestHeader(value = "size", required = false) @Nullable String size +, @ApiIgnore final Pageable pageable ) { return getDelegate().findPetsByTags(tags, size, pageable); @@ -220,6 +226,7 @@ default ResponseEntity> findPetsByTags( ) default ResponseEntity getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId + ) { return getDelegate().getPetById(petId); } @@ -297,6 +304,7 @@ default ResponseEntity> listAllPets( ) default ResponseEntity updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + ) { return getDelegate().updatePet(body); } @@ -332,9 +340,12 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, + @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name +, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status + ) { return getDelegate().updatePetWithForm(petId, name, status); } @@ -372,9 +383,12 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file + ) { return getDelegate().uploadFile(petId, additionalMetadata, file); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java index f089fb34f2e9..342041904ce1 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -53,6 +53,7 @@ default StoreApiDelegate getDelegate() { ) default ResponseEntity deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId + ) { return getDelegate().deleteOrder(orderId); } @@ -120,6 +121,7 @@ default ResponseEntity> getInventory( ) default ResponseEntity getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId + ) { return getDelegate().getOrderById(orderId); } @@ -151,6 +153,7 @@ default ResponseEntity getOrderById( ) default ResponseEntity placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body + ) { return getDelegate().placeOrder(body); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java index edef662bbd5d..0a6a0820927d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java @@ -51,6 +51,7 @@ default UserApiDelegate getDelegate() { ) default ResponseEntity createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User body + ) { return getDelegate().createUser(body); } @@ -78,6 +79,7 @@ default ResponseEntity createUser( ) default ResponseEntity createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body + ) { return getDelegate().createUsersWithArrayInput(body); } @@ -105,6 +107,7 @@ default ResponseEntity createUsersWithArrayInput( ) default ResponseEntity createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body + ) { return getDelegate().createUsersWithListInput(body); } @@ -135,6 +138,7 @@ default ResponseEntity createUsersWithListInput( ) default ResponseEntity deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username + ) { return getDelegate().deleteUser(username); } @@ -168,6 +172,7 @@ default ResponseEntity deleteUser( ) default ResponseEntity getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username + ) { return getDelegate().getUserByName(username); } @@ -199,8 +204,10 @@ default ResponseEntity getUserByName( produces = { "application/xml", "application/json" } ) default ResponseEntity loginUser( - @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password + ) { return getDelegate().loginUser(username, password); } @@ -257,8 +264,10 @@ default ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER ) default ResponseEntity updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username +, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User body + ) { return getDelegate().updateUser(username, body); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/VersioningApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/VersioningApi.java index c05660c21c36..fb21739449ee 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/VersioningApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/VersioningApi.java @@ -53,9 +53,12 @@ default VersioningApiDelegate getDelegate() { headers = { "VersionWithDefaultValue=V1", "VersionNoDefaultValue" } ) default ResponseEntity versioningHeaders( - @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @RequestHeader(value = "VersionWithDefaultValue", required = true, defaultValue = "V1") String versionWithDefaultValue, - @NotNull @ApiParam(value = "", required = true) @RequestHeader(value = "VersionNoDefaultValue", required = true) String versionNoDefaultValue, + @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @RequestHeader(value = "VersionWithDefaultValue", required = true, defaultValue = "V1") String versionWithDefaultValue +, + @NotNull @ApiParam(value = "", required = true) @RequestHeader(value = "VersionNoDefaultValue", required = true) String versionNoDefaultValue +, @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + ) { return getDelegate().versioningHeaders(versionWithDefaultValue, versionNoDefaultValue, petId); } @@ -90,11 +93,16 @@ default ResponseEntity versioningHeaders( params = { "VersionWithDefaultValueQuery=V1", "VersionNoDefaultValueQuery" } ) default ResponseEntity versioningMix( - @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @Valid @RequestParam(value = "VersionWithDefaultValueQuery", required = true, defaultValue = "V1") String versionWithDefaultValueQuery, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "VersionNoDefaultValueQuery", required = true) String versionNoDefaultValueQuery, - @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @RequestHeader(value = "VersionWithDefaultValueHeader", required = true, defaultValue = "V1") String versionWithDefaultValueHeader, - @NotNull @ApiParam(value = "", required = true) @RequestHeader(value = "VersionNoDefaultValueHeader", required = true) String versionNoDefaultValueHeader, + @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @Valid @RequestParam(value = "VersionWithDefaultValueQuery", required = true, defaultValue = "V1") String versionWithDefaultValueQuery +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "VersionNoDefaultValueQuery", required = true) String versionNoDefaultValueQuery +, + @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @RequestHeader(value = "VersionWithDefaultValueHeader", required = true, defaultValue = "V1") String versionWithDefaultValueHeader +, + @NotNull @ApiParam(value = "", required = true) @RequestHeader(value = "VersionNoDefaultValueHeader", required = true) String versionNoDefaultValueHeader +, @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + ) { return getDelegate().versioningMix(versionWithDefaultValueQuery, versionNoDefaultValueQuery, versionWithDefaultValueHeader, versionNoDefaultValueHeader, petId); } @@ -126,9 +134,12 @@ default ResponseEntity versioningMix( params = { "VersionWithDefaultValue=V1", "VersionNoDefaultValue" } ) default ResponseEntity versioningQueryParams( - @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @Valid @RequestParam(value = "VersionWithDefaultValue", required = true, defaultValue = "V1") String versionWithDefaultValue, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "VersionNoDefaultValue", required = true) String versionNoDefaultValue, + @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @Valid @RequestParam(value = "VersionWithDefaultValue", required = true, defaultValue = "V1") String versionWithDefaultValue +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "VersionNoDefaultValue", required = true) String versionNoDefaultValue +, @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + ) { return getDelegate().versioningQueryParams(versionWithDefaultValue, versionNoDefaultValue, petId); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java index 29547268309e..33282f4fda36 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -53,6 +53,7 @@ default AnotherFakeApiDelegate getDelegate() { ) default ResponseEntity call123testSpecialTags( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body + ) { return getDelegate().call123testSpecialTags(body); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java index 32bfade00a83..2e5a5425c4f6 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java @@ -62,6 +62,7 @@ default FakeApiDelegate getDelegate() { ) default ResponseEntity createXmlItem( @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem + ) { return getDelegate().createXmlItem(xmlItem); } @@ -92,6 +93,7 @@ default ResponseEntity createXmlItem( ) default ResponseEntity fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body + ) { return getDelegate().fakeOuterBooleanSerialize(body); } @@ -122,6 +124,7 @@ default ResponseEntity fakeOuterBooleanSerialize( ) default ResponseEntity fakeOuterCompositeSerialize( @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite body + ) { return getDelegate().fakeOuterCompositeSerialize(body); } @@ -152,6 +155,7 @@ default ResponseEntity fakeOuterCompositeSerialize( ) default ResponseEntity fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body + ) { return getDelegate().fakeOuterNumberSerialize(body); } @@ -182,6 +186,7 @@ default ResponseEntity fakeOuterNumberSerialize( ) default ResponseEntity fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body + ) { return getDelegate().fakeOuterStringSerialize(body); } @@ -211,6 +216,7 @@ default ResponseEntity fakeOuterStringSerialize( ) default ResponseEntity testBodyWithFileSchema( @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass body + ) { return getDelegate().testBodyWithFileSchema(body); } @@ -239,8 +245,10 @@ default ResponseEntity testBodyWithFileSchema( consumes = { "application/json" } ) default ResponseEntity testBodyWithQueryParams( - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query +, @ApiParam(value = "", required = true) @Valid @RequestBody User body + ) { return getDelegate().testBodyWithQueryParams(query, body); } @@ -272,6 +280,7 @@ default ResponseEntity testBodyWithQueryParams( ) default ResponseEntity testClientModel( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body + ) { return getDelegate().testClientModel(body); } @@ -318,20 +327,34 @@ default ResponseEntity testClientModel( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEndpointParameters( - @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, - @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer, - @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32, - @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, - @ApiParam(value = "None") @DecimalMax(value = "987.6") @Valid @RequestParam(value = "float", required = false) Float _float, - @ApiParam(value = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestParam(value = "string", required = false) String string, - @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary, - @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, - @ApiParam(value = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password, + @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number +, + @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double +, + @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter +, + @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte +, + @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer +, + @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32 +, + @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64 +, + @ApiParam(value = "None") @DecimalMax(value = "987.6") @Valid @RequestParam(value = "float", required = false) Float _float +, + @ApiParam(value = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestParam(value = "string", required = false) String string +, + @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary +, + @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date +, + @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime +, + @ApiParam(value = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password +, @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback + ) { return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); } @@ -369,14 +392,22 @@ default ResponseEntity testEndpointParameters( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEnumParameters( - @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, - @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, - @ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray, - @ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString, - @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, - @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1.1, -1.2") @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, - @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_form_string", required = false) String enumFormString + @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray +, + @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString +, + @ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray +, + @ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString +, + @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger +, + @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1.1, -1.2") @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble +, + @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false, defaultValue = "$") List enumFormStringArray +, + @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_form_string", required = false, defaultValue = "-efg") String enumFormString + ) { return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); } @@ -409,12 +440,18 @@ default ResponseEntity testEnumParameters( value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) default ResponseEntity testGroupParameters( - @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, - @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, - @NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group, - @ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup, - @ApiParam(value = "Boolean in group parameters") @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup, + @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup +, + @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup +, + @NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group +, + @ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup +, + @ApiParam(value = "Boolean in group parameters") @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup +, @ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group + ) { return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); } @@ -443,6 +480,7 @@ default ResponseEntity testGroupParameters( ) default ResponseEntity testInlineAdditionalProperties( @ApiParam(value = "request body", required = true) @Valid @RequestBody Map param + ) { return getDelegate().testInlineAdditionalProperties(param); } @@ -471,8 +509,10 @@ default ResponseEntity testInlineAdditionalProperties( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testJsonFormData( - @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, + @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param +, @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 + ) { return getDelegate().testJsonFormData(param, param2); } @@ -504,11 +544,16 @@ default ResponseEntity testJsonFormData( value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) default ResponseEntity testQueryParameterCollectionFormat( - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url +, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context + ) { return getDelegate().testQueryParameterCollectionFormat(pipe, ioutil, http, url, context); } @@ -546,9 +591,12 @@ default ResponseEntity testQueryParameterCollectionFormat( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFileWithRequiredFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, + @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile +, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata + ) { return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 7413d46f5fac..0fdca5519b53 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -56,6 +56,7 @@ default FakeClassnameTestApiDelegate getDelegate() { ) default ResponseEntity testClassname( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body + ) { return getDelegate().testClassname(body); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java index 1449bfce5cc5..8b02465fa354 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java @@ -62,6 +62,7 @@ default PetApiDelegate getDelegate() { ) default ResponseEntity addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + ) { return getDelegate().addPet(body); } @@ -97,8 +98,10 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, + @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId +, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ) { return getDelegate().deletePet(petId, apiKey); } @@ -137,7 +140,8 @@ default ResponseEntity deletePet( produces = { "application/xml", "application/json" } ) default ResponseEntity> findPetsByStatus( - @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status, + @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status +, @ApiIgnore final Pageable pageable ) { return getDelegate().findPetsByStatus(status, pageable); @@ -180,8 +184,10 @@ default ResponseEntity> findPetsByStatus( produces = { "application/xml", "application/json" } ) default ResponseEntity> findPetsByTags( - @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags, - @ApiParam(value = "A test HeaderParam for issue #8315 - must NOT be removed when x-spring-paginated:true is used.") @RequestHeader(value = "size", required = false) @Nullable String size, + @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags +, + @ApiParam(value = "A test HeaderParam for issue #8315 - must NOT be removed when x-spring-paginated:true is used.") @RequestHeader(value = "size", required = false) @Nullable String size +, @ApiIgnore final Pageable pageable ) { return getDelegate().findPetsByTags(tags, size, pageable); @@ -220,6 +226,7 @@ default ResponseEntity> findPetsByTags( ) default ResponseEntity getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId + ) { return getDelegate().getPetById(petId); } @@ -297,6 +304,7 @@ default ResponseEntity> listAllPets( ) default ResponseEntity updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + ) { return getDelegate().updatePet(body); } @@ -332,9 +340,12 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, + @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name +, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status + ) { return getDelegate().updatePetWithForm(petId, name, status); } @@ -372,9 +383,12 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file + ) { return getDelegate().uploadFile(petId, additionalMetadata, file); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java index f089fb34f2e9..342041904ce1 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java @@ -53,6 +53,7 @@ default StoreApiDelegate getDelegate() { ) default ResponseEntity deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId + ) { return getDelegate().deleteOrder(orderId); } @@ -120,6 +121,7 @@ default ResponseEntity> getInventory( ) default ResponseEntity getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId + ) { return getDelegate().getOrderById(orderId); } @@ -151,6 +153,7 @@ default ResponseEntity getOrderById( ) default ResponseEntity placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body + ) { return getDelegate().placeOrder(body); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java index edef662bbd5d..0a6a0820927d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java @@ -51,6 +51,7 @@ default UserApiDelegate getDelegate() { ) default ResponseEntity createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User body + ) { return getDelegate().createUser(body); } @@ -78,6 +79,7 @@ default ResponseEntity createUser( ) default ResponseEntity createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body + ) { return getDelegate().createUsersWithArrayInput(body); } @@ -105,6 +107,7 @@ default ResponseEntity createUsersWithArrayInput( ) default ResponseEntity createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body + ) { return getDelegate().createUsersWithListInput(body); } @@ -135,6 +138,7 @@ default ResponseEntity createUsersWithListInput( ) default ResponseEntity deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username + ) { return getDelegate().deleteUser(username); } @@ -168,6 +172,7 @@ default ResponseEntity deleteUser( ) default ResponseEntity getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username + ) { return getDelegate().getUserByName(username); } @@ -199,8 +204,10 @@ default ResponseEntity getUserByName( produces = { "application/xml", "application/json" } ) default ResponseEntity loginUser( - @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password + ) { return getDelegate().loginUser(username, password); } @@ -257,8 +264,10 @@ default ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER ) default ResponseEntity updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username +, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User body + ) { return getDelegate().updateUser(username, body); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/VersioningApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/VersioningApi.java index 7326b147afff..0f1f1ca2bda2 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/VersioningApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/VersioningApi.java @@ -56,6 +56,7 @@ default VersioningApiDelegate getDelegate() { ) default ResponseEntity versioningHeaders( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + ) { return getDelegate().versioningHeaders(petId); } @@ -92,9 +93,12 @@ default ResponseEntity versioningHeaders( params = { "VersionWithDefaultValueQuery=V1", "VersionNoDefaultValueQuery" } ) default ResponseEntity versioningMix( - @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @Valid @RequestParam(value = "VersionWithDefaultValueQuery", required = true, defaultValue = "V1") String versionWithDefaultValueQuery, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "VersionNoDefaultValueQuery", required = true) String versionNoDefaultValueQuery, + @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @Valid @RequestParam(value = "VersionWithDefaultValueQuery", required = true, defaultValue = "V1") String versionWithDefaultValueQuery +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "VersionNoDefaultValueQuery", required = true) String versionNoDefaultValueQuery +, @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + ) { return getDelegate().versioningMix(versionWithDefaultValueQuery, versionNoDefaultValueQuery, petId); } @@ -126,9 +130,12 @@ default ResponseEntity versioningMix( params = { "VersionWithDefaultValue=V1", "VersionNoDefaultValue" } ) default ResponseEntity versioningQueryParams( - @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @Valid @RequestParam(value = "VersionWithDefaultValue", required = true, defaultValue = "V1") String versionWithDefaultValue, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "VersionNoDefaultValue", required = true) String versionNoDefaultValue, + @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @Valid @RequestParam(value = "VersionWithDefaultValue", required = true, defaultValue = "V1") String versionWithDefaultValue +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "VersionNoDefaultValue", required = true) String versionNoDefaultValue +, @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + ) { return getDelegate().versioningQueryParams(versionWithDefaultValue, versionNoDefaultValue, petId); } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java index f0ed29e8d0af..57d18d62021f 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -57,6 +57,7 @@ default Optional getRequest() { ) default ResponseEntity call123testSpecialTags( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java index e1c0e252b770..44cafbbd8508 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -66,6 +66,7 @@ default Optional getRequest() { ) default ResponseEntity createXmlItem( @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -97,6 +98,7 @@ default ResponseEntity createXmlItem( ) default ResponseEntity fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -128,6 +130,7 @@ default ResponseEntity fakeOuterBooleanSerialize( ) default ResponseEntity fakeOuterCompositeSerialize( @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite body + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -168,6 +171,7 @@ default ResponseEntity fakeOuterCompositeSerialize( ) default ResponseEntity fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -199,6 +203,7 @@ default ResponseEntity fakeOuterNumberSerialize( ) default ResponseEntity fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -229,6 +234,7 @@ default ResponseEntity fakeOuterStringSerialize( ) default ResponseEntity testBodyWithFileSchema( @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -258,8 +264,10 @@ default ResponseEntity testBodyWithFileSchema( consumes = { "application/json" } ) default ResponseEntity testBodyWithQueryParams( - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query +, @ApiParam(value = "", required = true) @Valid @RequestBody User body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -292,6 +300,7 @@ default ResponseEntity testBodyWithQueryParams( ) default ResponseEntity testClientModel( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -348,20 +357,34 @@ default ResponseEntity testClientModel( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEndpointParameters( - @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, - @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer, - @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32, - @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, - @ApiParam(value = "None") @DecimalMax(value = "987.6") @Valid @RequestParam(value = "float", required = false) Float _float, - @ApiParam(value = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestParam(value = "string", required = false) String string, - @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary, - @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, - @ApiParam(value = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password, + @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number +, + @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double +, + @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter +, + @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte +, + @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer +, + @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32 +, + @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64 +, + @ApiParam(value = "None") @DecimalMax(value = "987.6") @Valid @RequestParam(value = "float", required = false) Float _float +, + @ApiParam(value = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestParam(value = "string", required = false) String string +, + @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary +, + @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date +, + @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime +, + @ApiParam(value = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password +, @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -400,14 +423,22 @@ default ResponseEntity testEndpointParameters( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEnumParameters( - @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, - @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, - @ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray, - @ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString, - @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, - @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1.1, -1.2") @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, - @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_form_string", required = false) String enumFormString + @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray +, + @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString +, + @ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray +, + @ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString +, + @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger +, + @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1.1, -1.2") @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble +, + @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false, defaultValue = "$") List enumFormStringArray +, + @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_form_string", required = false, defaultValue = "-efg") String enumFormString + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -441,12 +472,18 @@ default ResponseEntity testEnumParameters( value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) default ResponseEntity testGroupParameters( - @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, - @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, - @NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group, - @ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup, - @ApiParam(value = "Boolean in group parameters") @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup, + @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup +, + @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup +, + @NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group +, + @ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup +, + @ApiParam(value = "Boolean in group parameters") @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup +, @ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -476,6 +513,7 @@ default ResponseEntity testGroupParameters( ) default ResponseEntity testInlineAdditionalProperties( @ApiParam(value = "request body", required = true) @Valid @RequestBody Map param + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -505,8 +543,10 @@ default ResponseEntity testInlineAdditionalProperties( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testJsonFormData( - @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, + @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param +, @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -539,11 +579,16 @@ default ResponseEntity testJsonFormData( value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) default ResponseEntity testQueryParameterCollectionFormat( - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url +, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -582,9 +627,12 @@ default ResponseEntity testQueryParameterCollectionFormat( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFileWithRequiredFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, + @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile +, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index e5f1fdadc704..00ef85c6363b 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -60,6 +60,7 @@ default Optional getRequest() { ) default ResponseEntity testClassname( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java index 50454f71b509..1553a8c91970 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java @@ -66,6 +66,7 @@ default Optional getRequest() { ) default ResponseEntity addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -102,8 +103,10 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, + @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId +, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -143,7 +146,8 @@ default ResponseEntity deletePet( produces = { "application/xml", "application/json" } ) default ResponseEntity> findPetsByStatus( - @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status, + @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status +, @ApiIgnore final Pageable pageable ) { getRequest().ifPresent(request -> { @@ -201,8 +205,10 @@ default ResponseEntity> findPetsByStatus( produces = { "application/xml", "application/json" } ) default ResponseEntity> findPetsByTags( - @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags, - @ApiParam(value = "A test HeaderParam for issue #8315 - must NOT be removed when x-spring-paginated:true is used.") @RequestHeader(value = "size", required = false) @Nullable String size, + @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags +, + @ApiParam(value = "A test HeaderParam for issue #8315 - must NOT be removed when x-spring-paginated:true is used.") @RequestHeader(value = "size", required = false) @Nullable String size +, @ApiIgnore final Pageable pageable ) { getRequest().ifPresent(request -> { @@ -256,6 +262,7 @@ default ResponseEntity> findPetsByTags( ) default ResponseEntity getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -363,6 +370,7 @@ default ResponseEntity> listAllPets( ) default ResponseEntity updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -399,9 +407,12 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, + @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name +, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -440,9 +451,12 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java index 3afa6aa5f485..e1c182650761 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -57,6 +57,7 @@ default Optional getRequest() { ) default ResponseEntity deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -126,6 +127,7 @@ default ResponseEntity> getInventory( ) default ResponseEntity getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -172,6 +174,7 @@ default ResponseEntity getOrderById( ) default ResponseEntity placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java index 79ffefc12e85..f6ebc66dc7d5 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java @@ -55,6 +55,7 @@ default Optional getRequest() { ) default ResponseEntity createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -83,6 +84,7 @@ default ResponseEntity createUser( ) default ResponseEntity createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -111,6 +113,7 @@ default ResponseEntity createUsersWithArrayInput( ) default ResponseEntity createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -142,6 +145,7 @@ default ResponseEntity createUsersWithListInput( ) default ResponseEntity deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -176,6 +180,7 @@ default ResponseEntity deleteUser( ) default ResponseEntity getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -222,8 +227,10 @@ default ResponseEntity getUserByName( produces = { "application/xml", "application/json" } ) default ResponseEntity loginUser( - @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -282,8 +289,10 @@ default ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER ) default ResponseEntity updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username +, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/VersioningApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/VersioningApi.java index 4567664fecbb..89f30107d571 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/VersioningApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/VersioningApi.java @@ -57,9 +57,12 @@ default Optional getRequest() { headers = { "VersionWithDefaultValue=V1", "VersionNoDefaultValue" } ) default ResponseEntity versioningHeaders( - @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @RequestHeader(value = "VersionWithDefaultValue", required = true, defaultValue = "V1") String versionWithDefaultValue, - @NotNull @ApiParam(value = "", required = true) @RequestHeader(value = "VersionNoDefaultValue", required = true) String versionNoDefaultValue, + @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @RequestHeader(value = "VersionWithDefaultValue", required = true, defaultValue = "V1") String versionWithDefaultValue +, + @NotNull @ApiParam(value = "", required = true) @RequestHeader(value = "VersionNoDefaultValue", required = true) String versionNoDefaultValue +, @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -104,11 +107,16 @@ default ResponseEntity versioningHeaders( params = { "VersionWithDefaultValueQuery=V1", "VersionNoDefaultValueQuery" } ) default ResponseEntity versioningMix( - @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @Valid @RequestParam(value = "VersionWithDefaultValueQuery", required = true, defaultValue = "V1") String versionWithDefaultValueQuery, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "VersionNoDefaultValueQuery", required = true) String versionNoDefaultValueQuery, - @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @RequestHeader(value = "VersionWithDefaultValueHeader", required = true, defaultValue = "V1") String versionWithDefaultValueHeader, - @NotNull @ApiParam(value = "", required = true) @RequestHeader(value = "VersionNoDefaultValueHeader", required = true) String versionNoDefaultValueHeader, + @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @Valid @RequestParam(value = "VersionWithDefaultValueQuery", required = true, defaultValue = "V1") String versionWithDefaultValueQuery +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "VersionNoDefaultValueQuery", required = true) String versionNoDefaultValueQuery +, + @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @RequestHeader(value = "VersionWithDefaultValueHeader", required = true, defaultValue = "V1") String versionWithDefaultValueHeader +, + @NotNull @ApiParam(value = "", required = true) @RequestHeader(value = "VersionNoDefaultValueHeader", required = true) String versionNoDefaultValueHeader +, @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -150,9 +158,12 @@ default ResponseEntity versioningMix( params = { "VersionWithDefaultValue=V1", "VersionNoDefaultValue" } ) default ResponseEntity versioningQueryParams( - @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @Valid @RequestParam(value = "VersionWithDefaultValue", required = true, defaultValue = "V1") String versionWithDefaultValue, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "VersionNoDefaultValue", required = true) String versionNoDefaultValue, + @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @Valid @RequestParam(value = "VersionWithDefaultValue", required = true, defaultValue = "V1") String versionWithDefaultValue +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "VersionNoDefaultValue", required = true) String versionNoDefaultValue +, @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java index f0ed29e8d0af..57d18d62021f 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -57,6 +57,7 @@ default Optional getRequest() { ) default ResponseEntity call123testSpecialTags( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java index e1c0e252b770..44cafbbd8508 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java @@ -66,6 +66,7 @@ default Optional getRequest() { ) default ResponseEntity createXmlItem( @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -97,6 +98,7 @@ default ResponseEntity createXmlItem( ) default ResponseEntity fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -128,6 +130,7 @@ default ResponseEntity fakeOuterBooleanSerialize( ) default ResponseEntity fakeOuterCompositeSerialize( @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite body + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -168,6 +171,7 @@ default ResponseEntity fakeOuterCompositeSerialize( ) default ResponseEntity fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -199,6 +203,7 @@ default ResponseEntity fakeOuterNumberSerialize( ) default ResponseEntity fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -229,6 +234,7 @@ default ResponseEntity fakeOuterStringSerialize( ) default ResponseEntity testBodyWithFileSchema( @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -258,8 +264,10 @@ default ResponseEntity testBodyWithFileSchema( consumes = { "application/json" } ) default ResponseEntity testBodyWithQueryParams( - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query +, @ApiParam(value = "", required = true) @Valid @RequestBody User body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -292,6 +300,7 @@ default ResponseEntity testBodyWithQueryParams( ) default ResponseEntity testClientModel( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -348,20 +357,34 @@ default ResponseEntity testClientModel( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEndpointParameters( - @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, - @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer, - @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32, - @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, - @ApiParam(value = "None") @DecimalMax(value = "987.6") @Valid @RequestParam(value = "float", required = false) Float _float, - @ApiParam(value = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestParam(value = "string", required = false) String string, - @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary, - @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, - @ApiParam(value = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password, + @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number +, + @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double +, + @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter +, + @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte +, + @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer +, + @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32 +, + @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64 +, + @ApiParam(value = "None") @DecimalMax(value = "987.6") @Valid @RequestParam(value = "float", required = false) Float _float +, + @ApiParam(value = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestParam(value = "string", required = false) String string +, + @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary +, + @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date +, + @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime +, + @ApiParam(value = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password +, @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -400,14 +423,22 @@ default ResponseEntity testEndpointParameters( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEnumParameters( - @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, - @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, - @ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray, - @ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString, - @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, - @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1.1, -1.2") @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, - @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_form_string", required = false) String enumFormString + @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray +, + @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString +, + @ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray +, + @ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString +, + @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger +, + @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1.1, -1.2") @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble +, + @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false, defaultValue = "$") List enumFormStringArray +, + @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_form_string", required = false, defaultValue = "-efg") String enumFormString + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -441,12 +472,18 @@ default ResponseEntity testEnumParameters( value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) default ResponseEntity testGroupParameters( - @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, - @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, - @NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group, - @ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup, - @ApiParam(value = "Boolean in group parameters") @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup, + @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup +, + @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup +, + @NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group +, + @ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup +, + @ApiParam(value = "Boolean in group parameters") @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup +, @ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -476,6 +513,7 @@ default ResponseEntity testGroupParameters( ) default ResponseEntity testInlineAdditionalProperties( @ApiParam(value = "request body", required = true) @Valid @RequestBody Map param + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -505,8 +543,10 @@ default ResponseEntity testInlineAdditionalProperties( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testJsonFormData( - @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, + @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param +, @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -539,11 +579,16 @@ default ResponseEntity testJsonFormData( value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) default ResponseEntity testQueryParameterCollectionFormat( - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url +, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -582,9 +627,12 @@ default ResponseEntity testQueryParameterCollectionFormat( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFileWithRequiredFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, + @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile +, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index e5f1fdadc704..00ef85c6363b 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -60,6 +60,7 @@ default Optional getRequest() { ) default ResponseEntity testClassname( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java index 50454f71b509..1553a8c91970 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java @@ -66,6 +66,7 @@ default Optional getRequest() { ) default ResponseEntity addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -102,8 +103,10 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, + @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId +, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -143,7 +146,8 @@ default ResponseEntity deletePet( produces = { "application/xml", "application/json" } ) default ResponseEntity> findPetsByStatus( - @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status, + @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status +, @ApiIgnore final Pageable pageable ) { getRequest().ifPresent(request -> { @@ -201,8 +205,10 @@ default ResponseEntity> findPetsByStatus( produces = { "application/xml", "application/json" } ) default ResponseEntity> findPetsByTags( - @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags, - @ApiParam(value = "A test HeaderParam for issue #8315 - must NOT be removed when x-spring-paginated:true is used.") @RequestHeader(value = "size", required = false) @Nullable String size, + @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags +, + @ApiParam(value = "A test HeaderParam for issue #8315 - must NOT be removed when x-spring-paginated:true is used.") @RequestHeader(value = "size", required = false) @Nullable String size +, @ApiIgnore final Pageable pageable ) { getRequest().ifPresent(request -> { @@ -256,6 +262,7 @@ default ResponseEntity> findPetsByTags( ) default ResponseEntity getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -363,6 +370,7 @@ default ResponseEntity> listAllPets( ) default ResponseEntity updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -399,9 +407,12 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, + @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name +, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -440,9 +451,12 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java index 3afa6aa5f485..e1c182650761 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java @@ -57,6 +57,7 @@ default Optional getRequest() { ) default ResponseEntity deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -126,6 +127,7 @@ default ResponseEntity> getInventory( ) default ResponseEntity getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -172,6 +174,7 @@ default ResponseEntity getOrderById( ) default ResponseEntity placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java index 79ffefc12e85..f6ebc66dc7d5 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java @@ -55,6 +55,7 @@ default Optional getRequest() { ) default ResponseEntity createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -83,6 +84,7 @@ default ResponseEntity createUser( ) default ResponseEntity createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -111,6 +113,7 @@ default ResponseEntity createUsersWithArrayInput( ) default ResponseEntity createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -142,6 +145,7 @@ default ResponseEntity createUsersWithListInput( ) default ResponseEntity deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -176,6 +180,7 @@ default ResponseEntity deleteUser( ) default ResponseEntity getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -222,8 +227,10 @@ default ResponseEntity getUserByName( produces = { "application/xml", "application/json" } ) default ResponseEntity loginUser( - @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -282,8 +289,10 @@ default ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER ) default ResponseEntity updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username +, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/VersioningApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/VersioningApi.java index 75628bc8bb1e..ac6601715e69 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/VersioningApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/VersioningApi.java @@ -60,6 +60,7 @@ default Optional getRequest() { ) default ResponseEntity versioningHeaders( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -106,9 +107,12 @@ default ResponseEntity versioningHeaders( params = { "VersionWithDefaultValueQuery=V1", "VersionNoDefaultValueQuery" } ) default ResponseEntity versioningMix( - @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @Valid @RequestParam(value = "VersionWithDefaultValueQuery", required = true, defaultValue = "V1") String versionWithDefaultValueQuery, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "VersionNoDefaultValueQuery", required = true) String versionNoDefaultValueQuery, + @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @Valid @RequestParam(value = "VersionWithDefaultValueQuery", required = true, defaultValue = "V1") String versionWithDefaultValueQuery +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "VersionNoDefaultValueQuery", required = true) String versionNoDefaultValueQuery +, @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -150,9 +154,12 @@ default ResponseEntity versioningMix( params = { "VersionWithDefaultValue=V1", "VersionNoDefaultValue" } ) default ResponseEntity versioningQueryParams( - @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @Valid @RequestParam(value = "VersionWithDefaultValue", required = true, defaultValue = "V1") String versionWithDefaultValue, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "VersionNoDefaultValue", required = true) String versionNoDefaultValue, + @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @Valid @RequestParam(value = "VersionWithDefaultValue", required = true, defaultValue = "V1") String versionWithDefaultValue +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "VersionNoDefaultValue", required = true) String versionNoDefaultValue +, @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/api/UserApi.java index 96b1c12950fe..17c8621d45f2 100644 --- a/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/api/UserApi.java @@ -73,8 +73,10 @@ default Optional getRequest() { produces = { "application/json" } ) default ResponseEntity loginUser( - @NotNull @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, - @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password, + @NotNull @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username +, + @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password +, @Parameter(hidden = true) @Value("${server.port}") String someValue, @Parameter(hidden = true) @RequestHeader(value="x-project-id", required = false) String someHeaderValue, @Parameter(hidden = true) @RequestHeader final HttpHeaders headers, diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java index ede9da33f0df..7592338c073a 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -57,6 +57,7 @@ default Optional getRequest() { ) default ResponseEntity call123testSpecialTags( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java index f097a494a482..b09cd08569bb 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java @@ -68,6 +68,7 @@ default Optional getRequest() { ) default ResponseEntity createXmlItem( @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -100,6 +101,7 @@ default ResponseEntity createXmlItem( ) default ResponseEntity fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) Optional body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -132,6 +134,7 @@ default ResponseEntity fakeOuterBooleanSerialize( ) default ResponseEntity fakeOuterCompositeSerialize( @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) Optional outerComposite + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -173,6 +176,7 @@ default ResponseEntity fakeOuterCompositeSerialize( ) default ResponseEntity fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) Optional body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -205,6 +209,7 @@ default ResponseEntity fakeOuterNumberSerialize( ) default ResponseEntity fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) Optional body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -235,6 +240,7 @@ default ResponseEntity fakeOuterStringSerialize( ) default ResponseEntity responseObjectDifferentNames( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -274,6 +280,7 @@ default ResponseEntity responseObjectDiff ) default ResponseEntity testBodyWithFileSchema( @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -303,8 +310,10 @@ default ResponseEntity testBodyWithFileSchema( consumes = { "application/json" } ) default ResponseEntity testBodyWithQueryParams( - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query +, @ApiParam(value = "", required = true) @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -337,6 +346,7 @@ default ResponseEntity testBodyWithQueryParams( ) default ResponseEntity testClientModel( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -393,20 +403,34 @@ default ResponseEntity testClientModel( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEndpointParameters( - @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, - @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Optional integer, - @ApiParam(value = "None") @Valid @RequestParam(value = "int32", required = false) Optional int32, - @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Optional int64, - @ApiParam(value = "None") @Valid @RequestParam(value = "float", required = false) Optional _float, - @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) Optional string, - @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary, - @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) Optional date, - @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) Optional dateTime, - @ApiParam(value = "None") @Valid @RequestParam(value = "password", required = false) Optional password, + @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number +, + @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double +, + @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter +, + @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte +, + @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Optional integer +, + @ApiParam(value = "None") @Valid @RequestParam(value = "int32", required = false) Optional int32 +, + @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Optional int64 +, + @ApiParam(value = "None") @Valid @RequestParam(value = "float", required = false) Optional _float +, + @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) Optional string +, + @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary +, + @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) Optional date +, + @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) Optional dateTime +, + @ApiParam(value = "None") @Valid @RequestParam(value = "password", required = false) Optional password +, @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) Optional paramCallback + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -445,14 +469,22 @@ default ResponseEntity testEndpointParameters( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEnumParameters( - @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) Optional> enumHeaderStringArray, - @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") Optional enumHeaderString, - @ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) Optional> enumQueryStringArray, - @ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") Optional enumQueryString, - @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) Optional enumQueryInteger, - @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1.1, -1.2") @Valid @RequestParam(value = "enum_query_double", required = false) Optional enumQueryDouble, - @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false) Optional> enumFormStringArray, - @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_form_string", required = false) Optional enumFormString + @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) Optional> enumHeaderStringArray +, + @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") Optional enumHeaderString +, + @ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) Optional> enumQueryStringArray +, + @ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") Optional enumQueryString +, + @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) Optional enumQueryInteger +, + @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1.1, -1.2") @Valid @RequestParam(value = "enum_query_double", required = false) Optional enumQueryDouble +, + @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false, defaultValue = "$") Optional> enumFormStringArray +, + @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_form_string", required = false, defaultValue = "-efg") Optional enumFormString + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -486,12 +518,18 @@ default ResponseEntity testEnumParameters( value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) default ResponseEntity testGroupParameters( - @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, - @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, - @NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group, - @ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) Optional stringGroup, - @ApiParam(value = "Boolean in group parameters") @RequestHeader(value = "boolean_group", required = false) Optional booleanGroup, + @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup +, + @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup +, + @NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group +, + @ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) Optional stringGroup +, + @ApiParam(value = "Boolean in group parameters") @RequestHeader(value = "boolean_group", required = false) Optional booleanGroup +, @ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) Optional int64Group + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -522,6 +560,7 @@ default ResponseEntity testGroupParameters( ) default ResponseEntity testInlineAdditionalProperties( @ApiParam(value = "request body", required = true) @Valid @RequestBody Map requestBody + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -552,8 +591,10 @@ default ResponseEntity testInlineAdditionalProperties( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testJsonFormData( - @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, + @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param +, @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -584,6 +625,7 @@ default ResponseEntity testJsonFormData( ) default ResponseEntity testNullable( @ApiParam(value = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -615,10 +657,14 @@ default ResponseEntity testNullable( value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) default ResponseEntity testQueryParameterCollectionFormat( - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url +, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -697,9 +743,12 @@ default ResponseEntity testWithResultExample( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFileWithRequiredFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, + @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile +, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) Optional additionalMetadata + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 09cd7208502b..f3b22e176d77 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -60,6 +60,7 @@ default Optional getRequest() { ) default ResponseEntity testClassname( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java index 0fc23f10a6e8..b48a425e54e5 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java @@ -66,6 +66,7 @@ default Optional getRequest() { ) default ResponseEntity addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -103,8 +104,10 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, + @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId +, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) Optional apiKey + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -145,6 +148,7 @@ default ResponseEntity deletePet( ) default ResponseEntity> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -201,6 +205,7 @@ default ResponseEntity> findPetsByStatus( ) default ResponseEntity> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -253,6 +258,7 @@ default ResponseEntity> findPetsByTags( ) default ResponseEntity getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -309,6 +315,7 @@ default ResponseEntity getPetById( ) default ResponseEntity updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -346,9 +353,12 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) Optional name, + @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) Optional name +, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) Optional status + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -388,9 +398,12 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) Optional additionalMetadata, + @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) Optional additionalMetadata +, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java index 5e700381edae..17584c61a909 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java @@ -57,6 +57,7 @@ default Optional getRequest() { ) default ResponseEntity deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -126,6 +127,7 @@ default ResponseEntity> getInventory( ) default ResponseEntity getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -174,6 +176,7 @@ default ResponseEntity getOrderById( ) default ResponseEntity placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java index 87f660929e6b..58203d901787 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java @@ -56,6 +56,7 @@ default Optional getRequest() { ) default ResponseEntity createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -86,6 +87,7 @@ default ResponseEntity createUser( ) default ResponseEntity createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -116,6 +118,7 @@ default ResponseEntity createUsersWithArrayInput( ) default ResponseEntity createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -147,6 +150,7 @@ default ResponseEntity createUsersWithListInput( ) default ResponseEntity deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -182,6 +186,7 @@ default ResponseEntity deleteUser( ) default ResponseEntity getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -229,8 +234,10 @@ default ResponseEntity getUserByName( produces = { "application/xml", "application/json" } ) default ResponseEntity loginUser( - @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -291,8 +298,10 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username +, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java index ef17356107e5..f9d86f38f57d 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java @@ -73,6 +73,7 @@ default Optional getRequest() { ) default ResponseEntity call123testSpecialTags( @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java index 331b23d5c2aa..0be8cbf9693a 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java @@ -83,6 +83,7 @@ default Optional getRequest() { ) default ResponseEntity createXmlItem( @Parameter(name = "XmlItem", description = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -116,6 +117,7 @@ default ResponseEntity createXmlItem( ) default ResponseEntity fakeOuterBooleanSerialize( @Parameter(name = "body", description = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -149,6 +151,7 @@ default ResponseEntity fakeOuterBooleanSerialize( ) default ResponseEntity fakeOuterCompositeSerialize( @Parameter(name = "OuterComposite", description = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite outerComposite + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -191,6 +194,7 @@ default ResponseEntity fakeOuterCompositeSerialize( ) default ResponseEntity fakeOuterNumberSerialize( @Parameter(name = "body", description = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -224,6 +228,7 @@ default ResponseEntity fakeOuterNumberSerialize( ) default ResponseEntity fakeOuterStringSerialize( @Parameter(name = "body", description = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -254,6 +259,7 @@ default ResponseEntity fakeOuterStringSerialize( ) default ResponseEntity responseObjectDifferentNames( @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -293,6 +299,7 @@ default ResponseEntity responseObjectDiff ) default ResponseEntity testBodyWithFileSchema( @Parameter(name = "FileSchemaTestClass", description = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -321,8 +328,10 @@ default ResponseEntity testBodyWithFileSchema( consumes = { "application/json" } ) default ResponseEntity testBodyWithQueryParams( - @NotNull @Parameter(name = "query", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "query", required = true) String query, + @NotNull @Parameter(name = "query", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "query", required = true) String query +, @Parameter(name = "User", description = "", required = true) @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -357,6 +366,7 @@ default ResponseEntity testBodyWithQueryParams( ) default ResponseEntity testClientModel( @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -414,20 +424,34 @@ default ResponseEntity testClientModel( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEndpointParameters( - @Parameter(name = "number", description = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @Parameter(name = "double", description = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, - @Parameter(name = "pattern_without_delimiter", description = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @Parameter(name = "byte", description = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @Parameter(name = "integer", description = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer, - @Parameter(name = "int32", description = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32, - @Parameter(name = "int64", description = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, - @Parameter(name = "float", description = "None") @DecimalMax(value = "987.6") @Valid @RequestParam(value = "float", required = false) Float _float, - @Parameter(name = "string", description = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestParam(value = "string", required = false) String string, - @Parameter(name = "binary", description = "None") @RequestPart(value = "binary", required = false) MultipartFile binary, - @Parameter(name = "date", description = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @Parameter(name = "dateTime", description = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, - @Parameter(name = "password", description = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password, + @Parameter(name = "number", description = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number +, + @Parameter(name = "double", description = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double +, + @Parameter(name = "pattern_without_delimiter", description = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter +, + @Parameter(name = "byte", description = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte +, + @Parameter(name = "integer", description = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer +, + @Parameter(name = "int32", description = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32 +, + @Parameter(name = "int64", description = "None") @Valid @RequestParam(value = "int64", required = false) Long int64 +, + @Parameter(name = "float", description = "None") @DecimalMax(value = "987.6") @Valid @RequestParam(value = "float", required = false) Float _float +, + @Parameter(name = "string", description = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestParam(value = "string", required = false) String string +, + @Parameter(name = "binary", description = "None") @RequestPart(value = "binary", required = false) MultipartFile binary +, + @Parameter(name = "date", description = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date +, + @Parameter(name = "dateTime", description = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime +, + @Parameter(name = "password", description = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password +, @Parameter(name = "callback", description = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -467,14 +491,22 @@ default ResponseEntity testEndpointParameters( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEnumParameters( - @Parameter(name = "enum_header_string_array", description = "Header parameter enum test (string array)", in = ParameterIn.HEADER) @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, - @Parameter(name = "enum_header_string", description = "Header parameter enum test (string)", in = ParameterIn.HEADER) @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, - @Parameter(name = "enum_query_string_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray, - @Parameter(name = "enum_query_string", description = "Query parameter enum test (string)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString, - @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, - @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @Parameter(name = "enum_form_string_array", description = "Form parameter enum test (string array)") @Valid @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, - @Parameter(name = "enum_form_string", description = "Form parameter enum test (string)") @Valid @RequestParam(value = "enum_form_string", required = false) String enumFormString + @Parameter(name = "enum_header_string_array", description = "Header parameter enum test (string array)", in = ParameterIn.HEADER) @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray +, + @Parameter(name = "enum_header_string", description = "Header parameter enum test (string)", in = ParameterIn.HEADER) @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString +, + @Parameter(name = "enum_query_string_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray +, + @Parameter(name = "enum_query_string", description = "Query parameter enum test (string)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString +, + @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger +, + @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble +, + @Parameter(name = "enum_form_string_array", description = "Form parameter enum test (string array)") @Valid @RequestPart(value = "enum_form_string_array", required = false, defaultValue = "$") List enumFormStringArray +, + @Parameter(name = "enum_form_string", description = "Form parameter enum test (string)") @Valid @RequestParam(value = "enum_form_string", required = false, defaultValue = "-efg") String enumFormString + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -509,12 +541,18 @@ default ResponseEntity testEnumParameters( value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) default ResponseEntity testGroupParameters( - @NotNull @Parameter(name = "required_string_group", description = "Required String in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, - @NotNull @Parameter(name = "required_boolean_group", description = "Required Boolean in group parameters", required = true, in = ParameterIn.HEADER) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, - @NotNull @Parameter(name = "required_int64_group", description = "Required Integer in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group, - @Parameter(name = "string_group", description = "String in group parameters", in = ParameterIn.QUERY) @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup, - @Parameter(name = "boolean_group", description = "Boolean in group parameters", in = ParameterIn.HEADER) @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup, + @NotNull @Parameter(name = "required_string_group", description = "Required String in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup +, + @NotNull @Parameter(name = "required_boolean_group", description = "Required Boolean in group parameters", required = true, in = ParameterIn.HEADER) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup +, + @NotNull @Parameter(name = "required_int64_group", description = "Required Integer in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group +, + @Parameter(name = "string_group", description = "String in group parameters", in = ParameterIn.QUERY) @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup +, + @Parameter(name = "boolean_group", description = "Boolean in group parameters", in = ParameterIn.HEADER) @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup +, @Parameter(name = "int64_group", description = "Integer in group parameters", in = ParameterIn.QUERY) @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -546,6 +584,7 @@ default ResponseEntity testGroupParameters( ) default ResponseEntity testInlineAdditionalProperties( @Parameter(name = "request_body", description = "request body", required = true) @Valid @RequestBody Map requestBody + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -577,8 +616,10 @@ default ResponseEntity testInlineAdditionalProperties( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testJsonFormData( - @Parameter(name = "param", description = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, + @Parameter(name = "param", description = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param +, @Parameter(name = "param2", description = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -610,6 +651,7 @@ default ResponseEntity testJsonFormData( ) default ResponseEntity testNullable( @Parameter(name = "ChildWithNullable", description = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -641,10 +683,14 @@ default ResponseEntity testNullable( value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) default ResponseEntity testQueryParameterCollectionFormat( - @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "http", required = true) List http, - @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "url", required = true) List url, + @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "pipe", required = true) List pipe +, + @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "http", required = true) List http +, + @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "url", required = true) List url +, @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "context", required = true) List context + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -723,9 +769,12 @@ default ResponseEntity testWithResultExample( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFileWithRequiredFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "requiredFile", description = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, + @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "requiredFile", description = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile +, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java index 6a400e6b8347..87f5b55c401a 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java @@ -76,6 +76,7 @@ default Optional getRequest() { ) default ResponseEntity testClassname( @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java index b82c8708d60f..f2f24e5e2fd7 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java @@ -78,6 +78,7 @@ default Optional getRequest() { ) default ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -113,8 +114,10 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -154,6 +157,7 @@ default ResponseEntity deletePet( ) default ResponseEntity> findPetsByStatus( @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) List status + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -210,6 +214,7 @@ default ResponseEntity> findPetsByStatus( ) default ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) Set tags + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -265,6 +270,7 @@ default ResponseEntity> findPetsByTags( ) default ResponseEntity getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -319,6 +325,7 @@ default ResponseEntity getPetById( ) default ResponseEntity updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -354,9 +361,12 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, + @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name +, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -395,9 +405,12 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, - @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId +, + @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java index a07073054401..79d923a43ff2 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java @@ -72,6 +72,7 @@ default Optional getRequest() { ) default ResponseEntity deleteOrder( @NotNull @Parameter(name = "order_id", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("order_id") String orderId + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -145,6 +146,7 @@ default ResponseEntity> getInventory( ) default ResponseEntity getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "order_id", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("order_id") Long orderId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -196,6 +198,7 @@ default ResponseEntity getOrderById( ) default ResponseEntity placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java index dd61f4e8ddb0..1fe8a3b79cc7 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java @@ -71,6 +71,7 @@ default Optional getRequest() { ) default ResponseEntity createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -102,6 +103,7 @@ default ResponseEntity createUser( ) default ResponseEntity createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -133,6 +135,7 @@ default ResponseEntity createUsersWithArrayInput( ) default ResponseEntity createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -165,6 +168,7 @@ default ResponseEntity createUsersWithListInput( ) default ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -203,6 +207,7 @@ default ResponseEntity deleteUser( ) default ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -253,8 +258,10 @@ default ResponseEntity getUserByName( produces = { "application/xml", "application/json" } ) default ResponseEntity loginUser( - @NotNull @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -317,8 +324,10 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username +, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java index 7ba946efd249..95c1e63463cf 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -57,6 +57,7 @@ default Optional getRequest() { ) default ResponseEntity call123testSpecialTags( @ApiParam(value = "client model", required = true) @Valid @RequestBody ClientDto clientDto + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java index d60b4d09b3a9..66ba3e6eebf0 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java @@ -68,6 +68,7 @@ default Optional getRequest() { ) default ResponseEntity createXmlItem( @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItemDto xmlItemDto + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -100,6 +101,7 @@ default ResponseEntity createXmlItem( ) default ResponseEntity fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -132,6 +134,7 @@ default ResponseEntity fakeOuterBooleanSerialize( ) default ResponseEntity fakeOuterCompositeSerialize( @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterCompositeDto outerCompositeDto + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -173,6 +176,7 @@ default ResponseEntity fakeOuterCompositeSerialize( ) default ResponseEntity fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -205,6 +209,7 @@ default ResponseEntity fakeOuterNumberSerialize( ) default ResponseEntity fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -235,6 +240,7 @@ default ResponseEntity fakeOuterStringSerialize( ) default ResponseEntity responseObjectDifferentNames( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -274,6 +280,7 @@ default ResponseEntity responseObjectD ) default ResponseEntity testBodyWithFileSchema( @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClassDto fileSchemaTestClassDto + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -303,8 +310,10 @@ default ResponseEntity testBodyWithFileSchema( consumes = { "application/json" } ) default ResponseEntity testBodyWithQueryParams( - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query +, @ApiParam(value = "", required = true) @Valid @RequestBody UserDto userDto + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -337,6 +346,7 @@ default ResponseEntity testBodyWithQueryParams( ) default ResponseEntity testClientModel( @ApiParam(value = "client model", required = true) @Valid @RequestBody ClientDto clientDto + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -393,20 +403,34 @@ default ResponseEntity testClientModel( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEndpointParameters( - @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, - @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, - @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer, - @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32, - @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, - @ApiParam(value = "None") @DecimalMax(value = "987.6") @Valid @RequestParam(value = "float", required = false) Float _float, - @ApiParam(value = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestParam(value = "string", required = false) String string, - @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary, - @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, - @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, - @ApiParam(value = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password, + @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number +, + @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double +, + @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter +, + @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte +, + @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer +, + @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32 +, + @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64 +, + @ApiParam(value = "None") @DecimalMax(value = "987.6") @Valid @RequestParam(value = "float", required = false) Float _float +, + @ApiParam(value = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestParam(value = "string", required = false) String string +, + @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary +, + @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date +, + @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime +, + @ApiParam(value = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password +, @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -445,14 +469,22 @@ default ResponseEntity testEndpointParameters( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEnumParameters( - @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, - @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, - @ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray, - @ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString, - @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, - @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1.1, -1.2") @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, - @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_form_string", required = false) String enumFormString + @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray +, + @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString +, + @ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray +, + @ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString +, + @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger +, + @ApiParam(value = "Query parameter enum test (double)", allowableValues = "1.1, -1.2") @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble +, + @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false, defaultValue = "$") List enumFormStringArray +, + @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_form_string", required = false, defaultValue = "-efg") String enumFormString + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -486,12 +518,18 @@ default ResponseEntity testEnumParameters( value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) default ResponseEntity testGroupParameters( - @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, - @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, - @NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group, - @ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup, - @ApiParam(value = "Boolean in group parameters") @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup, + @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup +, + @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup +, + @NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group +, + @ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup +, + @ApiParam(value = "Boolean in group parameters") @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup +, @ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -522,6 +560,7 @@ default ResponseEntity testGroupParameters( ) default ResponseEntity testInlineAdditionalProperties( @ApiParam(value = "request body", required = true) @Valid @RequestBody Map requestBody + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -552,8 +591,10 @@ default ResponseEntity testInlineAdditionalProperties( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testJsonFormData( - @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, + @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param +, @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -584,6 +625,7 @@ default ResponseEntity testJsonFormData( ) default ResponseEntity testNullable( @ApiParam(value = "request body", required = true) @Valid @RequestBody ChildWithNullableDto childWithNullableDto + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -615,10 +657,14 @@ default ResponseEntity testNullable( value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) default ResponseEntity testQueryParameterCollectionFormat( - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http, - @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http +, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url +, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -697,9 +743,12 @@ default ResponseEntity testWithResultExample( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFileWithRequiredFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, + @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile +, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index f6ff6349c032..c548e4a9d784 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -60,6 +60,7 @@ default Optional getRequest() { ) default ResponseEntity testClassname( @ApiParam(value = "client model", required = true) @Valid @RequestBody ClientDto clientDto + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java index 3d2498b85ab6..ae700766e296 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java @@ -66,6 +66,7 @@ default Optional getRequest() { ) default ResponseEntity addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody PetDto petDto + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -103,8 +104,10 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, + @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId +, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -145,6 +148,7 @@ default ResponseEntity deletePet( ) default ResponseEntity> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -201,6 +205,7 @@ default ResponseEntity> findPetsByStatus( ) default ResponseEntity> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -253,6 +258,7 @@ default ResponseEntity> findPetsByTags( ) default ResponseEntity getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -309,6 +315,7 @@ default ResponseEntity getPetById( ) default ResponseEntity updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody PetDto petDto + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -346,9 +353,12 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, + @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name +, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -388,9 +398,12 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, - @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, + @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId +, + @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata +, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java index 15c55a476a19..e9c6fc87a444 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java @@ -57,6 +57,7 @@ default Optional getRequest() { ) default ResponseEntity deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -126,6 +127,7 @@ default ResponseEntity> getInventory( ) default ResponseEntity getOrderById( @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -174,6 +176,7 @@ default ResponseEntity getOrderById( ) default ResponseEntity placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody OrderDto orderDto + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java index 0a89d81589d0..899738ca2c73 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java @@ -56,6 +56,7 @@ default Optional getRequest() { ) default ResponseEntity createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody UserDto userDto + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -86,6 +87,7 @@ default ResponseEntity createUser( ) default ResponseEntity createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid UserDto> userDto + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -116,6 +118,7 @@ default ResponseEntity createUsersWithArrayInput( ) default ResponseEntity createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid UserDto> userDto + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -147,6 +150,7 @@ default ResponseEntity createUsersWithListInput( ) default ResponseEntity deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -182,6 +186,7 @@ default ResponseEntity deleteUser( ) default ResponseEntity getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username + ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -229,8 +234,10 @@ default ResponseEntity getUserByName( produces = { "application/xml", "application/json" } ) default ResponseEntity loginUser( - @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, + @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username +, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -291,8 +298,10 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username +, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody UserDto userDto + ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);