Update checkstyle

api/src/main/java/com/rednavis/api/MaasApiApplication.java

@@ -1,13 +1,14 @@
 package com.rednavis.api;
 
+import java.util.Set;
+
 import com.rednavis.auth.AuthModule;
 import com.rednavis.auth.service.password.PasswordService;
 import com.rednavis.core.CoreModule;
 import com.rednavis.database.DatabaseModule;
 import com.rednavis.database.service.UserService;
 import com.rednavis.shared.dto.user.RoleEnum;
 import com.rednavis.shared.dto.user.User;
-import java.util.Set;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;

api/src/main/java/com/rednavis/api/exception/ErrorAttributesExceptionHandler.java

@@ -1,7 +1,8 @@
 package com.rednavis.api.exception;
 
-import com.rednavis.shared.rest.response.ErrorResponse;
 import java.util.Map;
+
+import com.rednavis.shared.rest.response.ErrorResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.web.reactive.error.DefaultErrorAttributes;

api/src/main/java/com/rednavis/api/exception/ErrorResponseComposer.java

@@ -1,12 +1,13 @@
 package com.rednavis.api.exception;
 
-import com.rednavis.api.exception.handlers.AbstractExceptionHandler;
-import com.rednavis.shared.rest.response.ErrorResponse;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+
+import com.rednavis.api.exception.handlers.AbstractExceptionHandler;
+import com.rednavis.shared.rest.response.ErrorResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 import org.springframework.stereotype.Component;

api/src/main/java/com/rednavis/api/exception/ExceptionUtils.java

@@ -1,6 +1,7 @@
 package com.rednavis.api.exception;
 
 import java.util.function.Function;
+
 import lombok.experimental.UtilityClass;
 
 @UtilityClass

api/src/test/java/com/rednavis/api/MongoDbContainer.java

@@ -1,6 +1,7 @@
 package com.rednavis.api;
 
 import javax.validation.constraints.NotNull;
