Minor clean: rename NRF fields and accessors

Author: slandelle

client/src/main/java/org/asynchttpclient/netty/NettyResponseFuture.java

@@ -73,23 +73,18 @@ public final class NettyResponseFuture<V> extends AbstractListenableFuture<V> {
     private volatile int inAuth = 0;
     private volatile int inProxyAuth = 0;
     private volatile int statusReceived = 0;
+    @SuppressWarnings("unused")
     private volatile int contentProcessed = 0;
+    @SuppressWarnings("unused")
     private volatile int onThrowableCalled = 0;
 
-    private static final AtomicIntegerFieldUpdater<NettyResponseFuture> isDoneField =
-            AtomicIntegerFieldUpdater.newUpdater(NettyResponseFuture.class, "isDone");
-    private static final AtomicIntegerFieldUpdater<NettyResponseFuture> isCancelledField =
-            AtomicIntegerFieldUpdater.newUpdater(NettyResponseFuture.class, "isCancelled");
-    private static final AtomicIntegerFieldUpdater<NettyResponseFuture> inAuthField =
-            AtomicIntegerFieldUpdater.newUpdater(NettyResponseFuture.class, "inAuth");
-    private static final AtomicIntegerFieldUpdater<NettyResponseFuture> inProxyAuthField =
-            AtomicIntegerFieldUpdater.newUpdater(NettyResponseFuture.class, "inProxyAuth");
-    private static final AtomicIntegerFieldUpdater<NettyResponseFuture> statusReceivedField =
-            AtomicIntegerFieldUpdater.newUpdater(NettyResponseFuture.class, "statusReceived");
-    private static final AtomicIntegerFieldUpdater<NettyResponseFuture> contentProcessedField =
-            AtomicIntegerFieldUpdater.newUpdater(NettyResponseFuture.class, "contentProcessed");
-    private static final AtomicIntegerFieldUpdater<NettyResponseFuture> onThrowableCalledField =
-            AtomicIntegerFieldUpdater.newUpdater(NettyResponseFuture.class, "onThrowableCalled");
+    private static final AtomicIntegerFieldUpdater<NettyResponseFuture<?>> isDoneField = newAtomicIntegerFieldUpdater(NettyResponseFuture.class, "isDone");
+    private static final AtomicIntegerFieldUpdater<NettyResponseFuture<?>> isCancelledField = newAtomicIntegerFieldUpdater(NettyResponseFuture.class, "isCancelled");
+    private static final AtomicIntegerFieldUpdater<NettyResponseFuture<?>> inAuthField = newAtomicIntegerFieldUpdater(NettyResponseFuture.class, "inAuth");
+    private static final AtomicIntegerFieldUpdater<NettyResponseFuture<?>> inProxyAuthField = newAtomicIntegerFieldUpdater(NettyResponseFuture.class, "inProxyAuth");
+    private static final AtomicIntegerFieldUpdater<NettyResponseFuture<?>> statusReceivedField = newAtomicIntegerFieldUpdater(NettyResponseFuture.class, "statusReceived");
+    private static final AtomicIntegerFieldUpdater<NettyResponseFuture<?>> contentProcessedField = newAtomicIntegerFieldUpdater(NettyResponseFuture.class, "contentProcessed");
+    private static final AtomicIntegerFieldUpdater<NettyResponseFuture<?>> onThrowableCalledField = newAtomicIntegerFieldUpdater(NettyResponseFuture.class, "onThrowableCalled");
 
     // volatile where we need CAS ops
     private volatile int redirectCount = 0;
@@ -109,7 +104,7 @@ public final class NettyResponseFuture<V> extends AbstractListenableFuture<V> {
     private Request currentRequest;
     private NettyRequest nettyRequest;
     private AsyncHandler<V> asyncHandler;
-    private boolean streamWasAlreadyConsumed;
+    private boolean streamAlreadyConsumed;
     private boolean reuseChannel;
     private boolean headersAlreadyWrittenOnContinue;
     private boolean dontWriteBodyBecauseExpectContinue;
@@ -354,27 +349,27 @@ public TimeoutsHolder getTimeoutsHolder() {
         return timeoutsHolder;
     }
 
-    public boolean getInAuth() {
+    public boolean isInAuth() {
         return inAuth != 0;
     }
 
     public void setInAuth(boolean inAuth) {
         this.inAuth = inAuth ? 1 : 0;
     }
 
-    public boolean getAndSetInAuth(boolean set) {
+    public boolean isAndSetInAuth(boolean set) {
         return inAuthField.getAndSet(this, set ? 1 : 0) != 0;
     }
 
-    public boolean getInProxyAuth() {
+    public boolean isInProxyAuth() {
         return inProxyAuth != 0;
     }
 
     public void setInProxyAuth(boolean inProxyAuth) {
         this.inProxyAuth = inProxyAuth ? 1 : 0;
     }
 
-    public boolean getAndSetInProxyAuth(boolean inProxyAuth) {
+    public boolean isAndSetInProxyAuth(boolean inProxyAuth) {
         return inProxyAuthField.getAndSet(this, inProxyAuth ? 1 : 0) != 0;
     }
 
@@ -386,16 +381,16 @@ public void setChannelState(ChannelState channelState) {
         this.channelState = channelState;
     }
 
-    public boolean getAndSetStatusReceived(boolean sr) {
+    public boolean isAndSetStatusReceived(boolean sr) {
         return statusReceivedField.getAndSet(this, sr ? 1 : 0) != 0;
     }
 
-    public boolean isStreamWasAlreadyConsumed() {
-        return streamWasAlreadyConsumed;
+    public boolean isStreamConsumed() {
+        return streamAlreadyConsumed;
     }
 
-    public void setStreamWasAlreadyConsumed(boolean streamWasAlreadyConsumed) {
-        this.streamWasAlreadyConsumed = streamWasAlreadyConsumed;
+    public void setStreamConsumed(boolean streamConsumed) {
+        this.streamAlreadyConsumed = streamConsumed;
     }
 
     public long getLastTouch() {
@@ -445,7 +440,7 @@ public Channel channel() {
         return channel;
     }
 
-    public boolean reuseChannel() {
+    public boolean isReuseChannel() {
         return reuseChannel;
     }
 
@@ -467,10 +462,8 @@ public void setCurrentRequest(Request currentRequest) {
      * 
      * @return true if that {@link Future} cannot be recovered.
      */
-    public boolean canBeReplayed() {
-        return !isDone() && !(Channels.isChannelValid(channel) && !getUri().getScheme().equalsIgnoreCase("https"))
-                && inAuth == 0
-                && inProxyAuth == 0;
+    public boolean isReplayPossible() {
+        return !isDone() && !(Channels.isChannelValid(channel) && !getUri().getScheme().equalsIgnoreCase("https")) && inAuth == 0 && inProxyAuth == 0;
     }
 
     public long getStart() {

client/src/main/java/org/asynchttpclient/netty/handler/HttpHandler.java

@@ -86,7 +86,7 @@ private boolean exitAfterHandlingStatus(//
             HttpResponse response, AsyncHandler<?> handler,//
             NettyResponseStatus status,//
             HttpRequest httpRequest) throws IOException, Exception {
-        return !future.getAndSetStatusReceived(true) && handler.onStatusReceived(status) != State.CONTINUE;
+        return !future.isAndSetStatusReceived(true) && handler.onStatusReceived(status) != State.CONTINUE;
     }
 
     private boolean exitAfterHandlingHeaders(//

client/src/main/java/org/asynchttpclient/netty/handler/intercept/ProxyUnauthorized407Interceptor.java

@@ -60,7 +60,7 @@ public boolean exitAfterHandling407(//
             ProxyServer proxyServer,//
             HttpRequest httpRequest) {
 
-        if (future.getAndSetInProxyAuth(true)) {
+        if (future.isAndSetInProxyAuth(true)) {
             LOGGER.info("Can't handle 407 as auth was already performed");
             return false;
         }

client/src/main/java/org/asynchttpclient/netty/handler/intercept/Unauthorized401Interceptor.java

@@ -68,7 +68,7 @@ public boolean exitAfterHandling401(//
             return false;
         }
 
-        if (future.getAndSetInAuth(true)) {
+        if (future.isAndSetInAuth(true)) {
             LOGGER.info("Can't handle 401 as auth was already performed");
             return false;
         }

client/src/main/java/org/asynchttpclient/netty/request/NettyRequestSender.java

@@ -203,7 +203,7 @@ private <T> NettyResponseFuture<T> newNettyRequestAndResponseFuture(final Reques
 
     private Channel getOpenChannel(NettyResponseFuture<?> future, Request request, ProxyServer proxyServer, AsyncHandler<?> asyncHandler) {
 
-        if (future != null && future.reuseChannel() && Channels.isChannelValid(future.channel()))
+        if (future != null && future.isReuseChannel() && Channels.isChannelValid(future.channel()))
             return future.channel();
         else
             return pollPooledChannel(request, proxyServer, asyncHandler);
@@ -422,9 +422,9 @@ public boolean retry(NettyResponseFuture<?> future) {
         if (isClosed())
             return false;
 
-        if (future.canBeReplayed()) {
+        if (future.isReplayPossible()) {
             future.setChannelState(ChannelState.RECONNECTED);
-            future.getAndSetStatusReceived(false);
+            future.isAndSetStatusReceived(false);
 
             LOGGER.debug("Trying to recover request {}\n", future.getNettyRequest().getHttpRequest());
             if (future.getAsyncHandler() instanceof AsyncHandlerExtensions) {
@@ -460,7 +460,7 @@ public boolean applyIoExceptionFiltersAndReplayRequest(NettyResponseFuture<?> fu
             }
         }
 
-        if (fc.replayRequest() && future.incrementRetryAndCheck() && future.canBeReplayed()) {
+        if (fc.replayRequest() && future.incrementRetryAndCheck() && future.isReplayPossible()) {
             replayRequest(future, fc, channel);
             replayed = true;
         }

client/src/main/java/org/asynchttpclient/netty/request/WriteListener.java

@@ -67,7 +67,7 @@ protected void operationComplete(Channel channel, Throwable cause) {
              * We need to make sure we aren't in the middle of an authorization process before publishing events as we will re-publish again the same event after the authorization,
              * causing unpredictable behavior.
              */
-            boolean startPublishing = !future.getInAuth() && !future.getInProxyAuth();
+            boolean startPublishing = !future.isInAuth() && !future.isInProxyAuth();
             if (startPublishing) {
 
                 if (notifyHeaders) {

client/src/main/java/org/asynchttpclient/netty/request/body/NettyInputStreamBody.java

@@ -62,15 +62,15 @@ public String getContentType() {
     public void write(Channel channel, NettyResponseFuture<?> future) throws IOException {
         final InputStream is = inputStream;
 
-        if (future.isStreamWasAlreadyConsumed()) {
+        if (future.isStreamConsumed()) {
             if (is.markSupported())
                 is.reset();
             else {
                 LOGGER.warn("Stream has already been consumed and cannot be reset");
                 return;
             }
         } else {
-            future.setStreamWasAlreadyConsumed(true);
+            future.setStreamConsumed(true);
         }
 
         channel.write(new ChunkedStream(is), channel.newProgressivePromise()).addListener(

client/src/main/java/org/asynchttpclient/netty/request/body/NettyReactiveStreamsBody.java

@@ -59,10 +59,10 @@ public String getContentType() {
 
     @Override
     public void write(Channel channel, NettyResponseFuture<?> future) throws IOException {
-        if (future.isStreamWasAlreadyConsumed()) {
+        if (future.isStreamConsumed()) {
             LOGGER.warn("Stream has already been consumed and cannot be reset");
         } else {
-            future.setStreamWasAlreadyConsumed(true);
+            future.setStreamConsumed(true);
             NettySubscriber subscriber = new NettySubscriber(channel, future);
             channel.pipeline().addLast(NAME_IN_CHANNEL_PIPELINE, subscriber);
             publisher.subscribe(new SubscriberAdapter(subscriber));