Browse Source

Align constant name in ServletServerHttpResponse

See gh-36385
pull/28225/merge
Juergen Hoeller 4 weeks ago
parent
commit
95a31c4e8c
  1. 14
      spring-web/src/main/java/org/springframework/http/server/ServletServerHttpResponse.java
  2. 4
      spring-web/src/test/java/org/springframework/http/server/ServletServerHttpResponseTests.java

14
spring-web/src/main/java/org/springframework/http/server/ServletServerHttpResponse.java

@ -47,10 +47,12 @@ public class ServletServerHttpResponse implements ServerHttpResponse { @@ -47,10 +47,12 @@ public class ServletServerHttpResponse implements ServerHttpResponse {
* {@link org.springframework.core.SpringProperties Spring property} to
* turn it on.
* <p>Applications should instead {@link #flush()} on the response directly.
* @since 7.0.6
*/
public static final String BODY_FLUSH_ENABLED = "spring.http.response.flush.enabled";
public static final String FLUSH_ENABLED_PROPERTY_NAME = "spring.http.response.flush.enabled";
private final boolean flushEnabled = SpringProperties.getFlag(BODY_FLUSH_ENABLED);
private final boolean flushEnabled = SpringProperties.getFlag(FLUSH_ENABLED_PROPERTY_NAME);
private final HttpServletResponse servletResponse;
@ -104,8 +106,8 @@ public class ServletServerHttpResponse implements ServerHttpResponse { @@ -104,8 +106,8 @@ public class ServletServerHttpResponse implements ServerHttpResponse {
/**
* Return the body of the message as an output stream.
* <p>By default, flushing the output stream has no effect
* (see {@link #BODY_FLUSH_ENABLED}) and should be performed
* using {@link #flush()} instead.
* (see {@link #FLUSH_ENABLED_PROPERTY_NAME}) and should be performed
* using the ServerHttpResponse-level {@link #flush()} method instead.
* @return the output stream body (never {@code null})
* @throws IOException in case of I/O errors
*/
@ -113,8 +115,8 @@ public class ServletServerHttpResponse implements ServerHttpResponse { @@ -113,8 +115,8 @@ public class ServletServerHttpResponse implements ServerHttpResponse {
public OutputStream getBody() throws IOException {
this.bodyUsed = true;
writeHeaders();
return (this.flushEnabled) ? this.servletResponse.getOutputStream() :
StreamUtils.nonFlushing(this.servletResponse.getOutputStream());
return (this.flushEnabled ? this.servletResponse.getOutputStream() :
StreamUtils.nonFlushing(this.servletResponse.getOutputStream()));
}
@Override

4
spring-web/src/test/java/org/springframework/http/server/ServletServerHttpResponseTests.java

@ -143,7 +143,7 @@ class ServletServerHttpResponseTests { @@ -143,7 +143,7 @@ class ServletServerHttpResponseTests {
@Test
void appliesFlushCallsOnOutputStream() throws Exception {
SpringProperties.setProperty(ServletServerHttpResponse.BODY_FLUSH_ENABLED, Boolean.TRUE.toString());
SpringProperties.setProperty(ServletServerHttpResponse.FLUSH_ENABLED_PROPERTY_NAME, Boolean.TRUE.toString());
ServletOutputStream mockStream = mock();
HttpServletResponse mockResponse = mock();
when(mockResponse.getOutputStream()).thenReturn(mockStream);
@ -154,7 +154,7 @@ class ServletServerHttpResponseTests { @@ -154,7 +154,7 @@ class ServletServerHttpResponseTests {
response.getBody().flush();
verify(mockStream).flush();
SpringProperties.setProperty(ServletServerHttpResponse.BODY_FLUSH_ENABLED, null);
SpringProperties.setProperty(ServletServerHttpResponse.FLUSH_ENABLED_PROPERTY_NAME, null);
}
}

Loading…
Cancel
Save