code cleanup

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
eclipse-ee4j · May 5, 2023 · 4d06743 · 4d06743
1 parent d656ae8
commit 4d06743
Show file tree

Hide file tree

Showing 120 changed files with 340 additions and 503 deletions.
diff --git a/core/src/main/java/org/eclipse/angus/mail/auth/Ntlm.java b/core/src/main/java/org/eclipse/angus/mail/auth/Ntlm.java
@@ -30,6 +30,7 @@
 import javax.crypto.spec.DESKeySpec;
 import javax.crypto.spec.SecretKeySpec;
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.security.GeneralSecurityException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
@@ -103,9 +104,7 @@ private void init0() {
             fac = SecretKeyFactory.getInstance("DES");
             cipher = Cipher.getInstance("DES/ECB/NoPadding");
             md4 = new MD4();
-        } catch (NoSuchPaddingException e) {
-            assert false;
-        } catch (NoSuchAlgorithmException e) {
+        } catch (NoSuchPaddingException | NoSuchAlgorithmException e) {
             assert false;
         }
     }
@@ -191,11 +190,7 @@ public String generateType1Msg(int flags, boolean v2) {
             logger.fine("type 1 message: " + toHex(msg));
 
         String result = null;
-        try {
-            result = new String(Base64.getEncoder().encode(msg), "iso-8859-1");
-        } catch (UnsupportedEncodingException e) {
-            assert false;
-        }
+        result = new String(Base64.getEncoder().encode(msg), StandardCharsets.ISO_8859_1);
         return result;
     }
 
@@ -232,13 +227,11 @@ private byte[] hmacMD5(byte[] key, byte[] text) {
         }
         try {
             byte[] nk = new byte[16];
-            System.arraycopy(key, 0, nk, 0, key.length > 16 ? 16 : key.length);
+            System.arraycopy(key, 0, nk, 0, Math.min(key.length, 16));
             SecretKeySpec skey = new SecretKeySpec(nk, "HmacMD5");
             hmac.init(skey);
             return hmac.doFinal(text);
-        } catch (InvalidKeyException ex) {
-            assert false;
-        } catch (RuntimeException e) {
+        } catch (InvalidKeyException | RuntimeException ex) {
             assert false;
         }
         return null;
