Skip to content

Commit

Permalink
Refactor to use Optional
Browse files Browse the repository at this point in the history
  • Loading branch information
leung018 committed Nov 11, 2024
1 parent b45cc38 commit c818f3b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class AuthController {
@PostMapping("/signup")
@ResponseStatus(HttpStatus.CREATED)
public void signup(@Valid @RequestBody AuthController.UserCredentials userCredentials) {
if (this.userRepository.findByUsername(userCredentials.username()) != null) {
if (this.userRepository.findByUsername(userCredentials.username()).isPresent()) {
throw new UsernameAlreadyExistsException(userCredentials.username());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ public class CustomUserDetailService implements UserDetailsService {

@Override
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
return repository.findByUsername(username); // TODO: Handle case that user is not found
return repository
.findByUsername(username)
.orElseThrow(() -> new UsernameNotFoundException(username + " not found"));
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package com.leungcheng.spring_simple_backend.domain;

import java.util.Optional;
import org.springframework.data.repository.CrudRepository;

public interface UserRepository extends CrudRepository<User, String> {
User findByUsername(String username);
Optional<User> findByUsername(String username);
}

0 comments on commit c818f3b

Please sign in to comment.