Merge pull request Baeldung#87 from juanivelasco/master

Changing UserService
shirishsharma16 · Oct 21, 2018 · 813d381 · 813d381
2 parents 87dc226 + 84d5296
commit 813d381
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/src/main/java/org/baeldung/service/UserService.java b/src/main/java/org/baeldung/service/UserService.java
@@ -33,7 +33,7 @@
 public class UserService implements IUserService {
 
     @Autowired
-    private UserRepository repository;
+    private UserRepository userRepository;
 
     @Autowired
     private VerificationTokenRepository tokenRepository;
@@ -72,7 +72,7 @@ public User registerNewUserAccount(final UserDto accountDto) {
         user.setEmail(accountDto.getEmail());
         user.setUsing2FA(accountDto.isUsing2FA());
         user.setRoles(Arrays.asList(roleRepository.findByName("ROLE_USER")));
-        return repository.save(user);
+        return userRepository.save(user);
     }
 
     @Override
@@ -91,7 +91,7 @@ public VerificationToken getVerificationToken(final String VerificationToken) {
 
     @Override
     public void saveRegisteredUser(final User user) {
-        repository.save(user);
+        userRepository.save(user);
     }
 
     @Override
@@ -108,7 +108,7 @@ public void deleteUser(final User user) {
             passwordTokenRepository.delete(passwordToken);
         }
 
-        repository.delete(user);
+        userRepository.delete(user);
     }
 
     @Override
@@ -134,7 +134,7 @@ public void createPasswordResetTokenForUser(final User user, final String token)
 
     @Override
     public User findUserByEmail(final String email) {
-        return repository.findByEmail(email);
+        return userRepository.findByEmail(email);
     }
 
     @Override
@@ -150,13 +150,13 @@ public User getUserByPasswordResetToken(final String token) {
 
     @Override
     public Optional<User> getUserByID(final long id) {
-        return repository.findById(id);
+        return userRepository.findById(id);
     }
 
     @Override
     public void changeUserPassword(final User user, final String password) {
         user.setPassword(passwordEncoder.encode(password));
-        repository.save(user);
+        userRepository.save(user);
     }
 
     @Override
@@ -183,7 +183,7 @@ public String validateVerificationToken(String token) {
 
         user.setEnabled(true);
         // tokenRepository.delete(verificationToken);
-        repository.save(user);
+        userRepository.save(user);
         return TOKEN_VALID;
     }
 
@@ -198,15 +198,15 @@ public User updateUser2FA(boolean use2FA) {
             .getAuthentication();
         User currentUser = (User) curAuth.getPrincipal();
         currentUser.setUsing2FA(use2FA);
-        currentUser = repository.save(currentUser);
+        currentUser = userRepository.save(currentUser);
         final Authentication auth = new UsernamePasswordAuthenticationToken(currentUser, currentUser.getPassword(), curAuth.getAuthorities());
         SecurityContextHolder.getContext()
             .setAuthentication(auth);
         return currentUser;
     }
 
     private boolean emailExist(final String email) {
-        return repository.findByEmail(email) != null;
+        return userRepository.findByEmail(email) != null;
     }
 
     @Override
@@ -226,4 +226,4 @@ public List<String> getUsersFromSessionRegistry() {
 
     }
 
-}
+}