add info about removed headers into logged messages (see #67)

epam · Dec 30, 2015 · 184e81d · 184e81d
1 parent d5de241
commit 184e81d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/...lma-message-logger/src/main/java/com/epam/wilma/logger/writer/WilmaHttpRequestWriter.java b/...lma-message-logger/src/main/java/com/epam/wilma/logger/writer/WilmaHttpRequestWriter.java
@@ -55,7 +55,8 @@ public boolean write(final WilmaHttpRequest request, final boolean bodyDecompres
                 String requestLine = request.getRemoteAddr() + " " + request.getRequestLine();
                 writeRequestLine(requestLine, writer);
                 writeWilmaLoggerId(writer, messageId);
-                String headers = request.getHeaders().toString() + request.getExtraHeaders().toString();
+                String headers = request.getHeaders().toString()
+                        + "+" + request.getExtraHeaders().toString() + "-" + request.getExtraHeadersToRemove().toString();
                 writeHeaders(writer, headers);
                 String body = request.getBody();
                 writeBody(writer, body);

diff --git a/...ma-message-logger/src/main/java/com/epam/wilma/logger/writer/WilmaHttpResponseWriter.java b/...ma-message-logger/src/main/java/com/epam/wilma/logger/writer/WilmaHttpResponseWriter.java
@@ -54,10 +54,8 @@ public boolean write(final WilmaHttpResponse response, final boolean bodyDecompr
             BufferedWriter writer = bufferedWriterFactory.createBufferedWriter(outputFile, OUTPUT_BUFFER_SIZE);
             if (writer != null) {
                 writeWilmaLoggerId(writer, messageId);
-                String headers = response.getHeaders().toString();
-                if (response.getExtraHeaders() != null) {
-                    headers = headers + response.getExtraHeaders().toString();
-                }
+                String headers = response.getHeaders().toString()
+                        + "+" + response.getExtraHeaders().toString() + "-" + response.getExtraHeadersToRemove().toString();
                 writeHeaders(writer, headers);
                 int statusCode = response.getStatusCode();
                 writeStatusCode(statusCode, writer);

diff --git a/...message-logger/src/test/java/com/epam/wilma/logger/writer/WilmaHttpRequestWriterTest.java b/...message-logger/src/test/java/com/epam/wilma/logger/writer/WilmaHttpRequestWriterTest.java
@@ -57,6 +57,8 @@ public class WilmaHttpRequestWriterTest {
     private static final String REQUEST_LINE = "request line";
     private static final String REMOTE_ADDR = "remote.addr";
     private static final String HEADERS = "headers";
+    private static final String EXTRA_HEADERS = "headers+";
+    private static final String EXTRA_HEADERS_REMOVE = "headers-";
     private static final String BODY = "body";
     private static final String MESSAGE_LOGGER_ID = "w_201306271455.0001";
     private static final String FI_PREFIX = "FI";
@@ -97,12 +99,15 @@ public void testWriteShouldWriteContentToWriter() throws IOException {
         given(request.getRequestLine()).willReturn(REQUEST_LINE);
         given(request.getRemoteAddr()).willReturn(REMOTE_ADDR);
         given(request.getHeaders().toString()).willReturn(HEADERS);
+        given(request.getExtraHeaders().toString()).willReturn(EXTRA_HEADERS);
+        given(request.getExtraHeadersToRemove().toString()).willReturn(EXTRA_HEADERS_REMOVE);
         given(request.getBody()).willReturn(BODY);
         //WHEN
         underTest.write(request, true);
         //THEN
         verify(bufferedWriter).append(REMOTE_ADDR + " " + REQUEST_LINE);
         verify(bufferedWriter).append(WilmaHttpRequest.WILMA_LOGGER_ID + ":" + MESSAGE_ID);
+        verify(bufferedWriter).append(HEADERS + "+" + EXTRA_HEADERS + "-" + EXTRA_HEADERS_REMOVE);
         verify(bufferedWriter).append(BODY);
     }
 

diff --git a/...essage-logger/src/test/java/com/epam/wilma/logger/writer/WilmaHttpResponseWriterTest.java b/...essage-logger/src/test/java/com/epam/wilma/logger/writer/WilmaHttpResponseWriterTest.java
@@ -50,6 +50,8 @@ public class WilmaHttpResponseWriterTest {
     private static final String COULD_NOT_WRITE_MESSAGE_ERROR = "Could not write message to file:src/test/resources/outputFile.txt!";
     private static final String OUTPUT_FILE = "src/test/resources/outputFile.txt";
     private static final String HEADERS = "headers";
+    private static final String EXTRA_HEADERS = "headers+";
+    private static final String EXTRA_HEADERS_REMOVE = "headers-";
     private static final String BODY = "body";
     private static final String MESSAGE_ID = "w_201306271455.0001";
     private static final int OUTPUT_BUFFER_SIZE = 262144;
@@ -82,11 +84,14 @@ public void testWriteShouldContentToWriter() throws IOException {
         given(response.getWilmaMessageLoggerId()).willReturn(MESSAGE_ID);
         given(response.getWilmaMessageId()).willReturn(MESSAGE_ID);
         given(response.getHeaders().toString()).willReturn(HEADERS);
+        given(response.getExtraHeaders().toString()).willReturn(EXTRA_HEADERS);
+        given(response.getExtraHeadersToRemove().toString()).willReturn(EXTRA_HEADERS_REMOVE);
         given(response.getBody()).willReturn(BODY);
         //WHEN
         underTest.write(response, true);
         //THEN
         verify(bufferedWriter).append(WilmaHttpRequest.WILMA_LOGGER_ID + ":" + MESSAGE_ID);
+        verify(bufferedWriter).append(HEADERS + "+" + EXTRA_HEADERS + "-" + EXTRA_HEADERS_REMOVE);
         verify(bufferedWriter).append(BODY);
     }