Merge remote-tracking branch 'origin/master' into 6.3.x

2022-11-01 17:42:59 +08:00
parent 3bd2a611bf b0ce532bdc
commit 2947d147b4
1972 changed files with 36976 additions and 6630 deletions
--- 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
@@ -26,7 +26,6 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@Validated
@Api(value = "another-fake", description = "the another-fake API")
-@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public interface AnotherFakeApi {

    default AnotherFakeApiDelegate getDelegate() {
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiController.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiController.java
@@ -28,6 +28,7 @@ import javax.annotation.Generated;

@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@Controller
+@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class AnotherFakeApiController implements AnotherFakeApi {

    private final AnotherFakeApiDelegate delegate;
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java
@@ -47,7 +47,7 @@ public interface AnotherFakeApiDelegate {
                break;
            }
        }
-        return result.then(Mono.empty());
+        return result.then(body).then(Mono.empty());

    }

--- 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
@@ -36,7 +36,6 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@Validated
@Api(value = "fake", description = "the fake API")
-@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public interface FakeApi {

    default FakeApiDelegate getDelegate() {
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java
@@ -38,6 +38,7 @@ import javax.annotation.Generated;

@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@Controller
+@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class FakeApiController implements FakeApi {

    private final FakeApiDelegate delegate;
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java
@@ -50,7 +50,7 @@ public interface FakeApiDelegate {
        ServerWebExchange exchange) {
        Mono<Void> result = Mono.empty();
        exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
-        return result.then(Mono.empty());
+        return result.then(xmlItem).then(Mono.empty());

    }

@@ -66,7 +66,7 @@ public interface FakeApiDelegate {
        ServerWebExchange exchange) {
        Mono<Void> result = Mono.empty();
        exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
-        return result.then(Mono.empty());
+        return result.then(body).then(Mono.empty());

    }

@@ -89,7 +89,7 @@ public interface FakeApiDelegate {
                break;
            }
        }
-        return result.then(Mono.empty());
+        return result.then(body).then(Mono.empty());

    }

@@ -105,7 +105,7 @@ public interface FakeApiDelegate {
        ServerWebExchange exchange) {
        Mono<Void> result = Mono.empty();
        exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
-        return result.then(Mono.empty());
+        return result.then(body).then(Mono.empty());

    }

@@ -121,7 +121,7 @@ public interface FakeApiDelegate {
        ServerWebExchange exchange) {
        Mono<Void> result = Mono.empty();
        exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
-        return result.then(Mono.empty());
+        return result.then(body).then(Mono.empty());

    }

@@ -137,7 +137,7 @@ public interface FakeApiDelegate {
        ServerWebExchange exchange) {
        Mono<Void> result = Mono.empty();
        exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
-        return result.then(Mono.empty());
+        return result.then(body).then(Mono.empty());

    }

@@ -154,7 +154,7 @@ public interface FakeApiDelegate {
        ServerWebExchange exchange) {
        Mono<Void> result = Mono.empty();
        exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
-        return result.then(Mono.empty());
+        return result.then(body).then(Mono.empty());

    }

@@ -177,7 +177,7 @@ public interface FakeApiDelegate {
                break;
            }
        }
-        return result.then(Mono.empty());
+        return result.then(body).then(Mono.empty());

    }

@@ -292,7 +292,7 @@ public interface FakeApiDelegate {
        ServerWebExchange exchange) {
        Mono<Void> result = Mono.empty();
        exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
-        return result.then(Mono.empty());
+        return result.then(param).then(Mono.empty());

    }

