optimize code and remove empty line

dota17 · dota17 · commit b04a5adfb58a · 2020-08-14T11:51:40.000+08:00
diff --git a/src/main/java/org/java_websocket/extensions/permessage_deflate/PerMessageDeflateExtension.java b/src/main/java/org/java_websocket/extensions/permessage_deflate/PerMessageDeflateExtension.java
@@ -196,7 +196,7 @@ public void encodeFrame(Framedata inputFrame) {
       output.write(buffer, 0, bytesCompressed);
     }
 
-    byte outputBytes[] = output.toByteArray();
+    byte[] outputBytes = output.toByteArray();
     int outputLength = outputBytes.length;
 
         /*
diff --git a/src/main/java/org/java_websocket/util/Charsetfunctions.java b/src/main/java/org/java_websocket/util/Charsetfunctions.java
@@ -25,14 +25,12 @@
 
 package org.java_websocket.util;
 
-import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
 import java.nio.charset.CharacterCodingException;
-import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CodingErrorAction;
+import java.nio.charset.StandardCharsets;
 import org.java_websocket.exceptions.InvalidDataException;
-import org.java_websocket.exceptions.InvalidEncodingException;
 import org.java_websocket.framing.CloseFrame;
 
 public class Charsetfunctions {
@@ -49,42 +47,30 @@ private Charsetfunctions() {
    * @return UTF-8 encoding in bytes
    */
   public static byte[] utf8Bytes(String s) {
-    try {
-      return s.getBytes("UTF8");
-    } catch (UnsupportedEncodingException e) {
-      throw new InvalidEncodingException(e);
-    }
+    return s.getBytes(StandardCharsets.UTF_8);
   }
 
   /*
    * @return ASCII encoding in bytes
    */
   public static byte[] asciiBytes(String s) {
-    try {
-      return s.getBytes("ASCII");
-    } catch (UnsupportedEncodingException e) {
-      throw new InvalidEncodingException(e);
-    }
+    return s.getBytes(StandardCharsets.US_ASCII);
   }
 
   public static String stringAscii(byte[] bytes) {
     return stringAscii(bytes, 0, bytes.length);
   }
 
   public static String stringAscii(byte[] bytes, int offset, int length) {
-    try {
-      return new String(bytes, offset, length, "ASCII");
-    } catch (UnsupportedEncodingException e) {
-      throw new InvalidEncodingException(e);
-    }
+    return new String(bytes, offset, length, StandardCharsets.US_ASCII);
   }
 
   public static String stringUtf8(byte[] bytes) throws InvalidDataException {
     return stringUtf8(ByteBuffer.wrap(bytes));
   }
 
   public static String stringUtf8(ByteBuffer bytes) throws InvalidDataException {
-    CharsetDecoder decode = Charset.forName("UTF8").newDecoder();
+    CharsetDecoder decode = StandardCharsets.UTF_8.newDecoder();
     decode.onMalformedInput(codingErrorAction);
     decode.onUnmappableCharacter(codingErrorAction);
     String s;
diff --git a/src/test/java/org/java_websocket/issues/Issue997Test.java b/src/test/java/org/java_websocket/issues/Issue997Test.java
@@ -175,8 +175,6 @@ protected void onSetSSLParameters(SSLParameters sslParameters) {
 
   }
 
-  ;
-
 
   private static class SSLWebSocketServer extends WebSocketServer {
 

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ public void encodeFrame(Framedata inputFrame) {`
`196`	`196`	`output.write(buffer, 0, bytesCompressed);`
`197`	`197`	`}`
`198`	`198`
`199`		`- byte outputBytes[] = output.toByteArray();`
	`199`	`+ byte[] outputBytes = output.toByteArray();`
`200`	`200`	`int outputLength = outputBytes.length;`
`201`	`201`
`202`	`202`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -175,8 +175,6 @@ protected void onSetSSLParameters(SSLParameters sslParameters) {`
`175`	`175`
`176`	`176`	`}`
`177`	`177`
`178`		`- ;`
`179`		`-`
`180`	`178`
`181`	`179`	`private static class SSLWebSocketServer extends WebSocketServer {`
`182`	`180`