8285263: Minor cleanup could be done in java.security

Reviewed-by: weijun

Author: mcpowers

src/java.base/share/classes/java/security/AlgorithmConstraints.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, 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
@@ -61,12 +61,12 @@ public interface AlgorithmConstraints {
      *     parameters
      *
      * @return true if the algorithm is permitted and can be used for all
-     *     of the specified cryptographic primitives
+     *     the specified cryptographic primitives
      *
      * @throws IllegalArgumentException if primitives or algorithm is null
      *     or empty
      */
-    public boolean permits(Set<CryptoPrimitive> primitives,
+    boolean permits(Set<CryptoPrimitive> primitives,
             String algorithm, AlgorithmParameters parameters);
 
     /**
@@ -78,13 +78,13 @@ public boolean permits(Set<CryptoPrimitive> primitives,
      * @param primitives a set of cryptographic primitives
      * @param key the key
      *
-     * @return true if the key can be used for all of the specified
+     * @return true if the key can be used for all the specified
      *     cryptographic primitives
      *
      * @throws IllegalArgumentException if primitives is null or empty,
      *     or the key is null
      */
-    public boolean permits(Set<CryptoPrimitive> primitives, Key key);
+    boolean permits(Set<CryptoPrimitive> primitives, Key key);
 
     /**
      * Determines whether an algorithm and the corresponding key are granted
@@ -96,13 +96,13 @@ public boolean permits(Set<CryptoPrimitive> primitives,
      * @param parameters the algorithm parameters, or null if no additional
      *     parameters
      *
-     * @return true if the key and the algorithm can be used for all of the
+     * @return true if the key and the algorithm can be used for all the
      *     specified cryptographic primitives
      *
      * @throws IllegalArgumentException if primitives or algorithm is null
      *     or empty, or the key is null
      */
-    public boolean permits(Set<CryptoPrimitive> primitives,
+    boolean permits(Set<CryptoPrimitive> primitives,
                 String algorithm, Key key, AlgorithmParameters parameters);
 
 }

src/java.base/share/classes/java/security/AlgorithmParameterGenerator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, 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
@@ -99,13 +99,13 @@
 public class AlgorithmParameterGenerator {
 
     // The provider
-    private Provider provider;
+    private final Provider provider;
 
     // The provider implementation (delegate)
-    private AlgorithmParameterGeneratorSpi paramGenSpi;
+    private final AlgorithmParameterGeneratorSpi paramGenSpi;
 
     // The algorithm
-    private String algorithm;
+    private final String algorithm;
 
     /**
      * Creates an AlgorithmParameterGenerator object.
@@ -150,7 +150,7 @@ public final String getAlgorithm() {
      * {@code jdk.security.provider.preferred}
      * {@link Security#getProperty(String) Security} property to determine
      * the preferred provider order for the specified algorithm. This
-     * may be different than the order of providers returned by
+     * may be different from the order of providers returned by
      * {@link Security#getProviders() Security.getProviders()}.
      *
      * @param algorithm the name of the algorithm this

src/java.base/share/classes/java/security/AlgorithmParameters.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, 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
@@ -75,13 +75,13 @@
 public class AlgorithmParameters {
 
     // The provider
-    private Provider provider;
+    private final Provider provider;
 
     // The provider implementation (delegate)
-    private AlgorithmParametersSpi paramSpi;
+    private final AlgorithmParametersSpi paramSpi;
 
     // The algorithm
-    private String algorithm;
+    private final String algorithm;
 
     // Has this object been initialized?
     private boolean initialized = false;
@@ -131,7 +131,7 @@ public final String getAlgorithm() {
      * {@code jdk.security.provider.preferred}
      * {@link Security#getProperty(String) Security} property to determine
      * the preferred provider order for the specified algorithm. This
-     * may be different than the order of providers returned by
+     * may be different from the order of providers returned by
      * {@link Security#getProviders() Security.getProviders()}.
      *
      * @param algorithm the name of the algorithm requested.
@@ -342,7 +342,7 @@ public final void init(byte[] params, String format) throws IOException {
      * parameters should be returned in an instance of the
      * {@code DSAParameterSpec} class.
      *
-     * @param <T> the type of the parameter specification to be returrned
+     * @param <T> the type of the parameter specification to be returned
      * @param paramSpec the specification class in which
      * the parameters should be returned.
      *
@@ -356,7 +356,7 @@ public final void init(byte[] params, String format) throws IOException {
         T getParameterSpec(Class<T> paramSpec)
         throws InvalidParameterSpecException
     {
-        if (this.initialized == false) {
+        if (!this.initialized) {
             throw new InvalidParameterSpecException("not initialized");
         }
         return paramSpi.engineGetParameterSpec(paramSpec);
@@ -374,7 +374,7 @@ T getParameterSpec(Class<T> paramSpec)
      */
     public final byte[] getEncoded() throws IOException
     {
-        if (this.initialized == false) {
+        if (!this.initialized) {
             throw new IOException("not initialized");
         }
         return paramSpi.engineGetEncoded();
@@ -396,7 +396,7 @@ public final byte[] getEncoded() throws IOException
      */
     public final byte[] getEncoded(String format) throws IOException
     {
-        if (this.initialized == false) {
+        if (!this.initialized) {
             throw new IOException("not initialized");
         }
         return paramSpi.engineGetEncoded(format);
@@ -409,7 +409,7 @@ public final byte[] getEncoded(String format) throws IOException
      * parameter object has not been initialized.
      */
     public final String toString() {
-        if (this.initialized == false) {
+        if (!this.initialized) {
             return null;
         }
         return paramSpi.engineToString();

src/java.base/share/classes/java/security/AllPermission.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022, 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
@@ -25,12 +25,10 @@
 
 package java.security;
 
-import java.security.*;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.StringTokenizer;
 import sun.security.util.SecurityConstants;
 
+import java.util.Enumeration;
+
 /**
  * The AllPermission is a permission that implies all other permissions.
  * <p>

src/java.base/share/classes/java/security/BasicPermission.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, 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
@@ -40,7 +40,7 @@
  * <P>
  * The name for a BasicPermission is the name of the given permission
  * (for example, "exit",
- * "setFactory", "print.queueJob", etc). The naming
+ * "setFactory", "print.queueJob", etc.). The naming
  * convention follows the  hierarchical property naming convention.
  * An asterisk may appear by itself, or if immediately preceded by a "."
  * may appear at the end of the name, to signify a wildcard match.

src/java.base/share/classes/java/security/CodeSigner.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, 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
@@ -46,14 +46,14 @@ public final class CodeSigner implements Serializable {
      *
      * @serial
      */
-    private CertPath signerCertPath;
+    private final CertPath signerCertPath;
 
     /**
      * The signature timestamp.
      *
      * @serial
      */
-    private Timestamp timestamp;
+    private final Timestamp timestamp;
 
     /*
      * Hash code for this code signer.
@@ -126,7 +126,7 @@ public int hashCode() {
      * @return true if the objects are considered equal, false otherwise.
      */
     public boolean equals(Object obj) {
-        if (obj == null || (!(obj instanceof CodeSigner that))) {
+        if ((!(obj instanceof CodeSigner that))) {
             return false;
         }
 
@@ -139,8 +139,7 @@ public boolean equals(Object obj) {
                 return false;
             }
         } else {
-            if (thatTimestamp == null ||
-                (! timestamp.equals(thatTimestamp))) {
+            if ((!timestamp.equals(thatTimestamp))) {
                 return false;
             }
         }

src/java.base/share/classes/java/security/CodeSource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, 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
@@ -80,7 +80,7 @@ public class CodeSource implements java.io.Serializable {
 
     /**
      * A String form of the URL for use as a key in HashMaps/Sets. The String
-     * form should be behave in the same manner as the URL when compared for
+     * form should behave in the same manner as the URL when compared for
      * equality in a HashMap/Set, except that no nameservice lookup is done
      * on the hostname (only string comparison), and the fragment is not
      * considered.
@@ -211,7 +211,7 @@ public final java.security.cert.Certificate[] getCertificates() {
                     signers[i].getSignerCertPath().getCertificates());
             }
             certs = certChains.toArray(
-                        new java.security.cert.Certificate[certChains.size()]);
+                    new java.security.cert.Certificate[0]);
             return certs.clone();
 
         } else {
@@ -330,7 +330,7 @@ public boolean implies(CodeSource codesource)
      *
      * @param that the CodeSource to check against.
      * @param strict if true then a strict equality match is performed.
-     *               Otherwise a subset match is performed.
+     *               Otherwise, a subset match is performed.
      */
     boolean matchCerts(CodeSource that, boolean strict)
     {
@@ -461,9 +461,7 @@ private boolean matchLocation(CodeSource that) {
                 if (that.sp == null) {
                     that.sp = new SocketPermission(thatHost, "resolve");
                 }
-                if (!this.sp.implies(that.sp)) {
-                    return false;
-                }
+                return this.sp.implies(that.sp);
             }
         }
         // everything matches
@@ -570,7 +568,7 @@ private void readObject(java.io.ObjectInputStream ois)
             // we know of 3 different cert types: X.509, PGP, SDSI, which
             // could all be present in the stream at the same time
             cfs = new Hashtable<>(3);
-            certList = new ArrayList<>(size > 20 ? 20 : size);
+            certList = new ArrayList<>(Math.min(size, 20));
         } else if (size < 0) {
             throw new IOException("size cannot be negative");
         }
@@ -665,7 +663,7 @@ private CodeSigner[] convertCertArrayToSignerArray(
             if (signers.isEmpty()) {
                 return null;
             } else {
-                return signers.toArray(new CodeSigner[signers.size()]);
+                return signers.toArray(new CodeSigner[0]);
             }
 
         } catch (CertificateException e) {

src/java.base/share/classes/java/security/DigestInputStream.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, 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
@@ -25,12 +25,9 @@
 
 package java.security;
 
+import java.io.FilterInputStream;
 import java.io.IOException;
-import java.io.EOFException;
 import java.io.InputStream;
-import java.io.FilterInputStream;
-import java.io.PrintStream;
-import java.io.ByteArrayInputStream;
 
 /**
  * A transparent stream that updates the associated message digest using

src/java.base/share/classes/java/security/DigestOutputStream.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, 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
@@ -25,12 +25,9 @@
 
 package java.security;
 
+import java.io.FilterOutputStream;
 import java.io.IOException;
-import java.io.EOFException;
 import java.io.OutputStream;
-import java.io.FilterOutputStream;
-import java.io.PrintStream;
-import java.io.ByteArrayOutputStream;
 
 /**
  * A transparent stream that updates the associated message digest using

src/java.base/share/classes/java/security/DomainLoadStoreParameter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022, 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
@@ -49,7 +49,7 @@
  * and {@code property} is a key/value pairing. The key and value are
  * separated by an 'equals' symbol and the value is enclosed in double
  * quotes. A property value may be either a printable string or a binary
- * string of colon-separated pairs of hexadecimal digits. Multi-valued
+ * string of colon-separated pairs of hexadecimal digits. Multivalued
  * properties are represented as a comma-separated list of values,
  * enclosed in square brackets.
  * See {@link Arrays#toString(java.lang.Object[])}.