code improvement

Author: pateluday07

src/main/java/com/github/pateluday07/graphqlspringbootdemo/config/security/CustomUserDetail.java

@@ -6,6 +6,7 @@
 import org.springframework.security.core.userdetails.UserDetails;
 
 import java.util.Collection;
+import java.util.Collections;
 
 @NoArgsConstructor
 public class CustomUserDetail implements UserDetails {
@@ -20,7 +21,7 @@ public CustomUserDetail(Owner owner){
 
  @Override
  public Collection<? extends GrantedAuthority> getAuthorities() {
- return null;
+ return Collections.emptyList();
  }
 
  @Override

src/main/java/com/github/pateluday07/graphqlspringbootdemo/config/security/JwtRequestFilter.java

@@ -40,7 +40,7 @@ protected void doFilterInternal(HttpServletRequest request, @NotNull HttpServlet
 
  UserDetails userDetails = this.userDetailService.loadUserByUsername(userName);
 
- if (jwtUtil.validateToken(jwt, userDetails)) {
+ if (Boolean.TRUE.equals(jwtUtil.validateToken(jwt, userDetails))) {
 
  UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken = new UsernamePasswordAuthenticationToken(
  userDetails, userDetails.getPassword(), userDetails.getAuthorities());

src/main/java/com/github/pateluday07/graphqlspringbootdemo/config/security/SecurityConfig.java

@@ -30,7 +30,9 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
 
  @Override
  protected void configure(AuthenticationManagerBuilder auth) throws Exception {
- auth.userDetailsService(userDetailService);
+ auth
+ .userDetailsService(userDetailService)
+ .passwordEncoder(passwordEncoder());
  }
 
  @Bean
@@ -54,7 +56,7 @@ protected void configure(HttpSecurity http) throws Exception {
  .permitAll()
  .antMatchers("/vendor/**", "/playground")
  .permitAll()
- .antMatchers("/*.ico","/altair")
+ .antMatchers("/*.ico", "/altair")
  .permitAll()
  .antMatchers("/voyager")
  .permitAll()

src/main/java/com/github/pateluday07/graphqlspringbootdemo/dto/CarOwnerDto.java

@@ -5,9 +5,6 @@
 import lombok.Setter;
 import lombok.ToString;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @Getter
 @Setter
 @ToString

src/main/java/com/github/pateluday07/graphqlspringbootdemo/exception/CustomException.java

@@ -4,6 +4,7 @@
 import graphql.GraphQLError;
 import graphql.language.SourceLocation;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -13,8 +14,8 @@
 
 public class CustomException extends RuntimeException implements GraphQLError {
 
- private Integer errorCode;
- private String errorMessage;
+ private final Integer errorCode;
+ private final String errorMessage;
 
  public CustomException(Integer errorCode, String errorMessage) {
  super(errorMessage);
@@ -24,7 +25,7 @@ public CustomException(Integer errorCode, String errorMessage) {
 
  @Override
  public List<SourceLocation> getLocations() {
- return null;
+ return Collections.emptyList();
  }
 
  @Override

src/main/java/com/github/pateluday07/graphqlspringbootdemo/service/OwnerServiceImpl.java

@@ -100,7 +100,7 @@ private void checkIfOwnerExistsById(Long id) {
  private void validateRegistrationDto(RegistrationDto registrationDto) {
  if (!EmailValidator.getInstance().isValid(registrationDto.getEmail()))
  throw new CustomException(Constants.BAD_REQUEST_ERROR_CODE, Constants.INVALID_EMAIL_ERROR_MSG);
- if (ownerRepository.existsByEmail(registrationDto.getEmail()))
+ if (Boolean.TRUE.equals(ownerRepository.existsByEmail(registrationDto.getEmail())))
  throw new CustomException(Constants.BAD_REQUEST_ERROR_CODE, Constants.EMAIL_ALREADY_EXISTS_ERROR_MSG);
  if (!registrationDto.getPassword().equals(registrationDto.getConfirmPassword()))
  throw new CustomException(Constants.BAD_REQUEST_ERROR_CODE, Constants.CONFIRM_PASSWORD_DOES_NOT_MATCH_ERROR_MSG);

src/test/java/com/github/pateluday07/graphqlspringbootdemo/service/AuthenticationServiceImplUnitTest.java

@@ -0,0 +1,18 @@
+package com.github.pateluday07.graphqlspringbootdemo.service;
+
+import com.github.pateluday07.graphqlspringbootdemo.config.security.JwtUtil;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.security.authentication.AuthenticationManager;
+
+@ExtendWith(MockitoExtension.class)
+public class AuthenticationServiceImplUnitTest {
+
+ @Mock
+ private JwtUtil jwtUtil;
+ @Mock
+ private AuthenticationManager authenticationManager;
+
+
+}