Add content type to info log

Author: vishalegbert-ttd

src/main/java/com/uid2/operator/service/ResponseUtil.java

@@ -123,7 +123,9 @@ public static void LogErrorAndSendResponse(String errorStatus, int statusCode, R
 
     public static void LogInfoAndSendResponse(String status, int statusCode, RoutingContext rc, String message) {
         String msg = ComposeMessage(status, statusCode, message, new RoutingContextReader(rc), rc.request().remoteAddress().hostAddress());
-        LOGGER.info(msg);
+        String contentType = rc.request().getHeader(HttpHeaders.CONTENT_TYPE);
+        String contentTypeStr = " Content-Type: " + (contentType != null ? contentType : "null");
+        LOGGER.warn(msg + contentTypeStr);
         final JsonObject json = Response(status, message);
         rc.response().setStatusCode(statusCode).putHeader(HttpHeaders.CONTENT_TYPE, "application/json")
                 .end(json.encode());

src/test/java/com/uid2/operator/service/ResponseUtilTest.java

@@ -160,7 +160,7 @@ void logsWarningWithOrigin() {
                 "\"clientAddress\":null," +
                 "\"message\":\"Some error message\"," +
                 "\"origin\":\"testOriginHeader\"" +
-                "}";
+                "} Content-Type: null";
         ILoggingEvent loggingEvent = testAppender.list.get(0);
         assertThat(loggingEvent.getMessage()).isEqualTo(expected);
     }
@@ -201,7 +201,7 @@ void logsWarningWithReferer() {
                 "\"clientAddress\":null," +
                 "\"message\":\"Some error message\"," +
                 "\"referer\":\"testRefererHeader\"" +
-                "}";
+                "} Content-Type: null";
         ILoggingEvent loggingEvent = testAppender.list.get(0);
         assertThat(loggingEvent.getMessage()).isEqualTo(expected);
     }
@@ -298,29 +298,4 @@ void logsErrorDoesNotIncludeContentType() {
         // Verify content type is NOT included
         assertThat(loggingEvent.getMessage()).doesNotContain("Content-Type:");
     }
-
-    @Test
-    void logsInfoDoesNotIncludeContentType() {
-        when(request.getHeader(io.vertx.core.http.HttpHeaders.CONTENT_TYPE)).thenReturn("application/json");
-        when(rc.request()).thenReturn(request);
-
-        ResponseUtil.LogInfoAndSendResponse("Some info status", 200, rc, "Some info message");
-
-        String expectedMessage = "Response to http request. {" +
-                "\"errorStatus\":\"Some info status\"," +
-                "\"contact\":null," +
-                "\"siteId\":null," +
-                "\"path\":null," +
-                "\"statusCode\":200," +
-                "\"clientAddress\":null," +
-                "\"message\":\"Some info message\"" +
-                "}";
-        
-        assertThat(testAppender.list).hasSize(1);
-        ILoggingEvent loggingEvent = testAppender.list.get(0);
-        assertThat(loggingEvent.getMessage()).isEqualTo(expectedMessage);
-        assertThat(loggingEvent.getLevel()).isEqualTo(Level.INFO);
-        // Verify content type is NOT included
-        assertThat(loggingEvent.getMessage()).doesNotContain("Content-Type:");
-    }
 }