Made Validation errors unit testable

Author: naturalprogrammer

pom.xml

@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.0.RELEASE</version>
+		<version>2.3.2.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 

spring-lemon-commons-web/src/main/java/com/naturalprogrammer/spring/lemon/commonsweb/security/LemonCommonsWebTokenAuthenticationFilter.java

@@ -7,6 +7,7 @@
 import com.naturalprogrammer.spring.lemon.exceptions.util.LexUtils;
 import com.nimbusds.jwt.JWTClaimsSet;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.http.HttpHeaders;
@@ -26,11 +27,10 @@
  * Filter for token authentication
  */
 @AllArgsConstructor
+@Slf4j
 public class LemonCommonsWebTokenAuthenticationFilter extends OncePerRequestFilter {
 
-    private static final Log log = LogFactory.getLog(LemonCommonsWebTokenAuthenticationFilter.class);
-    
-    private BlueTokenService blueTokenService;
+    private final BlueTokenService blueTokenService;
 
 	@Override
 	protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
@@ -54,7 +54,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 
 		    } catch (Exception e) {
 
-				log.debug("Token authentication failed - " + e.getMessage());
+				log.debug("Token authentication failed - {}", e.getMessage());
 
 		    	response.sendError(HttpServletResponse.SC_UNAUTHORIZED,
 						"Authentication Failed: " + e.getMessage());
@@ -83,9 +83,6 @@ protected Authentication createAuthToken(String token) {
 
 	/**
 	 * Default behaviour is to throw error. To be overridden in auth service.
-	 * 
-	 * @param username
-	 * @return
 	 */
 	protected UserDto fetchUserDto(JWTClaimsSet claims) {
 		throw new AuthenticationCredentialsNotFoundException(

spring-lemon-exceptions/src/main/java/com/naturalprogrammer/spring/lemon/exceptions/LemonExceptionsAutoConfiguration.java

@@ -2,6 +2,7 @@
 
 import com.naturalprogrammer.spring.lemon.exceptions.handlers.AbstractExceptionHandler;
 import com.naturalprogrammer.spring.lemon.exceptions.util.LexUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
@@ -18,10 +19,9 @@
 @Configuration
 @AutoConfigureBefore({ValidationAutoConfiguration.class})
 @ComponentScan(basePackageClasses=AbstractExceptionHandler.class)
+@Slf4j
 public class LemonExceptionsAutoConfiguration {
 
-	private static final Log log = LogFactory.getLog(LemonExceptionsAutoConfiguration.class);
-
 	public LemonExceptionsAutoConfiguration() {
 		log.info("Created");
 	}
@@ -48,13 +48,7 @@ ErrorResponseComposer<T> errorResponseComposer(List<AbstractExceptionHandler<T>>
 	public ExceptionIdMaker exceptionIdMaker() {
 
         log.info("Configuring ExceptionIdMaker");
-        return ex -> {
-        	
-        	if (ex == null)
-        		return null;
-        	
-        	return ex.getClass().getSimpleName();
-        };
+        return LexUtils.EXCEPTION_ID_MAKER;
 	}
 
 

spring-lemon-exceptions/src/main/java/com/naturalprogrammer/spring/lemon/exceptions/util/LexUtils.java

@@ -2,30 +2,40 @@
 
 import com.naturalprogrammer.spring.lemon.exceptions.ExceptionIdMaker;
 import com.naturalprogrammer.spring.lemon.exceptions.MultiErrorException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.MessageSource;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.http.HttpStatus;
 import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
 
 import javax.annotation.PostConstruct;
 import javax.validation.ConstraintViolationException;
+import javax.validation.Validation;
+import javax.validation.Validator;
 import java.util.function.Supplier;
 
 /**
  * Useful helper methods
  * 
  * @author Sanjay Patel
  */
+@Slf4j
 public class LexUtils {
-	
-	private static final Log log = LogFactory.getLog(LexUtils.class);
 
 	private static MessageSource messageSource;
 	private static LocalValidatorFactoryBean validator;
 	private static ExceptionIdMaker exceptionIdMaker;
-	
+
+	private static final Validator DEFAULT_VALIDATOR = Validation.buildDefaultValidatorFactory().getValidator();
+	public static final ExceptionIdMaker EXCEPTION_ID_MAKER = ex -> {
+
+		if (ex == null)
+			return null;
+
+		return ex.getClass().getSimpleName();
+	};
+
+
 	public static final MultiErrorException NOT_FOUND_EXCEPTION = new MultiErrorException();
 
 	/**
@@ -59,8 +69,8 @@ public void postConstruct() {
 	 */
 	public static String getMessage(String messageKey, Object... args) {
 
-		if (messageSource == null)
-			return "ApplicationContext unavailable, probably unit test going on";
+		if (messageSource == null) // ApplicationContext unavailable, probably unit test going on
+			return messageKey;
 
 		// http://stackoverflow.com/questions/10792551/how-to-obtain-a-current-user-locale-from-spring-without-passing-it-as-a-paramete
 		return messageSource.getMessage(messageKey, args,
@@ -105,7 +115,7 @@ public static <T> MultiErrorException validateBean(String beanName, T bean, Clas
 	 */
 	public static <T> void ensureFound(T entity) {
 
-		LexUtils.validate(entity != null,
+		validate(entity != null,
 			"com.naturalprogrammer.spring.notFound")
 			.httpStatus(HttpStatus.NOT_FOUND).go();
 	}
@@ -123,22 +133,25 @@ public static Supplier<MultiErrorException> notFoundSupplier() {
 	public static String getExceptionId(Throwable ex) {
 
 		Throwable root = getRootException(ex);
+
+		if (exceptionIdMaker == null) // in unit tests
+			return EXCEPTION_ID_MAKER.make(ex);
+
 		return exceptionIdMaker.make(root);
 	}
 
 
 	private static Throwable getRootException(Throwable ex) {
 
-		if (ex == null) return null;
-			
 		while(ex.getCause() != null)
 			ex = ex.getCause();
 
 		return ex;
 	}
 
 
-	public static LocalValidatorFactoryBean validator() {
-		return validator;
+	public static Validator validator() {
+		return validator == null ? // e.g. in unit tests
+				DEFAULT_VALIDATOR : validator;
 	}
 }