fix after merge of master

Author: Picazsoo

samples/client/petstore/spring-http-interface-bean-validation/.openapi-generator/VERSION

@@ -1 +1 @@
-7.20.0-SNAPSHOT
+7.21.0-SNAPSHOT

samples/client/petstore/spring-http-interface-bean-validation/README.md

@@ -1,6 +1,6 @@
 # OpenAPI generated API stub
 
-[Spring Framework 6 HTTP Interface](https://docs.spring.io/spring-framework/docs/6.0.0/reference/html/integration.html#rest-http-interface)
+[Spring Framework 6.1 HTTP Interface](https://docs.spring.io/spring-framework/docs/6.1.0/reference/html/integration.html#rest-http-interface)
 
 
 ## Overview
@@ -9,13 +9,13 @@ By using the [OpenAPI-Spec](https://openapis.org), you can easily generate an AP
 This is an example of building API stub interfaces in Java using the Spring framework.
 
 The stubs generated can be used in your existing Spring application for HTTP integration with other REST services
-To use auto-generated interfaces you have to create your own configuration which extends default abstract configurator & provide `WebClient` instance via constructor
+To use auto-generated interfaces you have to create your own configuration which extends default abstract configurator & provide `RestClient` instance via constructor
 ```java
 @Configuration
 public class MyConfiguration extends org.openapitools.configuration.HttpInterfacesAbstractConfigurator {
 
-    public MyConfiguration(WebClient myWebClient) { // separately created WebClient instance
-        super(myWebClient);
+    public MyConfiguration(RestClient client) {
+        super(client);
     }
 }
 ```

samples/client/petstore/spring-http-interface-bean-validation/pom.xml

@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.3</version>
+        <version>3.3.13</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -46,7 +46,7 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-webflux</artifactId>
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         <!-- @Nullable annotation -->
         <dependency>
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>jackson-databind-nullable</artifactId>
-            <version>0.2.8</version>
+            <version>0.2.9</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/api/AnotherFakeApi.java

@@ -1,5 +1,5 @@
 /*
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.20.0-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.21.0-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
@@ -21,7 +21,7 @@
 
 
 @Validated
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.20.0-SNAPSHOT")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.21.0-SNAPSHOT")
 public interface AnotherFakeApi {
 
     /**

samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/api/FakeApi.java

@@ -1,5 +1,5 @@
 /*
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.20.0-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.21.0-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
@@ -32,7 +32,7 @@
 
 
 @Validated
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.20.0-SNAPSHOT")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.21.0-SNAPSHOT")
 public interface FakeApi {
 
     /**

samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java

@@ -1,5 +1,5 @@
 /*
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.20.0-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.21.0-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
@@ -21,7 +21,7 @@
 
 
 @Validated
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.20.0-SNAPSHOT")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.21.0-SNAPSHOT")
 public interface FakeClassnameTags123Api {
 
     /**

samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/api/PetApi.java

@@ -1,5 +1,5 @@
 /*
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.20.0-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.21.0-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
@@ -25,7 +25,7 @@
 
 
 @Validated
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.20.0-SNAPSHOT")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.21.0-SNAPSHOT")
 public interface PetApi {
 
     /**
@@ -62,7 +62,7 @@ ResponseEntity<Void> addPet(
         accept = { "application/json" }
     )
     ResponseEntity<Void> deletePet(
-        @NotNull  @PathVariable("petId") Long petId,
+         @PathVariable("petId") Long petId,
          @RequestHeader(value = "api_key", required = false) @Nullable String apiKey
     );
 
@@ -120,7 +120,7 @@ ResponseEntity<Set<PetDto>> findPetsByTags(
         accept = { "application/json", "application/xml" }
     )
     ResponseEntity<PetDto> getPetById(
-        @NotNull  @PathVariable("petId") Long petId
+         @PathVariable("petId") Long petId
     );
 
 
@@ -136,7 +136,7 @@ ResponseEntity<PetDto> getPetById(
         accept = { "application/json" }
     )
     ResponseEntity<ResponseObjectWithDifferentFieldNamesDto> responseObjectDifferentNames(
-        @NotNull  @PathVariable("petId") Long petId
+         @PathVariable("petId") Long petId
     );
 
 
@@ -177,7 +177,7 @@ ResponseEntity<Void> updatePet(
         contentType = "application/x-www-form-urlencoded"
     )
     ResponseEntity<Void> updatePetWithForm(
-        @NotNull  @PathVariable("petId") Long petId,
+         @PathVariable("petId") Long petId,
          @Valid @RequestParam(value = "name", required = false) String name,
          @Valid @RequestParam(value = "status", required = false) String status
     );
@@ -199,7 +199,7 @@ ResponseEntity<Void> updatePetWithForm(
         contentType = "multipart/form-data"
     )
     ResponseEntity<ApiResponseDto> uploadFile(
-        @NotNull  @PathVariable("petId") Long petId,
+         @PathVariable("petId") Long petId,
          @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata,
          @RequestPart(value = "file", required = false) MultipartFile file
     );
@@ -221,7 +221,7 @@ ResponseEntity<ApiResponseDto> uploadFile(
         contentType = "multipart/form-data"
     )
     ResponseEntity<ApiResponseDto> uploadFileWithRequiredFile(
-        @NotNull  @PathVariable("petId") Long petId,
+         @PathVariable("petId") Long petId,
          @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile,
          @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata
     );

samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/api/StoreApi.java

@@ -1,5 +1,5 @@
 /*
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.20.0-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.21.0-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
@@ -22,7 +22,7 @@
 
 
 @Validated
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.20.0-SNAPSHOT")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.21.0-SNAPSHOT")
 public interface StoreApi {
 
     /**
@@ -39,7 +39,7 @@ public interface StoreApi {
         accept = { "application/json" }
     )
     ResponseEntity<Void> deleteOrder(
-        @NotNull  @PathVariable("order_id") String orderId
+         @PathVariable("order_id") String orderId
     );
 
 
@@ -74,7 +74,7 @@ ResponseEntity<Map<String, Integer>> getInventory(
         accept = { "application/json", "application/xml" }
     )
     ResponseEntity<OrderDto> getOrderById(
-        @NotNull @Min(value = 1L) @Max(value = 5L)  @PathVariable("order_id") Long orderId
+        @Min(value = 1L) @Max(value = 5L)  @PathVariable("order_id") Long orderId
     );
 
 

samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/api/UserApi.java

@@ -1,5 +1,5 @@
 /*
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.20.0-SNAPSHOT).
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.21.0-SNAPSHOT).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
@@ -22,7 +22,7 @@
 
 
 @Validated
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.20.0-SNAPSHOT")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.21.0-SNAPSHOT")
 public interface UserApi {
 
     /**
@@ -93,7 +93,7 @@ ResponseEntity<Void> createUsersWithListInput(
         accept = { "application/json" }
     )
     ResponseEntity<Void> deleteUser(
-        @NotNull  @PathVariable("username") String username
+         @PathVariable("username") String username
     );
 
 
@@ -112,7 +112,7 @@ ResponseEntity<Void> deleteUser(
         accept = { "application/json", "application/xml" }
     )
     ResponseEntity<UserDto> getUserByName(
-        @NotNull  @PathVariable("username") String username
+         @PathVariable("username") String username
     );
 
 
@@ -168,7 +168,7 @@ ResponseEntity<Void> logoutUser(
         contentType = "application/json"
     )
     ResponseEntity<Void> updateUser(
-        @NotNull  @PathVariable("username") String username,
+         @PathVariable("username") String username,
          @Valid @RequestBody UserDto userDto
     );
 

samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/configuration/HttpInterfacesAbstractConfigurator.java

@@ -1,5 +1,5 @@
 /*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.20.0-SNAPSHOT).
+* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.21.0-SNAPSHOT).
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
@@ -13,51 +13,51 @@
 import org.openapitools.api.UserApi;
 
 import org.springframework.context.annotation.Bean;
-import org.springframework.web.reactive.function.client.WebClient;
-import org.springframework.web.reactive.function.client.support.WebClientAdapter;
+import org.springframework.web.client.RestClient;
+import org.springframework.web.client.support.RestClientAdapter;
 import org.springframework.web.service.invoker.HttpServiceProxyFactory;
 
 public abstract class HttpInterfacesAbstractConfigurator {
 
-    private final WebClient webClient;
+    private final RestClient client;
 
-    public HttpInterfacesAbstractConfigurator(final WebClient webClient) {
-        this.webClient = webClient;
+    public HttpInterfacesAbstractConfigurator(final RestClient client) {
+        this.client = client;
     }
 
     @Bean(name = "org.openapitools.configuration.HttpInterfacesAbstractConfigurator.anotherFake")
     AnotherFakeApi anotherFakeHttpProxy() {
-        HttpServiceProxyFactory factory = HttpServiceProxyFactory.builder(WebClientAdapter.forClient(webClient)).build();
+        HttpServiceProxyFactory factory = HttpServiceProxyFactory.builderFor(RestClientAdapter.create(client)).build();
         return factory.createClient(AnotherFakeApi.class);
     }
 
     @Bean(name = "org.openapitools.configuration.HttpInterfacesAbstractConfigurator.fake")
     FakeApi fakeHttpProxy() {
-        HttpServiceProxyFactory factory = HttpServiceProxyFactory.builder(WebClientAdapter.forClient(webClient)).build();
+        HttpServiceProxyFactory factory = HttpServiceProxyFactory.builderFor(RestClientAdapter.create(client)).build();
         return factory.createClient(FakeApi.class);
     }
 
     @Bean(name = "org.openapitools.configuration.HttpInterfacesAbstractConfigurator.fakeClassnameTags123")
     FakeClassnameTags123Api fakeClassnameTags123HttpProxy() {
-        HttpServiceProxyFactory factory = HttpServiceProxyFactory.builder(WebClientAdapter.forClient(webClient)).build();
+        HttpServiceProxyFactory factory = HttpServiceProxyFactory.builderFor(RestClientAdapter.create(client)).build();
         return factory.createClient(FakeClassnameTags123Api.class);
     }
 
     @Bean(name = "org.openapitools.configuration.HttpInterfacesAbstractConfigurator.pet")
     PetApi petHttpProxy() {
-        HttpServiceProxyFactory factory = HttpServiceProxyFactory.builder(WebClientAdapter.forClient(webClient)).build();
+        HttpServiceProxyFactory factory = HttpServiceProxyFactory.builderFor(RestClientAdapter.create(client)).build();
         return factory.createClient(PetApi.class);
     }
 
     @Bean(name = "org.openapitools.configuration.HttpInterfacesAbstractConfigurator.store")
     StoreApi storeHttpProxy() {
-        HttpServiceProxyFactory factory = HttpServiceProxyFactory.builder(WebClientAdapter.forClient(webClient)).build();
+        HttpServiceProxyFactory factory = HttpServiceProxyFactory.builderFor(RestClientAdapter.create(client)).build();
         return factory.createClient(StoreApi.class);
     }
 
     @Bean(name = "org.openapitools.configuration.HttpInterfacesAbstractConfigurator.user")
     UserApi userHttpProxy() {
-        HttpServiceProxyFactory factory = HttpServiceProxyFactory.builder(WebClientAdapter.forClient(webClient)).build();
+        HttpServiceProxyFactory factory = HttpServiceProxyFactory.builderFor(RestClientAdapter.create(client)).build();
         return factory.createClient(UserApi.class);
     }