resolved conflicts
This commit is contained in:
@@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMethod;
|
||||
|
||||
@Validated
|
||||
//@RequestMapping("/user")
|
||||
public interface UserApi {
|
||||
|
||||
@Operation(summary = "Api to create user",
|
||||
@@ -39,7 +38,7 @@ public interface UserApi {
|
||||
produces = {"application/json"},
|
||||
method = RequestMethod.POST)
|
||||
default ResponseEntity<Response<UserResponseBean>> createUser(
|
||||
@Parameter(description = "User request object", required = true) @Valid @RequestBody UserReq userReq) {
|
||||
@Parameter(description = "User request object", required = true) @Validated @RequestBody UserReq userReq) {
|
||||
return new ResponseEntity<Response<UserResponseBean>>(HttpStatus.NOT_IMPLEMENTED);
|
||||
}
|
||||
|
||||
|
||||
@@ -32,8 +32,7 @@ public class UserApiController implements UserApi {
|
||||
private UserService userService;
|
||||
|
||||
@Override
|
||||
public ResponseEntity<Response<UserResponseBean>> createUser(
|
||||
@Valid @RequestBody UserReq userReq) {
|
||||
public ResponseEntity<Response<UserResponseBean>> createUser(@RequestBody UserReq userReq) {
|
||||
log.info("Create User with - Request Body: {}", userReq);
|
||||
UserResponseBean createdUser = userService.createUser(userReq);
|
||||
return ResponseEntity.status(HttpStatus.CREATED)
|
||||
|
||||
Reference in New Issue
Block a user