1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
|
Description: Fixes the compatibility with the latest version of the Servlet API
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: no
--- 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 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) { }
}
--- 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 @@
}
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);
+ }
}
}
--- 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 @@
this.sourceStream.close();
}
+ @Override
+ public boolean isReady() {
+ return true;
+ }
+
+ @Override
+ public boolean isFinished() {
+ return false;
+ }
+
+ @Override
+ public void setReadListener(javax.servlet.ReadListener listener) {
+ }
}
--- 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 @@
this.targetStream.close();
}
+ @Override
+ public boolean isReady() {
+ return true;
+ }
+
+ @Override
+ public void setWriteListener(javax.servlet.WriteListener listener) {
+ }
+
}
--- 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 @@
return result;
}
+ @Override
+ public <T extends javax.servlet.http.HttpUpgradeHandler> T upgrade(Class<T> handlerClass) throws IOException, ServletException {
+ throw new UnsupportedOperationException();
+ }
}
--- 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 @@
throw new UnsupportedOperationException();
}
+ @Override
+ public String getVirtualServerName() {
+ throw new UnsupportedOperationException();
+ }
}
|
