Skip to content

Commit f0284f3

Browse files
author
eugenp
committed
fixes - spelling and security work
1 parent 30f53b7 commit f0284f3

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

guava/src/test/java/org/baeldung/guava/GuavaCollectionTypesTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public void whenCalculatingSetIntersection_thenCorrect() {
149149
}
150150

151151
@Test
152-
public void whenCalculatingSetSymetricDifference_thenCorrect() {
152+
public void whenCalculatingSetSymmetricDifference_thenCorrect() {
153153
final Set<Character> first = ImmutableSet.of('a', 'b', 'c');
154154
final Set<Character> second = ImmutableSet.of('b', 'c', 'd');
155155

spring-security-login-and-registration/src/main/java/org/baeldung/security/MyUserDetailsService.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package org.baeldung.security;
22

33
import java.util.ArrayList;
4-
import java.util.Arrays;
54
import java.util.Collection;
65
import java.util.List;
76

87
import javax.servlet.http.HttpServletRequest;
98

10-
import org.baeldung.persistence.dao.RoleRepository;
119
import org.baeldung.persistence.dao.UserRepository;
1210
import org.baeldung.persistence.model.Privilege;
1311
import org.baeldung.persistence.model.Role;
@@ -28,9 +26,6 @@ public class MyUserDetailsService implements UserDetailsService {
2826
@Autowired
2927
private UserRepository userRepository;
3028

31-
@Autowired
32-
private RoleRepository roleRepository;
33-
3429
@Autowired
3530
private LoginAttemptService loginAttemptService;
3631

@@ -53,7 +48,7 @@ public UserDetails loadUserByUsername(final String email) throws UsernameNotFoun
5348
try {
5449
final User user = userRepository.findByEmail(email);
5550
if (user == null) {
56-
return new org.springframework.security.core.userdetails.User(" ", " ", true, true, true, true, getAuthorities(Arrays.asList(roleRepository.findByName("ROLE_USER"))));
51+
throw new UsernameNotFoundException("No user found with username: " + email);
5752
}
5853

5954
return new org.springframework.security.core.userdetails.User(user.getEmail(), user.getPassword(), user.isEnabled(), true, true, true, getAuthorities(user.getRoles()));
@@ -90,8 +85,9 @@ private final List<GrantedAuthority> getGrantedAuthorities(final List<String> pr
9085

9186
private String getClientIP() {
9287
final String xfHeader = request.getHeader("X-Forwarded-For");
93-
if (xfHeader == null)
88+
if (xfHeader == null) {
9489
return request.getRemoteAddr();
90+
}
9591
return xfHeader.split(",")[0];
9692
}
9793
}

0 commit comments

Comments
 (0)