update suppressions and cleanup code

dota17 · dota17 · commit 9518c2a80037 · 2020-08-29T12:06:53.000+08:00
diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
@@ -11,4 +11,7 @@
   <suppress checks="AbbreviationAsWordInName" files="."/>
   <suppress checks="LineLength" files="."/>
   <suppress checks="VariableDeclarationUsageDistance" files="."/>
-</suppressions>
+  <suppress checks="OverloadMethodsDeclarationOrder" files="."/>
+  <suppress checks="NonEmptyAtclauseDescription" files="."/>
+  <suppress checks="TypeName" files="Draft_6455.java"/>
+</suppressions>
diff --git a/src/main/java/org/java_websocket/SocketChannelIOHelper.java b/src/main/java/org/java_websocket/SocketChannelIOHelper.java
@@ -94,7 +94,8 @@ public static boolean batch(WebSocketImpl ws, ByteChannel sockchannel) throws IO
         }
       }
     } else {
-      do {// FIXME writing as much as possible is unfair!!
+      do {
+        // FIXME writing as much as possible is unfair!!
         /*int written = */
         sockchannel.write(buffer);
         if (buffer.remaining() > 0) {
diff --git a/src/main/java/org/java_websocket/WebSocketImpl.java b/src/main/java/org/java_websocket/WebSocketImpl.java
@@ -204,9 +204,8 @@ public WebSocketImpl(WebSocketListener listener, List<Draft> drafts) {
    * @param draft    The draft which should be used
    */
   public WebSocketImpl(WebSocketListener listener, Draft draft) {
-    if (listener == null || (draft == null && role
-        == Role.SERVER))// socket can be null because we want do be able to create the object without already having a bound channel
-    {
+    // socket can be null because we want do be able to create the object without already having a bound channel
+    if (listener == null || (draft == null && role == Role.SERVER)) {
       throw new IllegalArgumentException("parameters must not be null");
     }
     this.outQueue = new LinkedBlockingQueue<ByteBuffer>();
diff --git a/src/main/java/org/java_websocket/drafts/Draft_6455.java b/src/main/java/org/java_websocket/drafts/Draft_6455.java
@@ -443,12 +443,12 @@ public HandshakeBuilder postProcessHandshakeResponseAsServer(ClientHandshake req
   @Override
   public Draft copyInstance() {
     ArrayList<IExtension> newExtensions = new ArrayList<IExtension>();
-    for (IExtension iExtension : getKnownExtensions()) {
-      newExtensions.add(iExtension.copyInstance());
+    for (IExtension extension : getKnownExtensions()) {
+      newExtensions.add(extension.copyInstance());
     }
     ArrayList<IProtocol> newProtocols = new ArrayList<IProtocol>();
-    for (IProtocol iProtocol : getKnownProtocols()) {
-      newProtocols.add(iProtocol.copyInstance());
+    for (IProtocol protocol : getKnownProtocols()) {
+      newProtocols.add(protocol.copyInstance());
     }
     return new Draft_6455(newExtensions, newProtocols, maxFrameSize);
   }
@@ -589,8 +589,8 @@ private Framedata translateSingleFrame(ByteBuffer buffer)
   private TranslatedPayloadMetaData translateSingleFramePayloadLength(ByteBuffer buffer,
       Opcode optcode, int oldPayloadlength, int maxpacketsize, int oldRealpacketsize)
       throws InvalidFrameException, IncompleteException, LimitExceededException {
-    int payloadlength = oldPayloadlength,
-        realpacketsize = oldRealpacketsize;
+    int payloadlength = oldPayloadlength;
+    int realpacketsize = oldRealpacketsize;
     if (optcode == Opcode.PING || optcode == Opcode.PONG || optcode == Opcode.CLOSING) {
       log.trace("Invalid frame: more than 125 octets");
       throw new InvalidFrameException("more than 125 octets");
diff --git a/src/main/java/org/java_websocket/server/WebSocketServer.java b/src/main/java/org/java_websocket/server/WebSocketServer.java
@@ -361,17 +361,17 @@ public void run() {
       return;
     }
     try {
-      int iShutdownCount = 5;
+      int shutdownCount = 5;
       int selectTimeout = 0;
-      while (!selectorthread.isInterrupted() && iShutdownCount != 0) {
+      while (!selectorthread.isInterrupted() && shutdownCount != 0) {
         SelectionKey key = null;
         try {
           if (isclosed.get()) {
             selectTimeout = 5;
           }
           int keyCount = selector.select(selectTimeout);
           if (keyCount == 0 && isclosed.get()) {
-            iShutdownCount--;
+            shutdownCount--;
           }
           Set<SelectionKey> keys = selector.selectedKeys();
           Iterator<SelectionKey> i = keys.iterator();
@@ -993,15 +993,15 @@ public void broadcast(String text, Collection<WebSocket> clients) {
    * @param clients the clients to send the message to
    */
   private void doBroadcast(Object data, Collection<WebSocket> clients) {
-    String sData = null;
+    String strData = null;
     if (data instanceof String) {
-      sData = (String) data;
+      strData = (String) data;
     }
-    ByteBuffer bData = null;
+    ByteBuffer byteData = null;
     if (data instanceof ByteBuffer) {
-      bData = (ByteBuffer) data;
+      byteData = (ByteBuffer) data;
     }
-    if (sData == null && bData == null) {
+    if (strData == null && byteData == null) {
       return;
     }
     Map<Draft, List<Framedata>> draftFrames = new HashMap<Draft, List<Framedata>>();
@@ -1012,7 +1012,7 @@ private void doBroadcast(Object data, Collection<WebSocket> clients) {
     for (WebSocket client : clientCopy) {
       if (client != null) {
         Draft draft = client.getDraft();
-        fillFrames(draft, draftFrames, sData, bData);
+        fillFrames(draft, draftFrames, strData, byteData);
         try {
           client.sendFrame(draftFrames.get(draft));
         } catch (WebsocketNotConnectedException e) {
@@ -1027,18 +1027,18 @@ private void doBroadcast(Object data, Collection<WebSocket> clients) {
    *
    * @param draft       The draft to use
    * @param draftFrames The list of frames per draft to fill
-   * @param sData       the string data, can be null
-   * @param bData       the byte buffer data, can be null
+   * @param strData       the string data, can be null
+   * @param byteData       the byte buffer data, can be null
    */
-  private void fillFrames(Draft draft, Map<Draft, List<Framedata>> draftFrames, String sData,
-      ByteBuffer bData) {
+  private void fillFrames(Draft draft, Map<Draft, List<Framedata>> draftFrames, String strData,
+      ByteBuffer byteData) {
     if (!draftFrames.containsKey(draft)) {
       List<Framedata> frames = null;
-      if (sData != null) {
-        frames = draft.createFrames(sData, false);
+      if (strData != null) {
+        frames = draft.createFrames(strData, false);
       }
-      if (bData != null) {
-        frames = draft.createFrames(bData, false);
+      if (byteData != null) {
+        frames = draft.createFrames(byteData, false);
       }
       if (frames != null) {
         draftFrames.put(draft, frames);

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,8 @@ public static boolean batch(WebSocketImpl ws, ByteChannel sockchannel) throws IO`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`	`} else {`
`97`		`- do {// FIXME writing as much as possible is unfair!!`
	`97`	`+ do {`
	`98`	`+ // FIXME writing as much as possible is unfair!!`
`98`	`99`	`/int written = /`
`99`	`100`	`sockchannel.write(buffer);`
`100`	`101`	`if (buffer.remaining() > 0) {`