1 files changed, 12 insertions, 5 deletions
diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java
index 73dfb85519c..c7a140b142e 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java
@@ -82,6 +82,7 @@ import static com.yahoo.jdisc.http.server.jetty.SimpleHttpClient.ResponseValidat
 import static com.yahoo.jdisc.http.server.jetty.Utils.createHttp2Client;
 import static com.yahoo.jdisc.http.server.jetty.Utils.createSslTestDriver;
 import static com.yahoo.jdisc.http.server.jetty.Utils.generatePrivateKeyAndCertificate;
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.startsWith;
@@ -742,12 +743,18 @@ public class HttpServerTest {
         JettyTestDriver driver = JettyTestDriver.newConfiguredInstance(
                 new EchoRequestHandler(),
                 new ServerConfig.Builder(),
-                new ConnectorConfig.Builder(),
+                new ConnectorConfig.Builder().accessLog(
+                        new ConnectorConfig.AccessLog.Builder()
+                                .contentPathPrefixes("/status:1")
+                                .contentPathPrefixes("/state/v1:0.001")),
                 binder -> binder.bind(RequestLog.class).toInstance(requestLogMock));
         driver.client().newPost("/status.html").setContent("abcdef").execute().expectStatusCode(is(OK));
         RequestLogEntry entry = requestLogMock.poll(Duration.ofSeconds(5));
         assertEquals(200, entry.statusCode().getAsInt());
         assertEquals(6, entry.requestSize().getAsLong());
+        assertEquals("text/plain; charset=UTF-8", entry.content().get().type());
+        assertEquals(6, entry.content().get().length());
+        assertEquals("abcdef", new String(entry.content().get().body(), UTF_8));
         assertTrue(driver.close());
     }
 
@@ -894,7 +901,7 @@ public class HttpServerTest {
             final HttpRequest httpRequest = (HttpRequest)request;
             final String connectedAt = String.valueOf(httpRequest.getConnectedAt(TimeUnit.MILLISECONDS));
             final ContentChannel ch = handler.handleResponse(new Response(OK));
-            ch.write(ByteBuffer.wrap(connectedAt.getBytes(StandardCharsets.UTF_8)), null);
+            ch.write(ByteBuffer.wrap(connectedAt.getBytes(UTF_8)), null);
             ch.close(null);
             return null;
         }
@@ -924,7 +931,7 @@ public class HttpServerTest {
             List<Cookie> cookies = new ArrayList<>(((HttpRequest)request).decodeCookieHeader());
             cookies.sort(new CookieComparator());
             final ContentChannel out = ResponseDispatch.newInstance(Response.Status.OK).connect(handler);
-            out.write(StandardCharsets.UTF_8.encode(cookies.toString()), null);
+            out.write(UTF_8.encode(cookies.toString()), null);
             out.close(null);
             return null;
         }
@@ -938,7 +945,7 @@ public class HttpServerTest {
         public ContentChannel handleRequest(Request request, ResponseHandler handler) {
             Map<String, List<String>> parameters = new TreeMap<>(((HttpRequest)request).parameters());
             ContentChannel responseContentChannel = ResponseDispatch.newInstance(Response.Status.OK).connect(handler);
-            responseContentChannel.write(ByteBuffer.wrap(parameters.toString().getBytes(StandardCharsets.UTF_8)),
+            responseContentChannel.write(ByteBuffer.wrap(parameters.toString().getBytes(UTF_8)),
                                          NULL_COMPLETION_HANDLER);
 
             // Have the request content written back to the response.
@@ -1012,7 +1019,7 @@ public class HttpServerTest {
         @Override
         public ContentChannel handleRequest(Request req, ResponseHandler handler) {
             final ContentChannel ch = handler.handleResponse(new Response(OK));
-            ch.write(ByteBuffer.wrap(req.getUri().toString().getBytes(StandardCharsets.UTF_8)), null);
+            ch.write(ByteBuffer.wrap(req.getUri().toString().getBytes(UTF_8)), null);
             ch.close(null);
             return null;
         }