Skip to content

Commit fa56636

Browse files
Removed unnecessary parameters
1 parent 436ae7b commit fa56636

File tree

2 files changed

+9
-14
lines changed

2 files changed

+9
-14
lines changed

spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ private void updateResponse(HttpServletRequest request, HttpServletResponse resp
117117
Assert.notNull(wrapper, "ContentCachingResponseWrapper not found");
118118
HttpServletResponse rawResponse = (HttpServletResponse) wrapper.getResponse();
119119

120-
if (isEligibleForEtag(request, wrapper, wrapper.getStatus(), wrapper.getContentInputStream())) {
120+
if (isEligibleForEtag(request, wrapper)) {
121121
String eTag = wrapper.getHeader(HttpHeaders.ETAG);
122122
if (!StringUtils.hasText(eTag)) {
123123
eTag = generateETagHeaderValue(wrapper.getContentInputStream(), this.writeWeakETag);
@@ -142,12 +142,10 @@ private void updateResponse(HttpServletRequest request, HttpServletResponse resp
142142
* </ul>
143143
* @param request the HTTP request
144144
* @param response the HTTP response
145-
* @param responseStatusCode the HTTP response status code
146-
* @param inputStream the response body
147145
* @return {@code true} if eligible for ETag generation, {@code false} otherwise
148146
*/
149-
protected boolean isEligibleForEtag(HttpServletRequest request, HttpServletResponse response,
150-
int responseStatusCode, InputStream inputStream) {
147+
protected boolean isEligibleForEtag(HttpServletRequest request, HttpServletResponse response) {
148+
int responseStatusCode = response.getStatus();
151149

152150
if (!response.isCommitted() &&
153151
responseStatusCode >= 200 && responseStatusCode < 300 &&

spring-web/src/test/java/org/springframework/web/filter/ShallowEtagHeaderFilterTests.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
package org.springframework.web.filter;
1818

19-
import java.io.InputStream;
20-
2119
import jakarta.servlet.FilterChain;
2220
import jakarta.servlet.http.HttpServletResponse;
2321
import org.junit.jupiter.api.Test;
@@ -49,18 +47,17 @@ void isEligibleForEtag() {
4947
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/hotels");
5048
MockHttpServletResponse response = new MockHttpServletResponse();
5149

52-
assertThat(filter.isEligibleForEtag(request, response, 200, InputStream.nullInputStream())).isTrue();
53-
assertThat(filter.isEligibleForEtag(request, response, 300, InputStream.nullInputStream())).isFalse();
50+
assertThat(filter.isEligibleForEtag(request, response)).isTrue();
5451

5552
request = new MockHttpServletRequest("HEAD", "/hotels");
56-
assertThat(filter.isEligibleForEtag(request, response, 200, InputStream.nullInputStream())).isFalse();
53+
assertThat(filter.isEligibleForEtag(request, response)).isFalse();
5754

5855
request = new MockHttpServletRequest("POST", "/hotels");
59-
assertThat(filter.isEligibleForEtag(request, response, 200, InputStream.nullInputStream())).isFalse();
56+
assertThat(filter.isEligibleForEtag(request, response)).isFalse();
6057

6158
request = new MockHttpServletRequest("POST", "/hotels");
6259
request.addHeader("Cache-Control","must-revalidate, no-store");
63-
assertThat(filter.isEligibleForEtag(request, response, 200, InputStream.nullInputStream())).isFalse();
60+
assertThat(filter.isEligibleForEtag(request, response)).isFalse();
6461
}
6562

6663
@Test
@@ -172,7 +169,7 @@ void filterWriter() throws Exception {
172169
}
173170

174171
@Test // SPR-12960
175-
public void filterWriterWithDisabledCaching() throws Exception {
172+
void filterWriterWithDisabledCaching() throws Exception {
176173
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/hotels");
177174
MockHttpServletResponse response = new MockHttpServletResponse();
178175
response.setContentType(TEXT_PLAIN_VALUE);
@@ -257,7 +254,7 @@ void filterSendRedirect() throws Exception {
257254
}
258255

259256
@Test // SPR-13717
260-
public void filterFlushResponse() throws Exception {
257+
void filterFlushResponse() throws Exception {
261258
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/hotels");
262259
MockHttpServletResponse response = new MockHttpServletResponse();
263260

0 commit comments

Comments
 (0)