Merge pull request #33 from dai0304/feature/log-in-RequestIdFilter

Add logging and allow null for names

Author: dai0304

spar-wings-request-id/src/main/java/jp/xet/sparwings/common/filters/RequestIdFilter.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);
+			}
 		}
 	}
 }