Merge pull request #87 from SAP/dependabot/maven/cf-java-logging-support-servlet/org.eclipse.jetty-jetty-server-9.4.35.v20201120

Bump jetty-server from 9.4.19.v20190610 to 9.4.35.v20201120 in /cf-java-logging-support-servlet

Author: KarstenSchnitter

cf-java-logging-support-servlet/pom.xml

@@ -14,7 +14,7 @@
 	</parent>
 
 	<properties>
-		<servlet.api.version>3.0.1</servlet.api.version>
+		<servlet.api.version>3.1.0</servlet.api.version>
 	</properties>
 
 	<dependencies>
@@ -59,13 +59,13 @@
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-server</artifactId>
-			<version>9.4.19.v20190610</version>
+			<version>9.4.35.v20201120</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-servlet</artifactId>
-			<version>9.4.19.v20190610</version>
+			<version>9.4.35.v20201120</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

cf-java-logging-support-servlet/src/main/java/com/sap/hcp/cf/logging/servlet/filter/WrappedInputStream.java

@@ -1,8 +1,8 @@
 package com.sap.hcp.cf.logging.servlet.filter;
 
 import java.io.IOException;
-import java.io.OutputStream;
 
+import javax.servlet.ReadListener;
 import javax.servlet.ServletInputStream;
 
 /**
@@ -106,4 +106,19 @@ public synchronized void reset() throws IOException {
 	public boolean markSupported() {
 		return wrappedStream.markSupported();
 	}
+
+    @Override
+    public boolean isFinished() {
+        return wrappedStream.isFinished();
+    }
+
+    @Override
+    public boolean isReady() {
+        return wrappedStream.isReady();
+    }
+
+    @Override
+    public void setReadListener(ReadListener readListener) {
+        wrappedStream.setReadListener(readListener);
+    }
 }

cf-java-logging-support-servlet/src/main/java/com/sap/hcp/cf/logging/servlet/filter/WrappedOutputStream.java

@@ -1,16 +1,16 @@
 package com.sap.hcp.cf.logging.servlet.filter;
 
 import java.io.IOException;
-import java.io.OutputStream;
 
 import javax.servlet.ServletOutputStream;
+import javax.servlet.WriteListener;
 
 public class WrappedOutputStream extends ServletOutputStream {
 
 	private long contentLength = -1;
-	private final OutputStream wrappedStream;
+    private final ServletOutputStream wrappedStream;
 
-	public WrappedOutputStream(OutputStream out) {
+    public WrappedOutputStream(ServletOutputStream out) {
 		wrappedStream = out;
 	}
 
@@ -53,4 +53,15 @@ public void close() throws IOException {
 	public void flush() throws IOException {
 		wrappedStream.flush();
 	}
+
+    @Override
+    public boolean isReady() {
+        return wrappedStream.isReady();
+    }
+
+    @Override
+    public void setWriteListener(WriteListener writeListener) {
+        wrappedStream.setWriteListener(writeListener);
+
+    }
 }

cf-java-logging-support-servlet/src/test/java/com/sap/hcp/cf/logging/servlet/filter/WrappedInputStreamTest.java

@@ -8,6 +8,7 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 
+import javax.servlet.ReadListener;
 import javax.servlet.ServletInputStream;
 
 import org.junit.Test;
@@ -24,6 +25,21 @@ private static WrappedInputStream wrap(String text) {
 			public int read() throws IOException {
 				return in.read();
 			}
+
+            @Override
+            public boolean isFinished() {
+                return false;
+            }
+
+            @Override
+            public boolean isReady() {
+                return true;
+            }
+
+            @Override
+            public void setReadListener(ReadListener readListener) {
+                // nothing to do
+            }
 		});
 	}