+
 import org.testcontainers.containers.GenericContainer;
 
 public class MongoDbContainer extends GenericContainer<MongoDbContainer> {

api/src/test/java/com/rednavis/auth/service/auth/AuthServiceTest.java

@@ -5,6 +5,8 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import java.time.Instant;
+
 import com.rednavis.api.MaasApiApplication;
 import com.rednavis.api.MaasApiApplicationTest;
 import com.rednavis.auth.jwt.JwtTokenEnum;
@@ -18,7 +20,6 @@
 import com.rednavis.shared.rest.request.SignInRequest;
 import com.rednavis.shared.rest.response.SignInResponse;
 import com.rednavis.shared.security.CurrentUser;
-import java.time.Instant;
 import lombok.RequiredArgsConstructor;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;

auth/src/main/java/com/rednavis/auth/config/PasswordConfig.java

@@ -1,5 +1,8 @@
 package com.rednavis.auth.config;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import edu.vt.middleware.password.AlphabeticalCharacterRule;
 import edu.vt.middleware.password.AlphabeticalSequenceRule;
 import edu.vt.middleware.password.DigitCharacterRule;
@@ -13,8 +16,6 @@
 import edu.vt.middleware.password.Rule;
 import edu.vt.middleware.password.UppercaseCharacterRule;
 import edu.vt.middleware.password.WhitespaceRule;
-import java.util.ArrayList;
-import java.util.List;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

auth/src/main/java/com/rednavis/auth/config/SecurityConfig.java

@@ -3,9 +3,10 @@
 import static com.rednavis.shared.util.RestUrlUtils.AUTH_URL_PATTERN;
 import static com.rednavis.shared.util.RestUrlUtils.BOOK_URL_PATTERN;
 
+import java.util.List;
+
 import com.rednavis.auth.security.JwtReactiveAuthenticationManager;
 import com.rednavis.auth.security.JwtServerSecurityContextRepository;
-import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

auth/src/main/java/com/rednavis/auth/jwt/JwtTokenService.java

@@ -2,6 +2,14 @@
 
 import static java.time.Instant.now;
 
+import java.text.ParseException;
+import java.time.Instant;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 import com.nimbusds.jose.JOSEException;
 import com.nimbusds.jose.JWSAlgorithm;
 import com.nimbusds.jose.JWSHeader;
@@ -14,13 +22,6 @@
 import com.rednavis.core.exception.JwtRefreshTokenExpiredException;
 import com.rednavis.shared.dto.user.RoleEnum;
 import com.rednavis.shared.security.CurrentUser;
-import java.text.ParseException;
-import java.time.Instant;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpHeaders;

auth/src/main/java/com/rednavis/auth/security/JwtReactiveAuthenticationManager.java

@@ -2,11 +2,12 @@
 
 import static com.rednavis.core.mapper.MapperProvider.CURRENT_USER_MAPPER;
 
+import java.util.Collection;
+import java.util.stream.Collectors;
+
 import com.rednavis.database.service.UserService;
 import com.rednavis.shared.dto.user.User;
 import com.rednavis.shared.security.CurrentUser;
-import java.util.Collection;
-import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.authentication.BadCredentialsException;

auth/src/main/java/com/rednavis/auth/security/JwtServerSecurityContextRepository.java

@@ -2,11 +2,12 @@
 
 import static com.rednavis.shared.util.StringUtils.BEARER_SPACE;
 
-import com.rednavis.auth.jwt.JwtTokenEnum;
-import com.rednavis.auth.jwt.JwtTokenService;
 import java.util.Objects;
 import java.util.function.Predicate;
 import java.util.function.UnaryOperator;
+
+import com.rednavis.auth.jwt.JwtTokenEnum;
+import com.rednavis.auth.jwt.JwtTokenService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextImpl;

auth/src/main/java/com/rednavis/auth/service/auth/AuthServiceImpl.java

@@ -3,6 +3,10 @@
 import static com.rednavis.core.mapper.MapperProvider.CURRENT_USER_MAPPER;
 import static com.rednavis.database.mapper.MapperProvider.USER_MAPPER;
 
+import java.time.Instant;
+import java.util.Objects;
+import java.util.Set;
+
 import com.rednavis.auth.jwt.JwtTokenEnum;
 import com.rednavis.auth.jwt.JwtTokenInfo;
 import com.rednavis.auth.jwt.JwtTokenService;
@@ -21,9 +25,6 @@
 import com.rednavis.shared.rest.response.SignUpResponse;
 import com.rednavis.shared.security.CurrentUser;
 import com.rednavis.shared.util.StringUtils;
-import java.time.Instant;
-import java.util.Objects;
-import java.util.Set;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;

auth/src/main/java/com/rednavis/auth/service/password/PasswordServiceImpl.java

@@ -1,12 +1,13 @@
 package com.rednavis.auth.service.password;
 
+import java.util.Collections;
+import java.util.List;
+
 import com.rednavis.core.exception.MaasApiException;
 import edu.vt.middleware.password.Password;
 import edu.vt.middleware.password.PasswordData;
 import edu.vt.middleware.password.PasswordValidator;
 import edu.vt.middleware.password.RuleResult;
-import java.util.Collections;
-import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

auth/src/main/java/com/rednavis/auth/service/password/PasswordUtils.java

@@ -6,6 +6,7 @@
 import java.util.Base64;
 import javax.crypto.SecretKeyFactory;
 import javax.crypto.spec.PBEKeySpec;
+
 import lombok.experimental.UtilityClass;
 
 @UtilityClass

auth/src/test/java/com/rednavis/auth/service/password/PasswordServiceTest.java

@@ -6,12 +6,13 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
+import java.util.List;
+import java.util.Map;
+
 import edu.vt.middleware.password.PasswordData;
 import edu.vt.middleware.password.PasswordValidator;
 import edu.vt.middleware.password.RuleResult;
 import edu.vt.middleware.password.RuleResultDetail;
-import java.util.List;
-import java.util.Map;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;

build.gradle

@@ -11,10 +11,10 @@ ext {
     lombokVersion = '1.18.12'
     mapstructVersion = '1.3.1.Final'
     springBootVersion = '2.2.5.RELEASE'
-    springDocVersion = '1.2.33'
+    springDocVersion = '1.3.0'
     nimbusJoseJwtVersion = '8.10'
     vtPasswordVersion = '3.1.2'
-    jupiterVersion = '5.6.0'
+    jupiterVersion = '5.6.1'
     testcontainersVersion = '1.13.0'
     reactorTestVersion = '3.3.3.RELEASE'
 }

config/checkstyle/checkstyle.xml

@@ -226,7 +226,7 @@
     <module name="CustomImportOrder">
       <property name="sortImportsInGroupAlphabetically" value="true"/>
       <property name="separateLineBetweenGroups" value="true"/>
-      <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
+      <property name="customImportOrderRules" value="STATIC###STANDARD_JAVA_PACKAGE###THIRD_PARTY_PACKAGE"/>
       <property name="tokens" value="IMPORT, STATIC_IMPORT, PACKAGE_DEF"/>
     </module>
     <module name="MethodParamPad">

core/src/main/java/com/rednavis/core/service/CurrentUserServiceImpl.java

@@ -1,7 +1,8 @@
 package com.rednavis.core.service;
 
-import com.rednavis.shared.security.CurrentUser;
 import java.util.Objects;
+
+import com.rednavis.shared.security.CurrentUser;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.ReactiveSecurityContextHolder;

database/src/main/java/com/rednavis/database/entity/AbstractEntity.java

@@ -1,6 +1,7 @@
 package com.rednavis.database.entity;
 
 import java.time.Instant;
+
 import org.springframework.data.annotation.CreatedBy;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedBy;

database/src/main/java/com/rednavis/database/entity/RefreshTokenEntity.java

@@ -1,6 +1,7 @@
 package com.rednavis.database.entity;
 
 import java.time.Instant;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springframework.data.annotation.Id;

database/src/main/java/com/rednavis/database/entity/UserEntity.java

@@ -1,7 +1,8 @@
 package com.rednavis.database.entity;
 
-import com.rednavis.shared.dto.user.RoleEnum;
 import java.util.Set;
+
+import com.rednavis.shared.dto.user.RoleEnum;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springframework.data.annotation.Id;

database/src/main/java/com/rednavis/database/mapper/UserMapper.java

@@ -1,8 +1,9 @@
 package com.rednavis.database.mapper;
 
+import java.util.List;
+
 import com.rednavis.database.entity.UserEntity;
 import com.rednavis.shared.dto.user.User;
-import java.util.List;
 import org.mapstruct.Mapper;
 
 @Mapper

database/src/main/java/com/rednavis/database/repository/GlobalReactiveMongoRepository.java

@@ -1,6 +1,7 @@
 package com.rednavis.database.repository;
 
 import java.io.Serializable;
+
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
 import org.springframework.data.repository.NoRepositoryBean;

database/src/main/java/com/rednavis/database/repository/GlobalReactiveMongoRepositoryImpl.java

@@ -1,6 +1,7 @@
 package com.rednavis.database.repository;
 
 import java.io.Serializable;
+
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.mongodb.core.ReactiveMongoOperations;
 import org.springframework.data.mongodb.core.query.Query;