#19.: clean up sonar code smells

geyuqiu · Jul 5, 2020 · dd25d81 · dd25d81
1 parent 81e6147
commit dd25d81
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/jhipster/src/main/java/it/economics/kata/security/DomainUserDetailsService.java b/jhipster/src/main/java/it/economics/kata/security/DomainUserDetailsService.java
@@ -39,13 +39,13 @@ public UserDetails loadUserByUsername(final String login) {
 
     if (new EmailValidator().isValid(login, null)) {
       return userRepository.findOneWithAuthoritiesByEmailIgnoreCase(login)
-          .map(user -> createSpringSecurityUser(user))
+          .map(this::createSpringSecurityUser)
         .orElseThrow(() -> new UsernameNotFoundException("User with email " + login + " was not found in the database"));
     }
 
     String lowercaseLogin = login.toLowerCase(Locale.ENGLISH);
     return userRepository.findOneWithAuthoritiesByLogin(lowercaseLogin)
-        .map(user -> createSpringSecurityUser(user))
+        .map(this::createSpringSecurityUser)
       .orElseThrow(() -> new UsernameNotFoundException("User " + lowercaseLogin + " was not found in the database"));
 
   }

diff --git a/jhipster/src/main/java/it/economics/kata/service/UserService.java b/jhipster/src/main/java/it/economics/kata/service/UserService.java
@@ -7,7 +7,6 @@
 import it.economics.kata.repository.UserRepository;
 import it.economics.kata.security.SecurityUtils;
 import it.economics.kata.service.dto.UserDTO;
-import org.springframework.cache.CacheManager;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
@@ -28,7 +27,7 @@ public class UserService {
 
     private final AuthorityRepository authorityRepository;
 
-    public UserService(UserRepository userRepository, AuthorityRepository authorityRepository, CacheManager cacheManager) {
+    public UserService(UserRepository userRepository, AuthorityRepository authorityRepository) {
         this.userRepository = userRepository;
         this.authorityRepository = authorityRepository;
     }

diff --git a/jhipster/src/test/java/it/economics/kata/security/DomainUserDetailsServiceIT.java b/jhipster/src/test/java/it/economics/kata/security/DomainUserDetailsServiceIT.java
@@ -21,7 +21,7 @@
  */
 @SpringBootTest(classes = SfoGateAssignmentProblemApp.class)
 @Transactional
-public class DomainUserDetailsServiceIT {
+class DomainUserDetailsServiceIT {
 
   private static final String USER_ONE_LOGIN = "test-user-one";
   private static final String USER_ONE_EMAIL = "test-user-one@localhost";
@@ -37,7 +37,7 @@ public class DomainUserDetailsServiceIT {
   private UserDetailsService domainUserDetailsService;
 
   @BeforeEach
-  public void init() {
+  void init() {
     User userOne = new User();
     userOne.setLogin(USER_ONE_LOGIN);
     userOne.setPassword(RandomStringUtils.random(60));
@@ -67,35 +67,35 @@ public void init() {
   }
 
   @Test
-  public void assertThatUserCanBeFoundByLogin() {
+  void assertThatUserCanBeFoundByLogin() {
     UserDetails userDetails = domainUserDetailsService.loadUserByUsername(USER_ONE_LOGIN);
     assertThat(userDetails).isNotNull();
     assertThat(userDetails.getUsername()).isEqualTo(USER_ONE_LOGIN);
   }
 
   @Test
-  public void assertThatUserCanBeFoundByLoginIgnoreCase() {
+  void assertThatUserCanBeFoundByLoginIgnoreCase() {
     UserDetails userDetails = domainUserDetailsService.loadUserByUsername(USER_ONE_LOGIN.toUpperCase(Locale.ENGLISH));
     assertThat(userDetails).isNotNull();
     assertThat(userDetails.getUsername()).isEqualTo(USER_ONE_LOGIN);
   }
 
   @Test
-  public void assertThatUserCanBeFoundByEmail() {
+  void assertThatUserCanBeFoundByEmail() {
     UserDetails userDetails = domainUserDetailsService.loadUserByUsername(USER_TWO_EMAIL);
     assertThat(userDetails).isNotNull();
     assertThat(userDetails.getUsername()).isEqualTo(USER_TWO_LOGIN);
   }
 
   @Test
-  public void assertThatUserCanBeFoundByEmailIgnoreCase() {
+  void assertThatUserCanBeFoundByEmailIgnoreCase() {
     UserDetails userDetails = domainUserDetailsService.loadUserByUsername(USER_TWO_EMAIL.toUpperCase(Locale.ENGLISH));
     assertThat(userDetails).isNotNull();
     assertThat(userDetails.getUsername()).isEqualTo(USER_TWO_LOGIN);
   }
 
   @Test
-  public void assertThatEmailIsPrioritizedOverLogin() {
+  void assertThatEmailIsPrioritizedOverLogin() {
     UserDetails userDetails = domainUserDetailsService.loadUserByUsername(USER_ONE_EMAIL);
     assertThat(userDetails).isNotNull();
     assertThat(userDetails.getUsername()).isEqualTo(USER_ONE_LOGIN);

diff --git a/jhipster/src/test/java/it/economics/kata/security/jwt/TokenProviderTest.java b/jhipster/src/test/java/it/economics/kata/security/jwt/TokenProviderTest.java
@@ -42,7 +42,8 @@ void setup() {
     void testReturnFalseWhenJWThasInvalidSignature() {
         boolean isTokenValid = tokenProvider.validateToken(createTokenWithDifferentSignature());
 
-        assertThat(isTokenValid).isEqualTo(false);
+        assertThat(isTokenValid).isFalse();
+        ;
     }
 
     @Test
@@ -52,7 +53,7 @@ void testReturnFalseWhenJWTisMalformed() {
         String invalidToken = token.substring(1);
         boolean isTokenValid = tokenProvider.validateToken(invalidToken);
 
-        assertThat(isTokenValid).isEqualTo(false);
+        assertThat(isTokenValid).isFalse();
     }
 
     @Test
@@ -64,7 +65,7 @@ void testReturnFalseWhenJWTisExpired() {
 
         boolean isTokenValid = tokenProvider.validateToken(token);
 
-        assertThat(isTokenValid).isEqualTo(false);
+        assertThat(isTokenValid).isFalse();
     }
 
     @Test
@@ -73,14 +74,14 @@ void testReturnFalseWhenJWTisUnsupported() {
 
         boolean isTokenValid = tokenProvider.validateToken(unsupportedToken);
 
-        assertThat(isTokenValid).isEqualTo(false);
+        assertThat(isTokenValid).isFalse();
     }
 
     @Test
     void testReturnFalseWhenJWTisInvalid() {
         boolean isTokenValid = tokenProvider.validateToken("");
 
-        assertThat(isTokenValid).isEqualTo(false);
+        assertThat(isTokenValid).isFalse();
     }
 
     private Authentication createAuthentication() {