diff --git a/reactor-netty5-core/src/main/java/reactor/netty5/resources/DefaultLoopEpoll.java b/reactor-netty5-core/src/main/java/reactor/netty5/resources/DefaultLoopEpoll.java index 2ff51d1164..3e7ebd58a3 100644 --- a/reactor-netty5-core/src/main/java/reactor/netty5/resources/DefaultLoopEpoll.java +++ b/reactor-netty5-core/src/main/java/reactor/netty5/resources/DefaultLoopEpoll.java @@ -99,7 +99,7 @@ public EventLoopGroup newEventLoopGroup(int threads, ThreadFactory factory) { static final Logger log = Loggers.getLogger(DefaultLoopEpoll.class); - static final boolean epoll; + static final boolean isEpollAvailable; static { boolean epollCheck = false; @@ -110,9 +110,9 @@ public EventLoopGroup newEventLoopGroup(int threads, ThreadFactory factory) { catch (ClassNotFoundException cnfe) { // noop } - epoll = epollCheck; + isEpollAvailable = epollCheck; if (log.isDebugEnabled()) { - log.debug("Default Epoll support : " + epoll); + log.debug("Default Epoll support : " + isEpollAvailable); } } } diff --git a/reactor-netty5-core/src/main/java/reactor/netty5/resources/DefaultLoopKQueue.java b/reactor-netty5-core/src/main/java/reactor/netty5/resources/DefaultLoopKQueue.java index 19ec6b08d0..3264d69855 100644 --- a/reactor-netty5-core/src/main/java/reactor/netty5/resources/DefaultLoopKQueue.java +++ b/reactor-netty5-core/src/main/java/reactor/netty5/resources/DefaultLoopKQueue.java @@ -98,7 +98,7 @@ public EventLoopGroup newEventLoopGroup(int threads, ThreadFactory factory) { static final Logger log = Loggers.getLogger(DefaultLoopKQueue.class); - static final boolean kqueue; + static final boolean isKqueueAvailable; static { boolean kqueueCheck = false; @@ -109,9 +109,9 @@ public EventLoopGroup newEventLoopGroup(int threads, ThreadFactory factory) { catch (ClassNotFoundException cnfe) { // noop } - kqueue = kqueueCheck; + isKqueueAvailable = kqueueCheck; if (log.isDebugEnabled()) { - log.debug("Default KQueue support : " + kqueue); + log.debug("Default KQueue support : " + isKqueueAvailable); } } } diff --git a/reactor-netty5-core/src/main/java/reactor/netty5/resources/DefaultLoopNativeDetector.java b/reactor-netty5-core/src/main/java/reactor/netty5/resources/DefaultLoopNativeDetector.java index 25f0803411..8d665be620 100644 --- a/reactor-netty5-core/src/main/java/reactor/netty5/resources/DefaultLoopNativeDetector.java +++ b/reactor-netty5-core/src/main/java/reactor/netty5/resources/DefaultLoopNativeDetector.java @@ -29,10 +29,10 @@ final class DefaultLoopNativeDetector { static { NIO = new DefaultLoopNIO(); - if (DefaultLoopEpoll.epoll) { + if (DefaultLoopEpoll.isEpollAvailable) { INSTANCE = new DefaultLoopEpoll(); } - else if (DefaultLoopKQueue.kqueue) { + else if (DefaultLoopKQueue.isKqueueAvailable) { INSTANCE = new DefaultLoopKQueue(); } else { diff --git a/reactor-netty5-http/src/main/java/reactor/netty5/http/server/HAProxyMessageReader.java b/reactor-netty5-http/src/main/java/reactor/netty5/http/server/HAProxyMessageReader.java index 98fb167f1f..3837d4eec0 100644 --- a/reactor-netty5-http/src/main/java/reactor/netty5/http/server/HAProxyMessageReader.java +++ b/reactor-netty5-http/src/main/java/reactor/netty5/http/server/HAProxyMessageReader.java @@ -37,7 +37,7 @@ final class HAProxyMessageReader extends ChannelHandlerAdapter { private static final AttributeKey REMOTE_ADDRESS_FROM_PROXY_PROTOCOL = AttributeKey.valueOf("remoteAddressFromProxyProtocol"); - private static final boolean hasProxyProtocol; + private static final boolean isProxyProtocolAvailable; static { boolean proxyProtocolCheck = true; @@ -47,16 +47,16 @@ final class HAProxyMessageReader extends ChannelHandlerAdapter { catch (ClassNotFoundException cnfe) { proxyProtocolCheck = false; } - hasProxyProtocol = proxyProtocolCheck; + isProxyProtocolAvailable = proxyProtocolCheck; } - static boolean hasProxyProtocol() { - return hasProxyProtocol; + static boolean isProxyProtocolAvailable() { + return isProxyProtocolAvailable; } @Nullable static SocketAddress resolveRemoteAddressFromProxyProtocol(Channel channel) { - if (HAProxyMessageReader.hasProxyProtocol()) { + if (HAProxyMessageReader.isProxyProtocolAvailable()) { return channel.attr(REMOTE_ADDRESS_FROM_PROXY_PROTOCOL).getAndSet(null); } diff --git a/reactor-netty5-http/src/main/java/reactor/netty5/http/server/HttpServer.java b/reactor-netty5-http/src/main/java/reactor/netty5/http/server/HttpServer.java index 466c497db3..df1aa4b857 100644 --- a/reactor-netty5-http/src/main/java/reactor/netty5/http/server/HttpServer.java +++ b/reactor-netty5-http/src/main/java/reactor/netty5/http/server/HttpServer.java @@ -582,7 +582,7 @@ public final HttpServer proxyProtocol(ProxyProtocolSupportType proxyProtocolSupp } if (proxyProtocolSupportType == ProxyProtocolSupportType.ON || proxyProtocolSupportType == ProxyProtocolSupportType.AUTO) { - if (!HAProxyMessageReader.hasProxyProtocol()) { + if (!HAProxyMessageReader.isProxyProtocolAvailable()) { throw new UnsupportedOperationException( "To enable proxyProtocol, you must add the dependency `io.netty:netty-codec-haproxy`" + " to the class path first");