Fixes the compatibility with the latest version of the Servlet API

Forwarded: no


Gbp-Pq: Name 0041-servlet-api-compatibility.patch

6 files changed, 53 insertions, 0 deletions

diff --git a/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java b/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java
index 1b8cf3ee..6691ffdd 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java
@@ -65,4 +65,17 @@ public class DelegatingServletInputStream extends ServletInputStream {
 		this.sourceStream.close();
 	}
 
+	@Override
+	public boolean isReady() {
+		return true;
+	}
+
+	@Override
+	public boolean isFinished() {
+		return false;
+	}
+
+	@Override
+	public void setReadListener(javax.servlet.ReadListener listener) {
+	}
 }
diff --git a/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletOutputStream.java b/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletOutputStream.java
index d580974a..cd2066d5 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletOutputStream.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletOutputStream.java
@@ -71,4 +71,13 @@ public class DelegatingServletOutputStream extends ServletOutputStream {
 		this.targetStream.close();
 	}
 
+	@Override
+	public boolean isReady() {
+		return true;
+	}
+
+	@Override
+	public void setWriteListener(javax.servlet.WriteListener listener) {
+	}
+
 }
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
index 5ac0c59f..65964efa 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
@@ -1246,4 +1246,8 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		return result;
 	}
 
+	@Override
+	public <T extends javax.servlet.http.HttpUpgradeHandler> T upgrade(Class<T> handlerClass) throws IOException, ServletException {
+		throw new UnsupportedOperationException();
+	}
 }
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java b/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java
index 7bca348a..364985ab 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java
@@ -677,4 +677,8 @@ public class MockServletContext implements ServletContext {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
+	public String getVirtualServerName() {
+		throw new UnsupportedOperationException();
+	}
 }
diff --git a/spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java b/spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java
index 259e057d..f712066e 100644
--- a/spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java
+++ b/spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java
@@ -221,6 +221,21 @@ public class ContentCachingRequestWrapper extends HttpServletRequestWrapper {
 			}
 			return ch;
 		}
+
+		@Override
+		public boolean isReady() {
+			return is.isReady();
+		}
+
+		@Override
+		public boolean isFinished() {
+			return is.isFinished();
+		}
+
+		@Override
+		public void setReadListener(javax.servlet.ReadListener listener) {
+			is.setReadListener(listener);
+		}
 	}
 
 }
diff --git a/spring-web/src/main/java/org/springframework/web/util/ContentCachingResponseWrapper.java b/spring-web/src/main/java/org/springframework/web/util/ContentCachingResponseWrapper.java
index 0c136153..1e1f8127 100644
--- a/spring-web/src/main/java/org/springframework/web/util/ContentCachingResponseWrapper.java
+++ b/spring-web/src/main/java/org/springframework/web/util/ContentCachingResponseWrapper.java
@@ -237,6 +237,14 @@ public class ContentCachingResponseWrapper extends HttpServletResponseWrapper {
 		public void write(byte[] b, int off, int len) throws IOException {
 			content.write(b, off, len);
 		}
+
+		@Override
+		public boolean isReady() {
+			return true;
+		}
+
+		@Override
+		public void setWriteListener(javax.servlet.WriteListener listener) { }
 	}