Merge branch 'release/0.34'

Author: dai0304

.gitignore

@@ -1 +1 @@
-0.32
+

.version

@@ -2,8 +2,8 @@
 
 buildscript {
 	repositories {
-		mavenCentral()
 		jcenter()
+		mavenCentral()
 		maven { url "http://repo.spring.io/plugins-release" }
 	}
 	dependencies {
@@ -76,16 +76,18 @@ subprojects {
 
 	configurations {
 		deployerJars
+		testCompile.extendsFrom compileOnly
 	}
 
 	repositories {
+		jcenter()
 		mavenCentral()
 		maven { url "http://maven.xet.jp/release" } // for baseunits
 	}
 
 	dependencies {
-		compile "org.projectlombok:lombok:1.16.2"
 		compile "org.slf4j:slf4j-api:$slf4jVersion"
+		compileOnly "org.projectlombok:lombok:$lombokVersion"
 		testCompile "org.slf4j:jul-to-slf4j:$slf4jVersion"
 		testCompile "ch.qos.logback:logback-classic:$logbackVersion"
 		testCompile "junit:junit:$junitVersion"
@@ -134,5 +136,5 @@ subprojects {
 
 // ======== wrapper ========
 task wrapper(type: Wrapper) {
-	gradleVersion = "2.12"
+	gradleVersion = "4.1"
 }

build.gradle

@@ -9,6 +9,7 @@ springHateoasVersion = 0.19.0.RELEASE
 awsJavaSdkVersion = 1.11.21
 jacksonVersion = 2.7.2
 
+lombokVersion = 1.16.18
 baseunitsVersion = 2.14
 
 slf4jVersion = 1.7.13

gradle.properties

@@ -23,7 +23,7 @@
 /**
  * Respond 401.
  * 
- * @since #version#
+ * @since 0.34
  * @author daisuke
  */
 @NoArgsConstructor
@@ -36,7 +36,7 @@ public class HttpUnauthorizedException extends HttpResponseException {
 	 * 
 	 * @param message 例外メッセージ
 	 * @param cause 起因例外
-	 * @since #version#
+	 * @since 0.34
 	 */
 	public HttpUnauthorizedException(String message, Throwable cause) {
 		super(message, cause);
@@ -46,7 +46,7 @@ public HttpUnauthorizedException(String message, Throwable cause) {
 	 * インスタンスを生成する。
 	 * 
 	 * @param message 例外メッセージ
-	 * @since #version#
+	 * @since 0.34
 	 */
 	public HttpUnauthorizedException(String message) {
 		super(message);
@@ -56,7 +56,7 @@ public HttpUnauthorizedException(String message) {
 	 * インスタンスを生成する。
 	 * 
 	 * @param cause 起因例外
-	 * @since #version#
+	 * @since 0.34
 	 */
 	public HttpUnauthorizedException(Throwable cause) {
 		super(cause);

spar-wings-httpexceptions/src/main/java/jp/xet/sparwings/spring/web/httpexceptions/HttpUnauthorizedException.java

@@ -26,6 +26,7 @@
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
 
 import org.springframework.web.filter.OncePerRequestFilter;
 
@@ -40,6 +41,7 @@
  * @since 0.3
  * @author daisuke
  */
+@Slf4j
 public class RequestIdFilter extends OncePerRequestFilter {
 
 	private static final String DEFAULT_REQUEST_ID_ATTRIBUTE = "requestId";
@@ -48,17 +50,14 @@ public class RequestIdFilter extends OncePerRequestFilter {
 
 	private static final String DEFAULT_REQUEST_ID_MDC_KEY = "requestId";
 
-	@NonNull
 	@Getter
 	@Setter
 	private String requestIdAttribute = DEFAULT_REQUEST_ID_ATTRIBUTE;
 
-	@NonNull
 	@Getter
 	@Setter
 	private String requestIdMdcKey = DEFAULT_REQUEST_ID_MDC_KEY;
 
-	@NonNull
 	@Getter
 	@Setter
 	private String requestIdHeader = DEFAULT_REQUEST_ID_HEADER;
@@ -77,19 +76,24 @@ public void destroy() {
 	@Override
 	protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
 			throws ServletException, IOException {
-		
+		log.trace("Start issue request ID");
 		String requestId = generator.generateRequestId(request);
+		log.info("Request ID issued: {}", requestId);
 		if (requestIdAttribute != null) {
 			request.setAttribute(requestIdAttribute, requestId);
 		}
 		if (requestIdMdcKey != null) {
 			MDC.put(requestIdMdcKey, requestId);
 		}
-		response.setHeader(requestIdHeader, requestId);
+		if (requestIdHeader != null) {
+			response.setHeader(requestIdHeader, requestId);
+		}
 		try {
 			filterChain.doFilter(request, response);
 		} finally {
-			MDC.remove(requestIdMdcKey);
+			if (requestIdMdcKey != null) {
+				MDC.remove(requestIdMdcKey);
+			}
 		}
 	}
 }