Fixed servlet 3.1 feaures

logbook-servlet/pom.xml

@@ -24,8 +24,8 @@
             <artifactId>logbook-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>javax.servlet</artifactId>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>com.sun.activation</groupId>

logbook-servlet/src/main/java/org/zalando/logbook/servlet/LocalResponse.java

@@ -1,10 +1,12 @@
 package org.zalando.logbook.servlet;
 
+import lombok.AllArgsConstructor;
 import org.zalando.logbook.Headers;
 import org.zalando.logbook.HttpResponse;
 import org.zalando.logbook.Origin;
 
 import javax.servlet.ServletOutputStream;
+import javax.servlet.WriteListener;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponseWrapper;
 import java.io.ByteArrayOutputStream;
@@ -117,7 +119,7 @@ private static class Tee {
         private PrintWriter writer;
         private byte[] bytes;
 
-        private Tee(final OutputStream original) {
+        private Tee(final ServletOutputStream original) {
             this.branch = new ByteArrayOutputStream();
             this.output = new TeeServletOutputStream(original, branch);
         }
@@ -141,16 +143,12 @@ byte[] getBytes() {
         }
     }
 
+    @AllArgsConstructor
     private static class TeeServletOutputStream extends ServletOutputStream {
 
-        private final OutputStream original;
+        private final ServletOutputStream original;
         private final OutputStream branch;
 
-        private TeeServletOutputStream(final OutputStream original, final OutputStream branch) {
-            this.original = original;
-            this.branch = branch;
-        }
-
         @Override
         public void write(final int b) throws IOException {
             original.write(b);
@@ -175,5 +173,15 @@ public void close() throws IOException {
             branch.close();
         }
 
+        @Override
+        public boolean isReady() {
+            return original.isReady();
+        }
+
+        @Override
+        public void setWriteListener(final WriteListener listener) {
+            original.setWriteListener(listener);
+        }
+
     }
 }

logbook-servlet/src/main/java/org/zalando/logbook/servlet/ServletInputStreamAdapter.java

@@ -1,19 +1,19 @@
 package org.zalando.logbook.servlet;
 
+import lombok.AllArgsConstructor;
+
+import javax.servlet.ReadListener;
 import javax.servlet.ServletInputStream;
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 
+@AllArgsConstructor
 final class ServletInputStreamAdapter extends ServletInputStream {
 
-    private final InputStream stream;
-
-    public ServletInputStreamAdapter(final InputStream stream) {
-        this.stream = stream;
-    }
+    private final ByteArrayInputStream stream;
 
     @Override
-    public int read() throws IOException {
+    public int read() {
         return stream.read();
     }
 
@@ -23,8 +23,23 @@ public int read(final byte[] b) throws IOException {
     }
 
     @Override
-    public int read(final byte[] b, final int off, final int len) throws IOException {
+    public int read(final byte[] b, final int off, final int len) {
         return stream.read(b, off, len);
     }
 
+    @Override
+    public boolean isFinished() {
+        return stream.available() == 0;
+    }
+
+    @Override
+    public boolean isReady() {
+        return true;
+    }
+
+    @Override
+    public void setReadListener(final ReadListener readListener) {
+        throw new UnsupportedOperationException();
+    }
+
 }

logbook-servlet/src/test/java/org/zalando/logbook/servlet/LocalResponseTest.java

@@ -4,13 +4,15 @@
 import org.junit.jupiter.api.Test;
 
 import javax.servlet.ServletOutputStream;
+import javax.servlet.WriteListener;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotSame;
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.mockito.Mockito.mock;
@@ -28,6 +30,16 @@ class LocalResponseTest {
     void setUp() throws IOException {
         mock = mock(HttpServletResponse.class);
         when(mock.getOutputStream()).thenReturn(new ServletOutputStream() {
+            @Override
+            public boolean isReady() {
+                return false;
+            }
+
+            @Override
+            public void setWriteListener(final WriteListener listener) {
+                // nothing to do here
+            }
+
             @Override
             public void write(final int b) {
                 // serves as a null or no-op output stream
@@ -119,4 +131,17 @@ void shouldReturnNullContentTypeWhenNoContentTypeHasBeenSpecified() {
 
         assertThat(unit.getContentType(), is(nullValue()));
     }
+
+    @Test
+    void shouldBeReady() throws IOException {
+        unit.withBody();
+        assertFalse(unit.getOutputStream().isReady());
+    }
+
+    @Test
+    void shouldNotSupportWriteListener() throws IOException {
+        unit.withBody();
+        unit.getOutputStream().setWriteListener(mock(WriteListener.class));
+    }
+
 }

logbook-servlet/src/test/java/org/zalando/logbook/servlet/ServletInputStreamAdapterTest.java

@@ -0,0 +1,39 @@
+package org.zalando.logbook.servlet;
+
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import javax.servlet.ReadListener;
+import javax.servlet.ServletInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class ServletInputStreamAdapterTest {
+
+    private final ServletInputStream unit = new ServletInputStreamAdapter(new ByteArrayInputStream(
+            "Hello, world".getBytes(UTF_8)));
+
+    @Test
+    void shouldBeReady() {
+        assertTrue(unit.isReady());
+    }
+
+    @Test
+    void shouldBeFinishedWhenDone() throws IOException {
+        assertFalse(unit.isFinished());
+        ByteStreams.copy(unit, NullOutputStream.NULL);
+        assertTrue(unit.isFinished());
+    }
+
+    @Test
+    void shouldNotSupportReadListener() {
+        assertThrows(UnsupportedOperationException.class, () ->
+                unit.setReadListener(Mockito.mock(ReadListener.class)));
+    }
+
+}

logbook-spring-boot-starter/pom.xml

@@ -32,8 +32,8 @@
             <artifactId>logbook-servlet</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>javax.servlet</artifactId>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

pom.xml

@@ -201,9 +201,9 @@
             </dependency>
             <!-- javax -->
             <dependency>
-                <groupId>org.glassfish</groupId>
-                <artifactId>javax.servlet</artifactId>
-                <version>3.1.1</version>
+                <groupId>javax.servlet</groupId>
+                <artifactId>javax.servlet-api</artifactId>
+                <version>3.1.0</version>
                 <scope>provided</scope>
             </dependency>
             <!-- spring -->