--- 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
@@ -26,7 +26,6 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@Validated
@Api(value = "fake_classname_test", description = "the fake_classname_test API")
-@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public interface FakeClassnameTestApi {

    default FakeClassnameTestApiDelegate getDelegate() {
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java
@@ -28,6 +28,7 @@ import javax.annotation.Generated;

@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@Controller
+@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class FakeClassnameTestApiController implements FakeClassnameTestApi {

    private final FakeClassnameTestApiDelegate delegate;
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java
@@ -47,7 +47,7 @@ public interface FakeClassnameTestApiDelegate {
                break;
            }
        }
-        return result.then(Mono.empty());
+        return result.then(body).then(Mono.empty());

    }

--- 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
@@ -28,7 +28,6 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@Validated
@Api(value = "pet", description = "Everything about your Pets")
-@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public interface PetApi {

    default PetApiDelegate getDelegate() {
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiController.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiController.java
@@ -30,6 +30,7 @@ import javax.annotation.Generated;

@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@Controller
+@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class PetApiController implements PetApi {

    private final PetApiDelegate delegate;
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java
@@ -42,7 +42,7 @@ public interface PetApiDelegate {
        ServerWebExchange exchange) {
        Mono<Void> result = Mono.empty();
        exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
-        return result.then(Mono.empty());
+        return result.then(body).then(Mono.empty());

    }

@@ -168,7 +168,7 @@ public interface PetApiDelegate {
        ServerWebExchange exchange) {
        Mono<Void> result = Mono.empty();
        exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
-        return result.then(Mono.empty());
+        return result.then(body).then(Mono.empty());

    }

--- 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
@@ -27,7 +27,6 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@Validated
@Api(value = "store", description = "Access to Petstore orders")
-@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public interface StoreApi {

    default StoreApiDelegate getDelegate() {
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiController.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiController.java
@@ -29,6 +29,7 @@ import javax.annotation.Generated;

@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@Controller
+@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class StoreApiController implements StoreApi {

    private final StoreApiDelegate delegate;
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java
@@ -114,7 +114,7 @@ public interface StoreApiDelegate {
                break;
            }
        }
-        return result.then(Mono.empty());
+        return result.then(body).then(Mono.empty());

    }

--- 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
@@ -28,7 +28,6 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@Validated
@Api(value = "user", description = "Operations about user")
-@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public interface UserApi {

    default UserApiDelegate getDelegate() {
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiController.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiController.java
@@ -30,6 +30,7 @@ import javax.annotation.Generated;

@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@Controller
+@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
 public class UserApiController implements UserApi {

    private final UserApiDelegate delegate;
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiDelegate.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiDelegate.java
@@ -42,7 +42,7 @@ public interface UserApiDelegate {
        ServerWebExchange exchange) {
        Mono<Void> result = Mono.empty();
        exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
-        return result.then(Mono.empty());
+        return result.then(body).then(Mono.empty());

    }

@@ -57,7 +57,7 @@ public interface UserApiDelegate {
        ServerWebExchange exchange) {
        Mono<Void> result = Mono.empty();
        exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
-        return result.then(Mono.empty());
+        return result.thenMany(body).then(Mono.empty());

    }

@@ -72,7 +72,7 @@ public interface UserApiDelegate {
        ServerWebExchange exchange) {
        Mono<Void> result = Mono.empty();
        exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
-        return result.then(Mono.empty());
+        return result.thenMany(body).then(Mono.empty());

    }

@@ -168,7 +168,7 @@ public interface UserApiDelegate {
        ServerWebExchange exchange) {
        Mono<Void> result = Mono.empty();
        exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
-        return result.then(Mono.empty());
+        return result.then(body).then(Mono.empty());

    }

--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java
@@ -0,0 +1,32 @@
+package org.openapitools.configuration;
+
+import org.openapitools.model.EnumClass;
+import org.openapitools.model.OuterEnum;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.convert.converter.Converter;
+
+@Configuration
+public class EnumConverterConfiguration {
+
+    @Bean
+    Converter<String, EnumClass> enumClassConverter() {
+        return new Converter<String, EnumClass>() {
+            @Override
+            public EnumClass convert(String source) {
+                return EnumClass.fromValue(source);
+            }
+        };
+    }
+    @Bean
+    Converter<String, OuterEnum> outerEnumConverter() {
+        return new Converter<String, OuterEnum>() {
+            @Override
+            public OuterEnum convert(String source) {
+                return OuterEnum.fromValue(source);
+            }
+        };
+    }
+
+}
--- a/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml
+++ b/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml
@@ -2111,6 +2111,7 @@ components:
        status:
          description: Updated status of the pet
          type: string
+      type: object
    uploadFile_request:
      properties:
        additionalMetadata:
@@ -2120,6 +2121,7 @@ components:
          description: file to upload
          format: binary
          type: string
+      type: object
    testEnumParameters_request:
      properties:
        enum_form_string_array:
@@ -2139,6 +2141,7 @@ components:
          - -efg
          - (xyz)
          type: string
+      type: object
    testEndpointParameters_request:
      properties:
        integer:
@@ -2211,6 +2214,7 @@ components:
      - double
      - number
      - pattern_without_delimiter
+      type: object
    testJsonFormData_request:
      properties:
        param:
@@ -2222,6 +2226,7 @@ components:
      required:
      - param
      - param2
+      type: object
    uploadFileWithRequiredFile_request:
      properties:
        additionalMetadata:
@@ -2233,6 +2238,7 @@ components:
          type: string
      required:
      - requiredFile
+      type: object
    Dog_allOf:
      properties:
        breed: