minor clean up

Author: Stephane Landelle

api/src/main/java/org/asynchttpclient/websocket/WebSocketUpgradeHandler.java

@@ -27,22 +27,13 @@
 public class WebSocketUpgradeHandler implements UpgradeHandler<WebSocket>, AsyncHandler<WebSocket> {
 
  private WebSocket webSocket;
- private final ConcurrentLinkedQueue<WebSocketListener> l;
- @SuppressWarnings("unused")
- private final String protocol;
- @SuppressWarnings("unused")
- private final long maxByteSize;
- @SuppressWarnings("unused")
- private final long maxTextSize;
+ private final ConcurrentLinkedQueue<WebSocketListener> listeners;
  private final AtomicBoolean ok = new AtomicBoolean(false);
  private final AtomicBoolean onSuccessCalled = new AtomicBoolean(false);
  private int status;
 
- private WebSocketUpgradeHandler(Builder b) {
- l = b.l;
- protocol = b.protocol;
- maxByteSize = b.maxByteSize;
- maxTextSize = b.maxTextSize;
+ public WebSocketUpgradeHandler(ConcurrentLinkedQueue<WebSocketListener> listeners) {
+ this.listeners = listeners;
  }
 
  /**
@@ -93,8 +84,9 @@ public final STATE onHeadersReceived(HttpResponseHeaders headers) throws Excepti
  public final WebSocket onCompleted() throws Exception {
 
  if (status != 101) {
- for (WebSocketListener w : l) {
- w.onError(new IllegalStateException(String.format("Invalid Status Code %d", status)));
+ IllegalStateException e = new IllegalStateException("Invalid Status Code " + status);
+ for (WebSocketListener listener : listeners) {
+ listener.onError(e);
  }
  return null;
  }
@@ -111,9 +103,9 @@ public final WebSocket onCompleted() throws Exception {
  @Override
  public final void onSuccess(WebSocket webSocket) {
  this.webSocket = webSocket;
- for (WebSocketListener w : l) {
- webSocket.addWebSocketListener(w);
- w.onOpen(webSocket);
+ for (WebSocketListener listener : listeners) {
+ webSocket.addWebSocketListener(listener);
+ listener.onOpen(webSocket);
  }
  ok.set(true);
  }
@@ -123,11 +115,11 @@ public final void onSuccess(WebSocket webSocket) {
  */
  @Override
  public final void onFailure(Throwable t) {
- for (WebSocketListener w : l) {
+ for (WebSocketListener listener : listeners) {
  if (!ok.get() && webSocket != null) {
- webSocket.addWebSocketListener(w);
+ webSocket.addWebSocketListener(listener);
  }
- w.onError(t);
+ listener.onError(t);
  }
  }
 
@@ -136,13 +128,13 @@ public final void onClose(WebSocket webSocket, int status, String reasonPhrase)
  if (this.webSocket == null)
  this.webSocket = webSocket;
 
- for (WebSocketListener w : l) {
+ for (WebSocketListener listener : listeners) {
  if (webSocket != null) {
- webSocket.addWebSocketListener(w);
+ webSocket.addWebSocketListener(listener);
  }
- w.onClose(webSocket);
- if (w instanceof WebSocketCloseCodeReasonListener) {
- WebSocketCloseCodeReasonListener.class.cast(w).onClose(webSocket, status, reasonPhrase);
+ listener.onClose(webSocket);
+ if (listener instanceof WebSocketCloseCodeReasonListener) {
+ WebSocketCloseCodeReasonListener.class.cast(listener).onClose(webSocket, status, reasonPhrase);
  }
  }
  }
@@ -151,10 +143,8 @@ public final void onClose(WebSocket webSocket, int status, String reasonPhrase)
  * Build a {@link WebSocketUpgradeHandler}
  */
  public final static class Builder {
- private ConcurrentLinkedQueue<WebSocketListener> l = new ConcurrentLinkedQueue<WebSocketListener>();
- private String protocol = "";
- private long maxByteSize = 8192;
- private long maxTextSize = 8192;
+
+ private ConcurrentLinkedQueue<WebSocketListener> listeners = new ConcurrentLinkedQueue<WebSocketListener>();
 
  /**
  * Add a {@link WebSocketListener} that will be added to the {@link WebSocket}
@@ -163,7 +153,7 @@ public final static class Builder {
  * @return this
  */
  public Builder addWebSocketListener(WebSocketListener listener) {
- l.add(listener);
+ listeners.add(listener);
  return this;
  }
 
@@ -174,40 +164,7 @@ public Builder addWebSocketListener(WebSocketListener listener) {
  * @return this
  */
  public Builder removeWebSocketListener(WebSocketListener listener) {
- l.remove(listener);
- return this;
- }
-
- /**
- * Set the WebSocket protocol.
- *
- * @param protocol the WebSocket protocol.
- * @return this
- */
- public Builder setProtocol(String protocol) {
- this.protocol = protocol;
- return this;
- }
-
- /**
- * Set the max size of the WebSocket byte message that will be sent.
- *
- * @param maxByteSize max size of the WebSocket byte message
- * @return this
- */
- public Builder setMaxByteSize(long maxByteSize) {
- this.maxByteSize = maxByteSize;
- return this;
- }
-
- /**
- * Set the max size of the WebSocket text message that will be sent.
- *
- * @param maxTextSize max size of the WebSocket byte message
- * @return this
- */
- public Builder setMaxTextSize(long maxTextSize) {
- this.maxTextSize = maxTextSize;
+ listeners.remove(listener);
  return this;
  }
 
@@ -217,7 +174,7 @@ public Builder setMaxTextSize(long maxTextSize) {
  * @return a {@link WebSocketUpgradeHandler}
  */
  public WebSocketUpgradeHandler build() {
- return new WebSocketUpgradeHandler(this);
+ return new WebSocketUpgradeHandler(listeners);
  }
  }
 }

providers/netty/src/main/java/org/asynchttpclient/providers/netty/ws/NettyWebSocket.java

@@ -103,11 +103,8 @@ public int getMaxBufferSize() {
  return maxBufferSize;
  }
 
- public void setMaxBufferSize(int bufferSize) {
- maxBufferSize = bufferSize;
-
- if (maxBufferSize < 8192)
- maxBufferSize = 8192;
+ public void setMaxBufferSize(int maxBufferSize) {
+ this.maxBufferSize = Math.max(maxBufferSize, 8192);
  }
 
  @Override