@@ -247,12 +240,7 @@ private byte[] hmacMD5(byte[] key, byte[] text) {
     private byte[] calcLMHash() throws GeneralSecurityException {
         byte[] magic = {0x4b, 0x47, 0x53, 0x21, 0x40, 0x23, 0x24, 0x25};
         byte[] pwb = null;
-        try {
-            pwb = password.toUpperCase(Locale.ENGLISH).getBytes("iso-8859-1");
-        } catch (UnsupportedEncodingException ex) {
-            // should never happen
-            assert false;
-        }
+        pwb = password.toUpperCase(Locale.ENGLISH).getBytes(StandardCharsets.ISO_8859_1);
         byte[] pwb1 = new byte[14];
         int len = password.length();
         if (len > 14)
@@ -345,12 +333,7 @@ public String generateType3Msg(String type2msg) {
             /* First decode the type2 message to get the server challenge */
             /* challenge is located at type2[24] for 8 bytes */
             byte[] type2 = null;
-            try {
-                type2 = Base64.getDecoder().decode(type2msg.getBytes("us-ascii"));
-            } catch (UnsupportedEncodingException ex) {
-                // should never happen
-                assert false;
-            }
+            type2 = Base64.getDecoder().decode(type2msg.getBytes(StandardCharsets.US_ASCII));
             if (logger.isLoggable(Level.FINE))
                 logger.fine("type 2 message: " + toHex(type2));
 
@@ -447,11 +430,7 @@ public String generateType3Msg(String type2msg) {
                 logger.fine("type 3 message: " + toHex(msg));
 
             String result = null;
-            try {
-                result = new String(Base64.getEncoder().encode(msg), "iso-8859-1");
-            } catch (UnsupportedEncodingException e) {
-                assert false;
-            }
+            result = new String(Base64.getEncoder().encode(msg), StandardCharsets.ISO_8859_1);
             return result;
 
         } catch (GeneralSecurityException ex) {

diff --git a/core/src/main/java/org/eclipse/angus/mail/auth/OAuth2SaslClient.java b/core/src/main/java/org/eclipse/angus/mail/auth/OAuth2SaslClient.java
@@ -16,8 +16,6 @@
 
 package org.eclipse.angus.mail.auth;
 
-import org.eclipse.angus.mail.util.ASCIIUtility;
-
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.NameCallback;
@@ -26,7 +24,7 @@
 import javax.security.sasl.SaslClient;
 import javax.security.sasl.SaslException;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
 /**
@@ -83,12 +81,7 @@ public byte[] evaluateChallenge(byte[] challenge) throws SaslException {
         pcb.clearPassword();
         String resp = "user=" + user + "\001auth=Bearer " + token + "\001\001";
         byte[] response;
-        try {
-            response = resp.getBytes("utf-8");
-        } catch (UnsupportedEncodingException ex) {
-            // fall back to ASCII
-            response = ASCIIUtility.getBytes(resp);
-        }
+        response = resp.getBytes(StandardCharsets.UTF_8);
         complete = true;
         return response;
     }

diff --git a/core/src/main/java/org/eclipse/angus/mail/handlers/image_gif.java b/core/src/main/java/org/eclipse/angus/mail/handlers/image_gif.java
@@ -48,17 +48,14 @@ public Object getContent(DataSource ds) throws IOException {
         InputStream is = ds.getInputStream();
         int pos = 0;
         int count;
-        byte buf[] = new byte[1024];
+        byte[] buf = new byte[1024];
 
         while ((count = is.read(buf, pos, buf.length - pos)) != -1) {
             pos += count;
             if (pos >= buf.length) {
                 int size = buf.length;
-                if (size < 256 * 1024)
-                    size += size;
-                else
-                    size += 256 * 1024;
-                byte tbuf[] = new byte[size];
+                size += Math.min(size, 256 * 1024);
+                byte[] tbuf = new byte[size];
                 System.arraycopy(buf, 0, tbuf, 0, pos);
                 buf = tbuf;
             }

diff --git a/core/src/main/java/org/eclipse/angus/mail/handlers/text_plain.java b/core/src/main/java/org/eclipse/angus/mail/handlers/text_plain.java
@@ -84,17 +84,14 @@ public Object getContent(DataSource ds) throws IOException {
         try {
             int pos = 0;
             int count;
-            char buf[] = new char[1024];
+            char[] buf = new char[1024];
 
             while ((count = is.read(buf, pos, buf.length - pos)) != -1) {
                 pos += count;
                 if (pos >= buf.length) {
                     int size = buf.length;
-                    if (size < 256 * 1024)
-                        size += size;
-                    else
-                        size += 256 * 1024;
-                    char tbuf[] = new char[size];
+                    size += Math.min(size, 256 * 1024);
+                    char[] tbuf = new char[size];
                     System.arraycopy(buf, 0, tbuf, 0, pos);
                     buf = tbuf;
                 }

diff --git a/core/src/main/java/org/eclipse/angus/mail/handlers/text_xml.java b/core/src/main/java/org/eclipse/angus/mail/handlers/text_xml.java
@@ -98,13 +98,7 @@ public void writeTo(Object obj, String mimeType, OutputStream os)
             } else {
                 transformer.transform((Source) obj, result);
             }
-        } catch (TransformerException ex) {
-            IOException ioex = new IOException(
-                    "Unable to run the JAXP transformer on a stream "
-                            + ex.getMessage());
-            ioex.initCause(ex);
-            throw ioex;
-        } catch (RuntimeException ex) {
+        } catch (TransformerException | RuntimeException ex) {
             IOException ioex = new IOException(
                     "Unable to run the JAXP transformer on a stream "
                             + ex.getMessage());
@@ -119,9 +113,7 @@ private boolean isXmlType(String type) {
             return ct.getSubType().equals("xml") &&
                     (ct.getPrimaryType().equals("text") ||
                             ct.getPrimaryType().equals("application"));
-        } catch (ParseException ex) {
-            return false;
-        } catch (RuntimeException ex) {
+        } catch (ParseException | RuntimeException ex) {
             return false;
         }
     }

diff --git a/core/src/main/java/org/eclipse/angus/mail/util/BASE64DecoderStream.java b/core/src/main/java/org/eclipse/angus/mail/util/BASE64DecoderStream.java
@@ -188,7 +188,7 @@ public int available() throws IOException {
      * This character array provides the character to value map
      * based on RFC1521.
      */
-    private final static char pem_array[] = {
+    private final static char[] pem_array = {
             'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', // 0
             'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', // 1
             'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', // 2
@@ -199,7 +199,7 @@ public int available() throws IOException {
             '4', '5', '6', '7', '8', '9', '+', '/'  // 7
     };
 
-    private final static byte pem_convert_array[] = new byte[256];
+    private final static byte[] pem_convert_array = new byte[256];
 
     static {
         for (int i = 0; i < 255; i++)
@@ -369,7 +369,7 @@ private String recentChars() {
         // reach into the input buffer and extract up to 10
         // recent characters, to help in debugging.
         String errstr = "";
-        int nc = input_pos > 10 ? 10 : input_pos;
+        int nc = Math.min(input_pos, 10);
         if (nc > 0) {
             errstr += ", the " + nc +
                     " most recent characters were: \"";

diff --git a/core/src/main/java/org/eclipse/angus/mail/util/BASE64EncoderStream.java b/core/src/main/java/org/eclipse/angus/mail/util/BASE64EncoderStream.java
@@ -192,7 +192,7 @@ public synchronized void close() throws IOException {
     /**
      * This array maps the characters to their 6 bit values
      */
-    private final static char pem_array[] = {
+    private final static char[] pem_array = {
             'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', // 0
             'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', // 1
             'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', // 2

diff --git a/core/src/main/java/org/eclipse/angus/mail/util/CRLFOutputStream.java b/core/src/main/java/org/eclipse/angus/mail/util/CRLFOutputStream.java
@@ -51,12 +51,12 @@ public void write(int b) throws IOException {
     }
 
     @Override
-    public void write(byte b[]) throws IOException {
+    public void write(byte[] b) throws IOException {
         write(b, 0, b.length);
     }
 
     @Override
-    public void write(byte b[], int off, int len) throws IOException {
+    public void write(byte[] b, int off, int len) throws IOException {
         int start = off;
 
         len += off;

diff --git a/core/src/main/java/org/eclipse/angus/mail/util/LogOutputStream.java b/core/src/main/java/org/eclipse/angus/mail/util/LogOutputStream.java
@@ -59,12 +59,12 @@ public void write(int b) throws IOException {
     }
 
     @Override
-    public void write(byte b[]) throws IOException {
+    public void write(byte[] b) throws IOException {
         write(b, 0, b.length);
     }
 
     @Override
-    public void write(byte b[], int off, int len) throws IOException {
+    public void write(byte[] b, int off, int len) throws IOException {
         int start = off;
 
         if (!logger.isLoggable(level))

diff --git a/core/src/main/java/org/eclipse/angus/mail/util/MailLogger.java b/core/src/main/java/org/eclipse/angus/mail/util/MailLogger.java
@@ -228,7 +228,7 @@ public void log(Level level, String msg) {
      */
     public void log(Level level, String msg, Object param1) {
         if (debug) {
-            msg = MessageFormat.format(msg, new Object[]{param1});
+            msg = MessageFormat.format(msg, param1);
             debugOut(msg);
         }
 
@@ -395,7 +395,7 @@ private String packageOf(Class<?> clazz) {
      */
     private StackTraceElement inferCaller() {
         // Get the stack trace.
-        StackTraceElement stack[] = (new Throwable()).getStackTrace();
+        StackTraceElement[] stack = (new Throwable()).getStackTrace();
         // First, search back to a method in the Logger class.
         int ix = 0;
         while (ix < stack.length) {

diff --git a/core/src/main/java/org/eclipse/angus/mail/util/QPEncoderStream.java b/core/src/main/java/org/eclipse/angus/mail/util/QPEncoderStream.java
@@ -162,7 +162,7 @@ private void outputCRLF() throws IOException {
     }
 
     // The encoding table
-    private final static char hex[] = {
+    private final static char[] hex = {
             '0', '1', '2', '3', '4', '5', '6', '7',
             '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
     };

diff --git a/core/src/main/java/org/eclipse/angus/mail/util/SocketFetcher.java b/core/src/main/java/org/eclipse/angus/mail/util/SocketFetcher.java
@@ -427,8 +427,8 @@ private static SocketFactory getSocketFactory(String sfClass)
         if (clsSockFact == null)
             clsSockFact = Class.forName(sfClass);
         // get & invoke the getDefault() method
-        Method mthGetDefault = clsSockFact.getMethod("getDefault",
-                new Class<?>[]{});
+        Method mthGetDefault = clsSockFact.getMethod("getDefault"
+        );
         SocketFactory sf = (SocketFactory)
                 mthGetDefault.invoke(new Object(), new Object[]{});
         return sf;
@@ -608,7 +608,7 @@ private static void configureSSLSocket(Socket socket, String host,
                     eprots.add(prots[i]);
             }
             sslsocket.setEnabledProtocols(
-                    eprots.toArray(new String[eprots.size()]));
+                    eprots.toArray(new String[0]));
         }
         String ciphers = props.getProperty(prefix + ".ssl.ciphersuites", null);
         if (ciphers != null)
@@ -723,17 +723,17 @@ private static boolean matchCert(String server, X509Certificate cert) {
             // HostnameChecker.TYPE_LDAP == 2
             // LDAP requires the same regex handling as we need
             Method getInstance = hnc.getMethod("getInstance",
-                    new Class<?>[]{byte.class});
+                    byte.class);
             Object hostnameChecker = getInstance.invoke(new Object(),
-                    new Object[]{Byte.valueOf((byte) 2)});
+                    Byte.valueOf((byte) 2));
 
             // invoke hostnameChecker.match( server, cert)
             if (logger.isLoggable(Level.FINER))
                 logger.finer("using sun.security.util.HostnameChecker");
             Method match = hnc.getMethod("match",
-                    new Class<?>[]{String.class, X509Certificate.class});
+                    String.class, X509Certificate.class);
             try {
-                match.invoke(hostnameChecker, new Object[]{server, cert});
+                match.invoke(hostnameChecker, server, cert);
                 return true;
             } catch (InvocationTargetException cex) {
                 logger.log(Level.FINER, "HostnameChecker FAIL", cex);
@@ -908,7 +908,7 @@ private static String[] stringArray(String s) {
         List<String> tokens = new ArrayList<>();
         while (st.hasMoreTokens())
             tokens.add(st.nextToken());
-        return tokens.toArray(new String[tokens.size()]);
+        return tokens.toArray(new String[0]);
     }
 
     /**

diff --git a/core/src/main/java/org/eclipse/angus/mail/util/TraceInputStream.java b/core/src/main/java/org/eclipse/angus/mail/util/TraceInputStream.java
@@ -103,7 +103,7 @@ public int read() throws IOException {
      * trace mode is <code>true</code>
      */
     @Override
-    public int read(byte b[], int off, int len) throws IOException {
+    public int read(byte[] b, int off, int len) throws IOException {
         int count = in.read(b, off, len);
         if (trace && count != -1) {
             if (quote) {

diff --git a/core/src/main/java/org/eclipse/angus/mail/util/TraceOutputStream.java b/core/src/main/java/org/eclipse/angus/mail/util/TraceOutputStream.java
@@ -109,7 +109,7 @@ public void write(int b) throws IOException {
      * @exception IOException    for I/O errors
      */
     @Override
-    public void write(byte b[], int off, int len) throws IOException {
+    public void write(byte[] b, int off, int len) throws IOException {
         if (trace) {
             if (quote) {
                 for (int i = 0; i < len; i++)

diff --git a/core/src/main/java/org/eclipse/angus/mail/util/WriteTimeoutSocket.java b/core/src/main/java/org/eclipse/angus/mail/util/WriteTimeoutSocket.java
@@ -470,8 +470,6 @@ private String handleTimeoutTaskResult(ScheduledFuture<String> sf) {
             return sf.get(timeout, TimeUnit.MILLISECONDS);
         } catch (TimeoutException e) {
             exceptionMessage = String.format("%s %s", e, ses.toString());
-        } catch (CancellationException e) {
-            exceptionMessage = e.toString();
         } catch (InterruptedException e) {
             wasInterrupted = true;
             exceptionMessage = e.toString();

diff --git a/demos/client/src/main/java/example/client/SimpleClient.java b/demos/client/src/main/java/example/client/SimpleClient.java
@@ -45,7 +45,7 @@ public class SimpleClient {
     static FolderViewer fv;
     static MessageViewer mv;
 
-    public static void main(String argv[]) {
+    public static void main(String[] argv) {
         boolean usage = false;
 
         for (int optind = 0; optind < argv.length; optind++) {

diff --git a/demos/client/src/main/java/example/client/TextViewer.java b/demos/client/src/main/java/example/client/TextViewer.java
@@ -69,7 +69,7 @@ public void setInputStream(InputStream ins) {
         int bytes_read = 0;
         // check that we can actually read
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        byte data[] = new byte[1024];
+        byte[] data = new byte[1024];
 
         try {
             while ((bytes_read = ins.read(data)) > 0)

diff --git a/demos/demo/src/main/java/example/app/CRLFOutputStream.java b/demos/demo/src/main/java/example/app/CRLFOutputStream.java
@@ -49,11 +49,11 @@ public void write(int b) throws IOException {
         lastb = b;
     }
 
-    public void write(byte b[]) throws IOException {
+    public void write(byte[] b) throws IOException {
         write(b, 0, b.length);
     }
 
-    public void write(byte b[], int off, int len) throws IOException {
+    public void write(byte[] b, int off, int len) throws IOException {
         int start = off;
 
         len += off;