Merge pull request #44 from wreulicke/feature/update-spring-boot

Update spring boot to 2.x from 1.x

Author: dai0304

gradle.properties

@@ -1,5 +1,5 @@
 # dependency versions
-springBootVersion = 1.5.9.RELEASE
+springBootVersion = 2.0.6.RELEASE
 springSecurityOauth2Version = 2.2.1.RELEASE
 awsJavaSdkVersion = 1.11.233
 

spar-wings-monolith/src/main/java/jp/xet/sparwings/spring/data/EmptyPage.java

@@ -19,8 +19,8 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.function.Function;
 
-import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
@@ -124,7 +124,8 @@ public Pageable previousPageable() {
 	}
 
 	@Override
-	public <S> Page<S> map(Converter<? super T, ? extends S> converter) {
+	public <U> Page<U> map(Function<? super T, ? extends U> converter) {
 		return new EmptyPage<>(pageable);
 	}
+	
 }

spar-wings-monolith/src/main/java/jp/xet/sparwings/spring/web/error/attribute/ProductionErrorAttributes.java

@@ -19,12 +19,13 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.springframework.boot.autoconfigure.web.DefaultErrorAttributes;
-import org.springframework.boot.autoconfigure.web.ErrorAttributes;
+import org.springframework.boot.web.servlet.error.DefaultErrorAttributes;
+import org.springframework.boot.web.servlet.error.ErrorAttributes;
 import org.springframework.http.HttpStatus;
 import org.springframework.util.StringUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.WebRequest;
 
 /**
  * TODO for daisuke
@@ -48,7 +49,7 @@ public class ProductionErrorAttributes implements ErrorAttributes {
 
 
 	@Override
-	public Map<String, Object> getErrorAttributes(RequestAttributes requestAttributes, boolean includeStackTrace) {
+	public Map<String, Object> getErrorAttributes(WebRequest requestAttributes, boolean includeStackTrace) {
 		Map<String, Object> errorAttributes = new LinkedHashMap<>();
 		errorAttributes.put("timestamp", new Date());
 		addStatus(errorAttributes, requestAttributes);
@@ -74,7 +75,7 @@ private void addStatus(Map<String, Object> errorAttributes,
 		}
 	}
 
-	private void addErrorDetails(Map<String, Object> errorAttributes, RequestAttributes requestAttributes) {
+	private void addErrorDetails(Map<String, Object> errorAttributes, WebRequest requestAttributes) {
 		Throwable error = getError(requestAttributes);
 		Object message = getAttribute(requestAttributes, "javax.servlet.error.message");
 		if ((StringUtils.isEmpty(message) == false || errorAttributes.get("message") == null)
@@ -92,7 +93,7 @@ private void addPath(Map<String, Object> errorAttributes,
 	}
 
 	@Override
-	public Throwable getError(RequestAttributes requestAttributes) {
+	public Throwable getError(WebRequest requestAttributes) {
 		Throwable exception = getAttribute(requestAttributes, ERROR_ATTRIBUTE);
 		if (exception == null) {
 			exception = getAttribute(requestAttributes, "javax.servlet.error.exception");
@@ -104,4 +105,5 @@ public Throwable getError(RequestAttributes requestAttributes) {
 	private <T> T getAttribute(RequestAttributes requestAttributes, String name) {
 		return (T) requestAttributes.getAttribute(name, RequestAttributes.SCOPE_REQUEST);
 	}
+	
 }

spar-wings-monolith/src/main/java/jp/xet/sparwings/spring/web/error/handler/DefaultRestErrorResolver.java

@@ -219,6 +219,11 @@ protected String getMessage(String msg, ServletWebRequest webRequest, Exception
 			if (localeResolver != null) {
 				locale = localeResolver.resolveLocale(webRequest.getRequest());
 			}
+			
+			if (locale == null) {
+				locale = Locale.getDefault();
+			}
+			
 			message = messageSource.getMessage(message, null, message, locale);
 		}
 

spar-wings-monolith/src/main/java/jp/xet/sparwings/spring/web/error/handler/RestExceptionHandler.java

@@ -232,7 +232,10 @@ protected ModelAndView getModelAndView(ServletWebRequest webRequest, Object hand
 
 	private void applyStatusIfPossible(ServletWebRequest webRequest, RestError error) {
 		if (!WebUtils.isIncludeRequest(webRequest.getRequest())) {
-			webRequest.getResponse().setStatus(error.getStatus().value());
+			HttpServletResponse response = webRequest.getResponse();
+			if (response != null) {
+				response.setStatus(error.getStatus().value());
+			}
 		}
 		//TODO support response.sendError ?
 	}
@@ -250,7 +253,13 @@ private ModelAndView handleResponseBody(Object body, ServletWebRequest webReques
 
 		MediaType.sortByQualityValue(acceptedMediaTypes);
 
-		try (ServerHttpResponse outputMessage = new ServletServerHttpResponse(webRequest.getResponse())) {
+		HttpServletResponse response = webRequest.getResponse();
+		
+		if (response == null) {
+			return null;
+		}
+		
+		try (ServerHttpResponse outputMessage = new ServletServerHttpResponse(response)) {
 			Class<?> bodyType = body.getClass();
 			List<HttpMessageConverter<?>> converters = allMessageConverters;
 

spar-wings-ratelimiter/build.gradle

@@ -6,8 +6,8 @@ dependencies {
 	compileOnly "javax.servlet:javax.servlet-api"
 	compile "org.springframework:spring-webmvc"
 	compile "org.springframework.security:spring-security-core"
-	compile "org.springframework.data:spring-data-redis:1.7.11.RELEASE"
-	compile "redis.clients:jedis:2.5.2"
+	compile "org.springframework.data:spring-data-redis"
+	compile "redis.clients:jedis"
 	compile "jp.xet:baseunits:$baseunitsVersion"
 	compile project(":spar-wings-httpexceptions")
 }

spar-wings-ratelimiter/src/main/java/jp/xet/sparwings/spring/web/ratelimiter/RedisRateLimitService.java

@@ -63,6 +63,9 @@ public RateLimitDescriptor consume(HttpServletRequest request, long consumption)
 			delta -= secSinceLastUpdate * fillRate;
 		}
 		Long carma = redisTemplate.opsForValue().increment(cKey, delta);
+		if (carma == null) {
+			throw new AssertionError("Unexpected condition. can not do in transaction");
+		}
 
 		if (carma < consumption) {
 			redisTemplate.opsForValue().set(cKey, consumption);
@@ -104,6 +107,9 @@ public RateLimitDescriptor get(HttpServletRequest request) {
 			delta -= msSinceLastUpdate * fillRate;
 		}
 		Long carma = redisTemplate.opsForValue().increment(cKey, delta);
+		if (carma == null) {
+			throw new AssertionError("Unexpected condition. can not do in transaction");
+		}
 
 		long expire = carma / fillRate;
 		redisTemplate.expire(tKey, expire, TimeUnit.SECONDS);

spar-wings-spring-data-chunk/src/main/java/jp/xet/sparwings/spring/data/web/ChunkableHandlerMethodArgumentResolver.java

@@ -72,6 +72,10 @@ public class ChunkableHandlerMethodArgumentResolver implements HandlerMethodArgu
 	private static Chunkable getDefaultChunkRequestFrom(MethodParameter parameter) {
 		ChunkableDefault defaults = parameter.getParameterAnnotation(ChunkableDefault.class);
 
+		if (defaults == null) {
+			throw new IllegalArgumentException("MethodParameter must have @ChunkableDefault");
+		}
+		
 		int defaultPageSize = defaults.size();
 		if (defaultPageSize == 10) {
 			defaultPageSize = defaults.value();
@@ -183,7 +187,7 @@ public Object resolveArgument(MethodParameter methodParameter, ModelAndViewConta
 		// Limit upper bound
 		pageSize = pageSize > maxPageSize ? maxPageSize : pageSize;
 
-		Direction direction = Direction.fromStringOrNull(directionString);
+		Direction direction = Direction.fromOptionalString(directionString).orElse(null);
 
 		if (StringUtils.hasText(next)) {
 			return new ChunkRequest(next, PaginationRelation.NEXT, pageSize, direction);
@@ -214,9 +218,12 @@ private Chunkable getDefaultFromAnnotationOrFallback(MethodParameter methodParam
 	protected String getParameterNameToUse(String source, MethodParameter parameter) {
 		StringBuilder builder = new StringBuilder(prefix);
 
-		if (parameter != null && parameter.hasParameterAnnotation(Qualifier.class)) {
-			builder.append(parameter.getParameterAnnotation(Qualifier.class).value());
-			builder.append(qualifierDelimiter);
+		if (parameter != null) {
+			Qualifier qualifier = parameter.getParameterAnnotation(Qualifier.class);
+			if (qualifier != null) {
+				builder.append(qualifier.value());
+				builder.append(qualifierDelimiter);
+			}
 		}
 
 		return builder.append(source).toString();

spar-wings-spring-data-chunk/src/main/java/jp/xet/sparwings/spring/data/web/SpringDataChunkableAnnotationUtils.java

@@ -40,6 +40,10 @@ class SpringDataChunkableAnnotationUtils {
 	public static void assertChunkableUniqueness(MethodParameter parameter) {
 		Method method = parameter.getMethod();
 
+		if (method == null) {
+			throw new IllegalArgumentException("MethodParameter must has method");
+		}
+		
 		if (containsMoreThanOneChunkableParameter(method)) {
 			Annotation[][] annotations = method.getParameterAnnotations();
 			assertQualifiersFor(method.getParameterTypes(), annotations);

spar-wings-spring-s3/src/main/java/jp/xet/sparwings/spring/s3/S3ObjectResourceLoader.java

@@ -91,7 +91,17 @@ public Resource getResource(String location) {
 		UriComponents components = UriComponentsBuilder.fromUriString(location).build();
 		if (Objects.equals(components.getScheme(), "s3")) {
 			String bucketName = components.getHost();
+			
+			if (bucketName == null) {
+				throw new IllegalArgumentException("location must contain host");
+			}
+			
 			String key = components.getPath();
+			
+			if (key == null) {
+				throw new IllegalArgumentException("location must contain path");
+			}
+			
 			if (key.startsWith("/")) {
 				key = key.substring(1);
 			}