Let Jetty do compression, and merge overlapping time windows

2 files changed, 6 insertions, 12 deletions

diff --git a/container-core/src/test/java/com/yahoo/container/handler/LogHandlerTest.java b/container-core/src/test/java/com/yahoo/container/handler/LogHandlerTest.java
index 01dcb885a97..ab0d0d54675 100644
--- a/container-core/src/test/java/com/yahoo/container/handler/LogHandlerTest.java
+++ b/container-core/src/test/java/com/yahoo/container/handler/LogHandlerTest.java
@@ -47,12 +47,12 @@ public class LogHandlerTest {
         }
 
         @Override
-        protected void writeLogs(OutputStream outputStream, Instant from, Instant to)  {
+        protected void writeLogs(OutputStream out, Instant from, Instant to)  {
             try {
                 if (to.isAfter(Instant.ofEpochMilli(1000))) {
-                    outputStream.write("newer log".getBytes());
+                    out.write("newer log".getBytes());
                 } else {
-                    outputStream.write("older log".getBytes());
+                    out.write("older log".getBytes());
                 }
             } catch (Exception e) {}
         }
diff --git a/container-core/src/test/java/com/yahoo/container/handler/LogReaderTest.java b/container-core/src/test/java/com/yahoo/container/handler/LogReaderTest.java
index 6b7be1d8cd3..3f7a78e13be 100644
--- a/container-core/src/test/java/com/yahoo/container/handler/LogReaderTest.java
+++ b/container-core/src/test/java/com/yahoo/container/handler/LogReaderTest.java
@@ -57,7 +57,7 @@ public class LogReaderTest {
         LogReader logReader = new LogReader(logDirectory, Pattern.compile(".*"));
         logReader.writeLogs(baos, Instant.ofEpochMilli(150), Instant.ofEpochMilli(3601050));
 
-        assertEquals(log100 + logv11 + log110, decompress(baos.toByteArray()));
+        assertEquals(log100 + logv11 + log110, baos.toString(UTF_8));
     }
 
     @Test
@@ -66,7 +66,7 @@ public class LogReaderTest {
         LogReader logReader = new LogReader(logDirectory, Pattern.compile(".*-1.*"));
         logReader.writeLogs(baos, Instant.EPOCH, Instant.EPOCH.plus(Duration.ofDays(2)));
 
-        assertEquals(log101 + logv11, decompress(baos.toByteArray()));
+        assertEquals(log101 + logv11, baos.toString(UTF_8));
     }
 
     @Test
@@ -75,7 +75,7 @@ public class LogReaderTest {
         LogReader logReader = new LogReader(logDirectory, Pattern.compile(".*"));
         logReader.writeLogs(zippedBaos, Instant.EPOCH, Instant.EPOCH.plus(Duration.ofDays(2)));
 
-        assertEquals(log100 + log101 + logv11 + log110 + log200 + logv, decompress(zippedBaos.toByteArray()));
+        assertEquals(log101 + log100 + logv11 + log110 + log200 + logv, zippedBaos.toString(UTF_8));
     }
 
     private byte[] compress(String input) throws IOException {
@@ -86,10 +86,4 @@ public class LogReaderTest {
         return baos.toByteArray();
     }
 
-    private String decompress(byte[] input) throws IOException {
-        if (input.length == 0) return "";
-        byte[] decompressed = new GZIPInputStream(new ByteArrayInputStream(input)).readAllBytes();
-        return new String(decompressed);
-    }
-
 }