Drop UPGRADE State, close AsyncHttpClient#1347

slandelle · slandelle · commit 916b8aa07480 · 2017-02-07T22:44:05.000+01:00
Motivation:

The UPGRADE State is only returned by `WebSocketUpgradeHandler::
onStatusReceived` which is internal and that can only return 2 values,
so it could return CONTINUE instead.

Modifications:

* Drop UPGRADE
* Use CONTINUE instead

Result:

More simple code
diff --git a/client/src/main/java/org/asynchttpclient/AsyncHandler.java b/client/src/main/java/org/asynchttpclient/AsyncHandler.java
@@ -58,11 +58,7 @@ enum State {
         /**
          * Continue the processing
          */
-        CONTINUE,
-        /**
-         * Upgrade the protocol.
-         */
-        UPGRADE
+        CONTINUE
     }
 
     /**
diff --git a/client/src/main/java/org/asynchttpclient/netty/handler/WebSocketHandler.java b/client/src/main/java/org/asynchttpclient/netty/handler/WebSocketHandler.java
@@ -90,7 +90,7 @@ public void call() throws Exception {
             if (connection == null)
                 connection = response.headers().get(CONNECTION);
             boolean validConnection = HttpHeaderValues.UPGRADE.contentEqualsIgnoreCase(connection);
-            boolean statusReceived = handler.onStatusReceived(status) == State.UPGRADE;
+            boolean statusReceived = handler.onStatusReceived(status) == State.CONTINUE;
 
             if (!statusReceived) {
                 try {
diff --git a/client/src/main/java/org/asynchttpclient/ws/WebSocketUpgradeHandler.java b/client/src/main/java/org/asynchttpclient/ws/WebSocketUpgradeHandler.java
@@ -67,7 +67,7 @@ public final State onBodyPartReceived(HttpResponseBodyPart bodyPart) throws Exce
     @Override
     public final State onStatusReceived(HttpResponseStatus responseStatus) throws Exception {
         status = responseStatus.getStatusCode();
-        return status == SWITCHING_PROTOCOLS ? State.UPGRADE : State.ABORT;
+        return status == SWITCHING_PROTOCOLS ? State.CONTINUE : State.ABORT;
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public final State onBodyPartReceived(HttpResponseBodyPart bodyPart) throws Exce`
`67`	`67`	`@Override`
`68`	`68`	`public final State onStatusReceived(HttpResponseStatus responseStatus) throws Exception {`
`69`	`69`	`status = responseStatus.getStatusCode();`
`70`		`- return status == SWITCHING_PROTOCOLS ? State.UPGRADE : State.ABORT;`
	`70`	`+ return status == SWITCHING_PROTOCOLS ? State.CONTINUE : State.ABORT;`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`@Override`