fix imports

Author: Picazsoo

modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-http-interface/api.mustache

@@ -16,12 +16,12 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.service.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-{{#reactive}}
 {{#useBeanValidation}}
 import {{javaxPackage}}.validation.Valid;
 import {{javaxPackage}}.validation.constraints.*;
 {{^useSpringBuiltInValidation}}import org.springframework.validation.annotation.Validated;{{/useSpringBuiltInValidation}}
 {{/useBeanValidation}}
+{{#reactive}}
 
 import org.springframework.http.codec.multipart.Part;
 import reactor.core.publisher.Flux;

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

@@ -10,6 +10,9 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.service.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.*;
+import org.springframework.validation.annotation.Validated;
 
 import java.util.List;
 import java.util.Map;

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

@@ -21,6 +21,9 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.service.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.*;
+import org.springframework.validation.annotation.Validated;
 
 import java.util.List;
 import java.util.Map;

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

@@ -10,6 +10,9 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.service.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.*;
+import org.springframework.validation.annotation.Validated;
 
 import java.util.List;
 import java.util.Map;

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

@@ -14,6 +14,9 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.service.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.*;
+import org.springframework.validation.annotation.Validated;
 
 import java.util.List;
 import java.util.Map;

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

@@ -11,6 +11,9 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.service.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.*;
+import org.springframework.validation.annotation.Validated;
 
 import java.util.List;
 import java.util.Map;

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

@@ -11,6 +11,9 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.service.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.*;
+import org.springframework.validation.annotation.Validated;
 
 import java.util.List;
 import java.util.Map;

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

@@ -1,180 +0,0 @@
-/*
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.20.0-SNAPSHOT).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-package org.openapitools.api;
-
-import java.time.OffsetDateTime;
-import org.openapitools.model.UserDto;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.service.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import jakarta.annotation.Generated;
-
-
-
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.20.0-SNAPSHOT")
-public interface UserApi {
-
-    /**
-     * POST /user : Create user
-     * This can only be done by the logged in user.
-     *
-     * @param userDto Created user object (required)
-     * @return successful operation (status code 200)
-     */
-    @ResponseStatus(HttpStatus.OK)
-    @HttpExchange(
-        method = "POST",
-        value = "/user",
-        accept = { "application/json" },
-        contentType = "application/json"
-    )
-    void createUser(
-         @RequestBody UserDto userDto
-    );
-
-
-    /**
-     * POST /user/createWithArray : Creates list of users with given input array
-     * 
-     *
-     * @param userDto List of user object (required)
-     * @return successful operation (status code 200)
-     */
-    @ResponseStatus(HttpStatus.OK)
-    @HttpExchange(
-        method = "POST",
-        value = "/user/createWithArray",
-        accept = { "application/json" },
-        contentType = "application/json"
-    )
-    void createUsersWithArrayInput(
-         @RequestBody List<UserDto> userDto
-    );
-
-
-    /**
-     * POST /user/createWithList : Creates list of users with given input array
-     * 
-     *
-     * @param userDto List of user object (required)
-     * @return successful operation (status code 200)
-     */
-    @ResponseStatus(HttpStatus.OK)
-    @HttpExchange(
-        method = "POST",
-        value = "/user/createWithList",
-        accept = { "application/json" },
-        contentType = "application/json"
-    )
-    void createUsersWithListInput(
-         @RequestBody List<UserDto> userDto
-    );
-
-
-    /**
-     * DELETE /user/{username} : Delete user
-     * This can only be done by the logged in user.
-     *
-     * @param username The name that needs to be deleted (required)
-     * @return Invalid username supplied (status code 400)
-     *         or User not found (status code 404)
-     */
-    @ResponseStatus(HttpStatus.BAD_REQUEST)
-    @HttpExchange(
-        method = "DELETE",
-        value = "/user/{username}",
-        accept = { "application/json" }
-    )
-    void deleteUser(
-         @PathVariable("username") String username
-    );
-
-
-    /**
-     * GET /user/{username} : Get user by user name
-     * 
-     *
-     * @param username The name that needs to be fetched. Use user1 for testing. (required)
-     * @return successful operation (status code 200)
-     *         or Invalid username supplied (status code 400)
-     *         or User not found (status code 404)
-     */
-    @ResponseStatus(HttpStatus.OK)
-    @HttpExchange(
-        method = "GET",
-        value = "/user/{username}",
-        accept = { "application/json", "application/xml" }
-    )
-    UserDto getUserByName(
-         @PathVariable("username") String username
-    );
-
-
-    /**
-     * GET /user/login : Logs user into the system
-     * 
-     *
-     * @param username The user name for login (required)
-     * @param password The password for login in clear text (required)
-     * @return successful operation (status code 200)
-     *         or Invalid username/password supplied (status code 400)
-     */
-    @ResponseStatus(HttpStatus.OK)
-    @HttpExchange(
-        method = "GET",
-        value = "/user/login",
-        accept = { "application/json", "application/xml" }
-    )
-    String loginUser(
-         @RequestParam(value = "username", required = true) String username,
-         @RequestParam(value = "password", required = true) String password
-    );
-
-
-    /**
-     * GET /user/logout : Logs out current logged in user session
-     * 
-     *
-     * @return successful operation (status code 200)
-     */
-    @ResponseStatus(HttpStatus.OK)
-    @HttpExchange(
-        method = "GET",
-        value = "/user/logout",
-        accept = { "application/json" }
-    )
-    void logoutUser(
-        
-    );
-
-
-    /**
-     * PUT /user/{username} : Updated user
-     * This can only be done by the logged in user.
-     *
-     * @param username name that need to be deleted (required)
-     * @param userDto Updated user object (required)
-     * @return Invalid user supplied (status code 400)
-     *         or User not found (status code 404)
-     */
-    @ResponseStatus(HttpStatus.BAD_REQUEST)
-    @HttpExchange(
-        method = "PUT",
-        value = "/user/{username}",
-        accept = { "application/json" },
-        contentType = "application/json"
-    )
-    void updateUser(
-         @PathVariable("username") String username,
-         @RequestBody UserDto userDto
-    );
-
-}