8274079: Cleanup unnecessary calls to Throwable.initCause() in java.base module

Reviewed-by: weijun

src/java.base/share/classes/com/sun/crypto/provider/AESCipher.java

@@ -72,9 +72,7 @@ abstract class AESCipher extends CipherSpi {
                 engineSetPadding(padding);
             } catch (GeneralSecurityException gse) {
                 // internal error; re-throw as provider exception
-                ProviderException pe =new ProviderException("Internal Error");
+                throw new ProviderException("Internal Error", gse);
-                pe.initCause(gse);
-                throw pe;
             }
         }
     }

src/java.base/share/classes/com/sun/crypto/provider/ConstructKeys.java

@@ -76,16 +76,10 @@ final class ConstructKeys {
                                                    encodedKeyAlgorithm +
                                                    "algorithm");
             } catch (InvalidKeySpecException ikse2) {
-                InvalidKeyException ike =
+                throw new InvalidKeyException("Cannot construct public key", ikse2);
-                    new InvalidKeyException("Cannot construct public key");
-                ike.initCause(ikse2);
-                throw ike;
             }
         } catch (InvalidKeySpecException ikse) {
-            InvalidKeyException ike =
+            throw new InvalidKeyException("Cannot construct public key", ikse);
-                new InvalidKeyException("Cannot construct public key");
-            ike.initCause(ikse);
-            throw ike;
         }
 
         return key;
@@ -116,16 +110,10 @@ final class ConstructKeys {
                                                    encodedKeyAlgorithm +
                                                    "algorithm");
             } catch (InvalidKeySpecException ikse2) {
-                InvalidKeyException ike =
+                throw new InvalidKeyException("Cannot construct private key", ikse2);
-                    new InvalidKeyException("Cannot construct private key");
-                ike.initCause(ikse2);
-                throw ike;
             }
         } catch (InvalidKeySpecException ikse) {
-            InvalidKeyException ike =
+            throw new InvalidKeyException("Cannot construct private key", ikse);
-                new InvalidKeyException("Cannot construct private key");
-            ike.initCause(ikse);
-            throw ike;
         } finally {
             SharedSecrets.getJavaSecuritySpecAccess().clearEncodedKeySpec(keySpec);
             if (keyBytes != encodedKey) {

src/java.base/share/classes/com/sun/crypto/provider/DESedeWrapCipher.java

@@ -181,10 +181,7 @@ public final class DESedeWrapCipher extends CipherSpi {
             engineInit(opmode, key, (AlgorithmParameterSpec) null, random);
         } catch (InvalidAlgorithmParameterException iape) {
             // should never happen
-            InvalidKeyException ike =
+            throw new InvalidKeyException("Parameters required", iape);
-                new InvalidKeyException("Parameters required");
-            ike.initCause(iape);
-            throw ike;
         }
     }
 
@@ -285,11 +282,8 @@ public final class DESedeWrapCipher extends CipherSpi {
                 paramsEng.engineInit(params.getEncoded());
                 ivSpec = paramsEng.engineGetParameterSpec(IvParameterSpec.class);
             } catch (Exception ex) {
-                InvalidAlgorithmParameterException iape =
+                throw new InvalidAlgorithmParameterException
-                    new InvalidAlgorithmParameterException
+                    ("Wrong parameter type: IV expected", ex);
-                        ("Wrong parameter type: IV expected");
-                iape.initCause(ex);
-                throw iape;
             }
         }
         engineInit(opmode, key, ivSpec, random);

src/java.base/share/classes/com/sun/crypto/provider/DHPrivateKey.java

@@ -291,10 +291,8 @@ final class DHPrivateKey implements PrivateKey,
             DerInputStream in = new DerInputStream(this.key);
             this.x = in.getBigInteger();
         } catch (IOException e) {
-            InvalidKeyException ike = new InvalidKeyException(
+            throw new InvalidKeyException(
-                "Error parsing key encoding: " + e.getMessage());
+                "Error parsing key encoding: " + e.getMessage(), e);
-            ike.initCause(e);
-            throw ike;
         }
     }
 

src/java.base/share/classes/com/sun/crypto/provider/PBES2Core.java

@@ -162,10 +162,7 @@ abstract class PBES2Core extends CipherSpi {
         try {
             engineInit(opmode, key, (AlgorithmParameterSpec) null, random);
         } catch (InvalidAlgorithmParameterException ie) {
-            InvalidKeyException ike =
+            throw new InvalidKeyException("requires PBE parameters", ie);
-                new InvalidKeyException("requires PBE parameters");
-            ike.initCause(ie);
-            throw ike;
         }
     }
 
