Clean up getAndSetWriteHeaders, that's actually 100-Continue related

Author: Stephane Landelle

api/src/main/java/org/asynchttpclient/ListenableFuture.java

@@ -59,16 +59,6 @@ public interface ListenableFuture<V> extends Future<V> {
  */
  void touch();
 
- /**
- * Write the {@link Request} headers
- */
- boolean getAndSetWriteHeaders(boolean writeHeader);
-
- /**
- * Write the {@link Request} body
- */
- boolean getAndSetWriteBody(boolean writeBody);
-
  /**
  * <p>Adds a listener and executor to the ListenableFuture.
  * The listener will be {@linkplain java.util.concurrent.Executor#execute(Runnable) passed

providers/netty/src/main/java/org/asynchttpclient/providers/netty/future/NettyResponseFuture.java

@@ -95,7 +95,7 @@ public enum STATE {
  private HttpResponse pendingResponse;
  private boolean streamWasAlreadyConsumed;
  private boolean reuseChannel;
- private boolean writeHeaders;
+ private boolean headersAlreadyWrittenOnContinue;
  private boolean writeBody;
  private boolean allowConnect;
 
@@ -121,7 +121,6 @@ public NettyResponseFuture(URI uri,//
  } else {
  maxRetry = config.getMaxRequestRetry();
  }
- writeHeaders = true;
  writeBody = true;
  }
 
@@ -419,19 +418,19 @@ public void setStreamWasAlreadyConsumed(boolean streamWasAlreadyConsumed) {
  public void touch() {
  touch.set(millisTime());
  }
- 
+
  public long getLastTouch() {
  return touch.get();
  }
 
- @Override
- public boolean getAndSetWriteHeaders(boolean writeHeaders) {
- boolean b = this.writeHeaders;
- this.writeHeaders = writeHeaders;
- return b;
+ public void setHeadersAlreadyWrittenOnContinue(boolean headersAlreadyWrittenOnContinue) {
+ this.headersAlreadyWrittenOnContinue = headersAlreadyWrittenOnContinue;
+ }
+
+ public boolean isHeadersAlreadyWrittenOnContinue() {
+ return headersAlreadyWrittenOnContinue;
  }
 
- @Override
  public boolean getAndSetWriteBody(boolean writeBody) {
  boolean b = this.writeBody;
  this.writeBody = writeBody;

providers/netty/src/main/java/org/asynchttpclient/providers/netty/handler/HttpProtocol.java

@@ -245,7 +245,7 @@ public void call() throws Exception {
 
  private boolean handleContinueAndExit(final ChannelHandlerContext ctx, final NettyResponseFuture<?> future, int statusCode) {
  if (statusCode == CONTINUE.code()) {
- future.getAndSetWriteHeaders(false);
+ future.setHeadersAlreadyWrittenOnContinue(true);;
  future.getAndSetWriteBody(true);
  // FIXME why not reuse the channel?
  requestSender.writeRequest(ctx.channel(), config, future);

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

@@ -328,9 +328,8 @@ private void scheduleTimeouts(NettyResponseFuture<?> nettyResponseFuture) {
 
  public final <T> void writeRequest(final Channel channel, final AsyncHttpClientConfig config, final NettyResponseFuture<T> future) {
  try {
- // If the channel is dead because it was pooled and the remote
- // server decided to close it, we just let it go and the
- // closeChannel do it's work.
+ // if the channel is dead because it was pooled and the remote server decided to close it,
+ // we just let it go and the channelInactive do its work
  if (!channel.isOpen() || !channel.isActive()) {
  return;
  }
@@ -343,9 +342,7 @@ public final <T> void writeRequest(final Channel channel, final AsyncHttpClientC
  configureTransferAdapter(handler, httpRequest);
  }
 
- // Leave it to true.
- // FIXME That doesn't just leave to true, the set is always done? and what's the point of not having a is/get?
- if (future.getAndSetWriteHeaders(true)) {
+ if (!future.isHeadersAlreadyWrittenOnContinue()) {
  try {
  if (future.getAsyncHandler() instanceof AsyncHandlerExtensions) {
  AsyncHandlerExtensions.class.cast(future.getAsyncHandler()).onRequestSent();