Minor clean up

Author: Stephane Landelle

src/main/java/com/ning/http/client/providers/netty/ws/NettyWebSocket.java

@@ -34,7 +34,8 @@
 import static org.jboss.netty.buffer.ChannelBuffers.wrappedBuffer;
 
 public class NettyWebSocket implements WebSocket {
-    private final static Logger logger = LoggerFactory.getLogger(NettyWebSocket.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(NettyWebSocket.class);
 
     private final Channel channel;
     private final ConcurrentLinkedQueue<WebSocketListener> listeners = new ConcurrentLinkedQueue<WebSocketListener>();
@@ -142,29 +143,28 @@ public void onBinaryFragment(byte[] message, boolean last) {
 
             if (byteBuffer.size() > maxBufferSize) {
                 byteBuffer.reset();
-                Exception e = new Exception("Exceeded Netty Web Socket maximum buffer size of " + getMaxBufferSize());
+                Exception e = new Exception("Exceeded Netty Web Socket maximum buffer size of " + maxBufferSize);
                 onError(e);
-                this.close();
+                close();
                 return;
             }
         }
 
-        for (WebSocketListener l : listeners) {
-            if (l instanceof WebSocketByteListener) {
+        for (WebSocketListener listener : listeners) {
+            if (listener instanceof WebSocketByteListener) {
+                WebSocketByteListener byteListener = (WebSocketByteListener) listener;
                 try {
                     if (!last) {
-                        WebSocketByteListener.class.cast(l).onFragment(message, last);
+                        byteListener.onFragment(message, last);
+                    } else if (byteBuffer.size() > 0) {
+                        byteBuffer.write(message);
+                        byteListener.onFragment(message, last);
+                        byteListener.onMessage(byteBuffer.toByteArray());
                     } else {
-                        if (byteBuffer.size() > 0) {
-                            byteBuffer.write(message);
-                            WebSocketByteListener.class.cast(l).onFragment(message, last);
-                            WebSocketByteListener.class.cast(l).onMessage(byteBuffer.toByteArray());
-                        } else {
-                            WebSocketByteListener.class.cast(l).onMessage(message);
-                        }
+                        byteListener.onMessage(message);
                     }
                 } catch (Exception ex) {
-                    l.onError(ex);
+                    listener.onError(ex);
                 }
             }
         }
@@ -181,9 +181,9 @@ public void onTextFragment(String message, boolean last) {
 
             if (textBuffer.length() > maxBufferSize) {
                 textBuffer.setLength(0);
-                Exception e = new Exception("Exceeded Netty Web Socket maximum buffer size of " + getMaxBufferSize());
+                Exception e = new Exception("Exceeded Netty Web Socket maximum buffer size of " + maxBufferSize);
                 onError(e);
-                this.close();
+                close();
                 return;
             }
         }
@@ -194,13 +194,11 @@ public void onTextFragment(String message, boolean last) {
                 try {
                     if (!last) {
                         textlistener.onFragment(message, last);
+                    } else if (textBuffer.length() > 0) {
+                        textlistener.onFragment(message, last);
+                        textlistener.onMessage(textBuffer.append(message).toString());
                     } else {
-                        if (textBuffer.length() > 0) {
-                            textlistener.onFragment(message, last);
-                            textlistener.onMessage(textBuffer.append(message).toString());
-                        } else {
-                            textlistener.onMessage(message);
-                        }
+                        textlistener.onMessage(message);
                     }
                 } catch (Exception ex) {
                     listener.onError(ex);
@@ -214,13 +212,12 @@ public void onTextFragment(String message, boolean last) {
     }
 
     public void onError(Throwable t) {
-        for (WebSocketListener l : listeners) {
+        for (WebSocketListener listener : listeners) {
             try {
-                l.onError(t);
+                listener.onError(t);
             } catch (Throwable t2) {
-                logger.error("", t2);
+                LOGGER.error("", t2);
             }
-
         }
     }
 
@@ -243,8 +240,6 @@ public void onClose(int code, String reason) {
 
     @Override
     public String toString() {
-        return "NettyWebSocket{" +
-                "channel=" + channel +
-                '}';
+        return "NettyWebSocket{channel=" + channel + '}';
     }
 }