Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove useless constant reactorNettyRequestChannelOperationsIdPresent

Browse Source 
`reactor.netty.ChannelOperationsId` is available in Reactor Netty 1.1.x from the very beginning.
This commit is contained in:
Violeta Georgieva
2022-09-30 11:32:07 +03:00
committed by rstoyanchev
parent bc13d2b558
commit e81d30160c
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java
View File

@@ -39,7 +39,6 @@ import org.springframework.http.HttpLogging;
import org.springframework.http.HttpMethod;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
@@ -52,10 +51,6 @@ import org.springframework.util.MultiValueMap;
*/
class ReactorServerHttpRequest extends AbstractServerHttpRequest {
/** Reactor Netty 1.0.5+. */
static final boolean reactorNettyRequestChannelOperationsIdPresent = ClassUtils.isPresent(
"reactor.netty.ChannelOperationsId", ReactorServerHttpRequest.class.getClassLoader());
private static final Log logger = HttpLogging.forLogName(ReactorServerHttpRequest.class);
@@ -212,11 +207,9 @@ class ReactorServerHttpRequest extends AbstractServerHttpRequest {
@Override
protected String initLogPrefix() {
if (reactorNettyRequestChannelOperationsIdPresent) {
String id = (ChannelOperationsIdHelper.getId(this.request));
if (id != null) {
return id;
}
String id = (ChannelOperationsIdHelper.getId(this.request));
if (id != null) {
return id;
}
if (this.request instanceof Connection) {
return ((Connection) this.request).channel().id().asShortText() +

6
spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java
View File

@@ -127,10 +127,8 @@ class ReactorServerHttpResponse extends AbstractServerHttpResponse implements Ze
@Override
protected void touchDataBuffer(DataBuffer buffer) {
if (logger.isDebugEnabled()) {
if (ReactorServerHttpRequest.reactorNettyRequestChannelOperationsIdPresent) {
if (ChannelOperationsIdHelper.touch(buffer, this.response)) {
return;
}
if (ChannelOperationsIdHelper.touch(buffer, this.response)) {
return;
}
this.response.withConnection(connection -> {
ChannelId id = connection.channel().id();