@@ -279,10 +276,7 @@ abstract class PBES2Core extends CipherSpi {
         try {
             s = (PBKDF2KeyImpl)kdf.engineGenerateSecret(pbeSpec);
         } catch (InvalidKeySpecException ikse) {
-            InvalidKeyException ike =
+            throw new InvalidKeyException("Cannot construct PBE key", ikse);
-                new InvalidKeyException("Cannot construct PBE key");
-            ike.initCause(ikse);
-            throw ike;
         } finally {
             pbeSpec.clearPassword();
         }

src/java.base/share/classes/com/sun/crypto/provider/PBEWithMD5AndDESCipher.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@ package com.sun.crypto.provider;
 import java.security.*;
 import java.security.spec.*;
 import javax.crypto.*;
-import javax.crypto.spec.*;
 
 /**
  * This class represents password-based encryption as defined by the PKCS #5
@@ -183,10 +182,7 @@ public final class PBEWithMD5AndDESCipher extends CipherSpi {
         try {
             engineInit(opmode, key, (AlgorithmParameterSpec) null, random);
         } catch (InvalidAlgorithmParameterException ie) {
-            InvalidKeyException ike =
+            throw new InvalidKeyException("requires PBE parameters", ie);
-                new InvalidKeyException("requires PBE parameters");
-            ike.initCause(ie);
-            throw ike;
         }
     }
 

src/java.base/share/classes/com/sun/crypto/provider/PBEWithMD5AndTripleDESCipher.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@ package com.sun.crypto.provider;
 import java.security.*;
 import java.security.spec.*;
 import javax.crypto.*;
-import javax.crypto.spec.*;
 
 /**
  * This class implements a proprietary password-based encryption algorithm.
@@ -195,10 +194,7 @@ public final class PBEWithMD5AndTripleDESCipher extends CipherSpi {
         try {
             core.init(opmode, key, (AlgorithmParameterSpec) null, random);
         } catch (InvalidAlgorithmParameterException ie) {
-            InvalidKeyException ike =
+            throw new InvalidKeyException("requires PBE parameters", ie);
-                new InvalidKeyException("requires PBE parameters");
-            ike.initCause(ie);
-            throw ike;
         }
     }
 

src/java.base/share/classes/com/sun/crypto/provider/PBKDF2Core.java

@@ -151,10 +151,8 @@ abstract class PBKDF2Core extends SecretKeyFactorySpi {
                 try {
                     return new PBKDF2KeyImpl(spec, prfAlgo);
                 } catch (InvalidKeySpecException re) {
-                    InvalidKeyException ike = new InvalidKeyException
+                    throw new InvalidKeyException
-                        ("Invalid key component(s)");
+                        ("Invalid key component(s)", re);
-                    ike.initCause(re);
-                    throw ike;
                 } finally {
                     if (password != null) {
                         Arrays.fill(password, (char) 0);

src/java.base/share/classes/com/sun/crypto/provider/PBKDF2HmacSHA1Factory.java

@@ -151,10 +151,8 @@ public final class PBKDF2HmacSHA1Factory extends SecretKeyFactorySpi {
                 try {
                     return new PBKDF2KeyImpl(spec, "HmacSHA1");
                 } catch (InvalidKeySpecException re) {
-                    InvalidKeyException ike = new InvalidKeyException
+                    throw new InvalidKeyException
-                        ("Invalid key component(s)");
+                        ("Invalid key component(s)", re);
-                    ike.initCause(re);
-                    throw ike;
                 } finally {
                     if (password != null) {
                         Arrays.fill(password, (char) 0);

src/java.base/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java

@@ -121,9 +121,7 @@ final class PBKDF2KeyImpl implements javax.crypto.interfaces.PBEKey {
             this.key = deriveKey(prf, passwdBytes, salt, iterCount, keyLength);
         } catch (NoSuchAlgorithmException nsae) {
             // not gonna happen; re-throw just in case
-            InvalidKeySpecException ike = new InvalidKeySpecException();
+            throw new InvalidKeySpecException(nsae);
-            ike.initCause(nsae);
-            throw ike;
         } finally {
             Arrays.fill(passwdBytes, (byte) 0x00);
 

src/java.base/share/classes/com/sun/crypto/provider/PBMAC1Core.java

@@ -26,9 +26,7 @@
 package com.sun.crypto.provider;
 
 import java.util.Arrays;
-import java.nio.ByteBuffer;
 
-import javax.crypto.MacSpi;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.SecretKeySpec;
 import javax.crypto.spec.PBEKeySpec;
@@ -181,10 +179,7 @@ abstract class PBMAC1Core extends HmacCore {
             s = (PBKDF2KeyImpl)kdf.engineGenerateSecret(pbeSpec);
             derivedKey = s.getEncoded();
         } catch (InvalidKeySpecException ikse) {
-            InvalidKeyException ike =
+            throw new InvalidKeyException("Cannot construct PBE key", ikse);
-                new InvalidKeyException("Cannot construct PBE key");
-            ike.initCause(ikse);
-            throw ike;
         } finally {
             pbeSpec.clearPassword();
             if (s != null) {

src/java.base/share/classes/com/sun/crypto/provider/RSACipher.java

@@ -211,10 +211,7 @@ public final class RSACipher extends CipherSpi {
         } catch (InvalidAlgorithmParameterException iape) {
             // never thrown when null parameters are used;
             // but re-throw it just in case
-            InvalidKeyException ike =
+            throw new InvalidKeyException("Wrong parameters", iape);
-                new InvalidKeyException("Wrong parameters");
-            ike.initCause(iape);
-            throw ike;
         }
     }
 
@@ -237,10 +234,7 @@ public final class RSACipher extends CipherSpi {
                         params.getParameterSpec(OAEPParameterSpec.class);
                 init(opmode, key, random, spec);
             } catch (InvalidParameterSpecException ipse) {
-                InvalidAlgorithmParameterException iape =
+                throw new InvalidAlgorithmParameterException("Wrong parameter", ipse);
-                    new InvalidAlgorithmParameterException("Wrong parameter");
-                iape.initCause(ipse);
-                throw iape;
             }
         }
     }

src/java.base/share/classes/java/io/ObjectStreamClass.java

@@ -1712,9 +1712,7 @@ public class ObjectStreamClass implements Serializable {
         } else if (th instanceof Error) {
             throw (Error) th;
         } else {
-            IOException ex = new IOException("unexpected exception type");
+            throw new IOException("unexpected exception type", th);
-            ex.initCause(th);
-            throw ex;
         }
     }
 

src/java.base/share/classes/java/security/cert/TrustAnchor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@ import javax.security.auth.x500.X500Principal;
 
 import sun.security.util.AnchorCertificates;
 import sun.security.x509.NameConstraintsExtension;
-import sun.security.x509.X500Name;
 
 /**
  * A trust anchor or most-trusted Certification Authority (CA).
@@ -286,10 +285,7 @@ public class TrustAnchor {
             try {
                 nc = new NameConstraintsExtension(Boolean.FALSE, bytes);
             } catch (IOException ioe) {
-                IllegalArgumentException iae =
+                throw new IllegalArgumentException(ioe.getMessage(), ioe);
-                    new IllegalArgumentException(ioe.getMessage());
-                iae.initCause(ioe);
-                throw iae;
             }
         }
     }

src/java.base/share/classes/java/security/cert/X509CRLSelector.java

@@ -371,7 +371,7 @@ public class X509CRLSelector implements CRLSelector {
                 try {
                     x500Principals.add(new X500Principal((byte[])nameObject));
                 } catch (IllegalArgumentException e) {
-                    throw (IOException)new IOException("Invalid name").initCause(e);
+                    throw new IOException("Invalid name", e);
                 }
             }
         }

src/java.base/share/classes/java/time/Duration.java

@@ -411,7 +411,7 @@ public final class Duration
                     try {
                         return create(negate, daysAsSecs, hoursAsSecs, minsAsSecs, seconds, nanos);
                     } catch (ArithmeticException ex) {
-                        throw (DateTimeParseException) new DateTimeParseException("Text cannot be parsed to a Duration: overflow", text, 0).initCause(ex);
+                        throw new DateTimeParseException("Text cannot be parsed to a Duration: overflow", text, 0, ex);
                     }
                 }
             }
@@ -432,7 +432,7 @@ public final class Duration
             long val = Long.parseLong(text, start, end, 10);
             return Math.multiplyExact(val, multiplier);
         } catch (NumberFormatException | ArithmeticException ex) {
-            throw (DateTimeParseException) new DateTimeParseException("Text cannot be parsed to a Duration: " + errorText, text, 0).initCause(ex);
+            throw new DateTimeParseException("Text cannot be parsed to a Duration: " + errorText, text, 0, ex);
         }
     }
 
@@ -451,7 +451,7 @@ public final class Duration
             }
             return fraction * negate;
         } catch (NumberFormatException | ArithmeticException ex) {
-            throw (DateTimeParseException) new DateTimeParseException("Text cannot be parsed to a Duration: fraction", text, 0).initCause(ex);
+            throw new DateTimeParseException("Text cannot be parsed to a Duration: fraction", text, 0, ex);
         }
     }
 

src/java.base/share/classes/javax/net/ssl/SSLContext.java

@@ -372,12 +372,9 @@ public class SSLContext {
         try {
             return contextSpi.engineCreateSSLEngine();
         } catch (AbstractMethodError e) {
-            UnsupportedOperationException unsup =
+            throw new UnsupportedOperationException(
-                new UnsupportedOperationException(
+                "Provider: " + getProvider() +
-                    "Provider: " + getProvider() +
+                " doesn't support this operation", e);
-                    " doesn't support this operation");
-            unsup.initCause(e);
-            throw unsup;
         }
     }
 
@@ -412,12 +409,9 @@ public class SSLContext {
         try {
             return contextSpi.engineCreateSSLEngine(peerHost, peerPort);
         } catch (AbstractMethodError e) {
-            UnsupportedOperationException unsup =
+            throw new UnsupportedOperationException(
-                new UnsupportedOperationException(
+                "Provider: " + getProvider() +
-                    "Provider: " + getProvider() +
+                " does not support this operation", e);
-                    " does not support this operation");
-            unsup.initCause(e);
-            throw unsup;
         }
     }
 

src/java.base/share/classes/javax/security/auth/login/Configuration.java

@@ -270,17 +270,15 @@ public abstract class Configuration {
                 } catch (PrivilegedActionException e) {
                     Exception ee = e.getException();
                     if (ee instanceof InstantiationException) {
-                        throw (SecurityException) new
+                        throw new SecurityException
-                            SecurityException
                                     ("Configuration error:" +
                                      ee.getCause().getMessage() +
-                                     "\n").initCause(ee.getCause());
+                                     "\n", ee.getCause());
                     } else {
-                        throw (SecurityException) new
+                        throw new SecurityException
-                            SecurityException
                                     ("Configuration error: " +
                                      ee.toString() +
-                                     "\n").initCause(ee);
+                                     "\n", ee);
                     }
                 }
             }

src/java.base/share/classes/javax/security/auth/x500/X500Principal.java

@@ -181,10 +181,8 @@ public final class X500Principal implements Principal, java.io.Serializable {
         try {
             thisX500Name = new X500Name(name, keywordMap);
         } catch (Exception e) {
-            IllegalArgumentException iae = new IllegalArgumentException
+            throw new IllegalArgumentException
-                        ("improperly specified input name: " + name);
+                        ("improperly specified input name: " + name, e);
-            iae.initCause(e);
-            throw iae;
         }
     }
 
@@ -226,10 +224,8 @@ public final class X500Principal implements Principal, java.io.Serializable {
         try {
             thisX500Name = new X500Name(name);
         } catch (Exception e) {
-            IllegalArgumentException iae = new IllegalArgumentException
+            throw new IllegalArgumentException
-                        ("improperly specified input name");
+                        ("improperly specified input name", e);
-            iae.initCause(e);
-            throw iae;
         }
     }
 
@@ -266,17 +262,13 @@ public final class X500Principal implements Principal, java.io.Serializable {
                 try {
                     is.reset();
                 } catch (IOException ioe) {
-                    IllegalArgumentException iae = new IllegalArgumentException
+                    throw new IllegalArgumentException
                         ("improperly specified input stream " +
-                        ("and unable to reset input stream"));
+                        ("and unable to reset input stream"), e);
-                    iae.initCause(e);
-                    throw iae;
                 }
             }
-            IllegalArgumentException iae = new IllegalArgumentException
+            throw new IllegalArgumentException
-                        ("improperly specified input stream");
+                        ("improperly specified input stream", e);
-            iae.initCause(e);
-            throw iae;
         }
     }
 

src/java.base/share/classes/sun/security/provider/DigestBase.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -184,8 +184,7 @@ abstract class DigestBase extends MessageDigestSpi implements Cloneable {
         try {
             engineDigest(b, 0, b.length);
         } catch (DigestException e) {
-            throw (ProviderException)
+            throw new ProviderException("Internal error", e);
-                new ProviderException("Internal error").initCause(e);
         }
         return b;
     }

src/java.base/share/classes/sun/security/provider/JavaKeyStore.java

@@ -810,9 +810,9 @@ public abstract class JavaKeyStore extends KeyStoreSpi {
                 if (!MessageDigest.isEqual(computed, actual)) {
                     Throwable t = new UnrecoverableKeyException
                             ("Password verification failed");
-                    throw (IOException) new IOException
+                    throw new IOException
                             ("Keystore was tampered with, or "
-                                    + "password was incorrect").initCause(t);
+                                    + "password was incorrect", t);
                 }
             }
         }

src/java.base/share/classes/sun/security/util/HostnameChecker.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -254,8 +254,7 @@ public class HostnameChecker {
                 return new X500Name(subjectX500.getEncoded());
             }
         } catch (IOException e) {
-            throw(CertificateParsingException)
+            throw new CertificateParsingException(e);
-                new CertificateParsingException().initCause(e);
         }
     }