8343467: Remove unnecessary @SuppressWarnings annotations (security)

archiecobbs · archiecobbs · commit 4b21fb9df999 · 2024-12-13T22:40:42.000Z
Reviewed-by: mullan
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/PBES2Parameters.java b/src/java.base/share/classes/com/sun/crypto/provider/PBES2Parameters.java
@@ -206,7 +206,6 @@ protected void engineInit(AlgorithmParameterSpec paramSpec)
        this.cipherParam = ((PBEParameterSpec)paramSpec).getParameterSpec();
     }
 
-    @SuppressWarnings("deprecation")
     protected void engineInit(byte[] encoded)
         throws IOException
     {
@@ -239,7 +238,6 @@ protected void engineInit(byte[] encoded)
         this.pbes2AlgorithmName = "PBEWith" + kdfAlgo + "And" + cipherAlgo;
     }
 
-    @SuppressWarnings("deprecation")
     private String parseKDF(DerValue keyDerivationFunc) throws IOException {
 
         if (!pkcs5PBKDF2_OID.equals(keyDerivationFunc.data.getOID())) {
@@ -299,7 +297,6 @@ private String parseKDF(DerValue keyDerivationFunc) throws IOException {
         return kdfAlgo;
     }
 
-    @SuppressWarnings("deprecation")
     private String parseES(DerValue encryptionScheme) throws IOException {
         String cipherAlgo;
 
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/SealedObjectForKeyProtector.java b/src/java.base/share/classes/com/sun/crypto/provider/SealedObjectForKeyProtector.java
@@ -81,7 +81,6 @@ final Key getKey(Cipher c, int maxLength)
                 .getExtObjectInputStream(this, c)) {
                 ois.setObjectInputFilter(new DeserializationChecker(maxLength));
             try {
-                @SuppressWarnings("unchecked")
                 Key t = (Key) ois.readObject();
                 return t;
             } catch (InvalidClassException ice) {
diff --git a/src/java.base/share/classes/java/security/Key.java b/src/java.base/share/classes/java/security/Key.java
@@ -115,7 +115,6 @@ public interface Key extends java.io.Serializable {
     * ineffectual. Do not use; no replacement.
     */
     @Deprecated
-    @SuppressWarnings("serial")
     @java.io.Serial
    long serialVersionUID = 6603384152749567654L;
 
diff --git a/src/java.base/share/classes/java/security/PrivateKey.java b/src/java.base/share/classes/java/security/PrivateKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, 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
@@ -68,7 +68,6 @@ public interface PrivateKey extends AsymmetricKey, javax.security.auth.Destroyab
      * ineffectual. Do not use; no replacement.
      */
     @Deprecated
-    @SuppressWarnings("serial")
     @java.io.Serial
     long serialVersionUID = 6034044314589513430L;
 }
diff --git a/src/java.base/share/classes/java/security/Provider.java b/src/java.base/share/classes/java/security/Provider.java
@@ -827,7 +827,7 @@ private Object implReplace(Object key, Object value) {
         return o;
     }
 
-    @SuppressWarnings("unchecked") // Function must actually operate over strings
+    // Function must actually operate over strings
     private void implReplaceAll(BiFunction<? super Object, ? super Object,
             ? extends Object> function) {
 
@@ -847,7 +847,7 @@ private void implReplaceAll(BiFunction<? super Object, ? super Object,
         }
     }
 
-    @SuppressWarnings("unchecked") // Function must actually operate over strings
+    // Function must actually operate over strings
     private Object implMerge(Object key, Object value,
             BiFunction<? super Object, ? super Object, ? extends Object>
             remappingFunction) {
@@ -864,7 +864,7 @@ private Object implMerge(Object key, Object value,
         return o;
     }
 
-    @SuppressWarnings("unchecked") // Function must actually operate over strings
+    // Function must actually operate over strings
     private Object implCompute(Object key, BiFunction<? super Object,
             ? super Object, ? extends Object> remappingFunction) {
 
@@ -881,7 +881,7 @@ private Object implCompute(Object key, BiFunction<? super Object,
         return o;
     }
 
-    @SuppressWarnings("unchecked") // Function must actually operate over strings
+    // Function must actually operate over strings
     private Object implComputeIfAbsent(Object key, Function<? super Object,
             ? extends Object> mappingFunction) {
         if (!checkLegacy(key)) return null;
@@ -893,7 +893,7 @@ private Object implComputeIfAbsent(Object key, Function<? super Object,
         return o;
     }
 
-    @SuppressWarnings("unchecked") // Function must actually operate over strings
+    // Function must actually operate over strings
     private Object implComputeIfPresent(Object key, BiFunction<? super Object,
             ? super Object, ? extends Object> remappingFunction) {
         if (!checkLegacy(key)) return null;
diff --git a/src/java.base/share/classes/java/security/PublicKey.java b/src/java.base/share/classes/java/security/PublicKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, 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
@@ -54,7 +54,6 @@ public interface PublicKey extends AsymmetricKey {
      * ineffectual. Do not use; no replacement.
      */
     @Deprecated
-    @SuppressWarnings("serial")
     @java.io.Serial
     long serialVersionUID = 7187392471159151072L;
 }
diff --git a/src/java.base/share/classes/java/security/interfaces/DSAPrivateKey.java b/src/java.base/share/classes/java/security/interfaces/DSAPrivateKey.java
@@ -52,7 +52,6 @@ public interface DSAPrivateKey extends DSAKey, java.security.PrivateKey {
     * ineffectual. Do not use; no replacement.
     */
     @Deprecated
-    @SuppressWarnings("serial")
     @java.io.Serial
    long serialVersionUID = 7776497482533790279L;
 
diff --git a/src/java.base/share/classes/java/security/interfaces/DSAPublicKey.java b/src/java.base/share/classes/java/security/interfaces/DSAPublicKey.java
@@ -52,7 +52,6 @@ public interface DSAPublicKey extends DSAKey, java.security.PublicKey {
     * ineffectual. Do not use; no replacement.
     */
     @Deprecated
-    @SuppressWarnings("serial")
     @java.io.Serial
    long serialVersionUID = 1234526332779022332L;
 
diff --git a/src/java.base/share/classes/java/security/interfaces/ECPrivateKey.java b/src/java.base/share/classes/java/security/interfaces/ECPrivateKey.java
@@ -48,7 +48,6 @@ public interface ECPrivateKey extends PrivateKey, ECKey {
     * ineffectual. Do not use; no replacement.
     */
     @Deprecated
-    @SuppressWarnings("serial")
     @java.io.Serial
    long serialVersionUID = -7896394956925609184L;
 
diff --git a/src/java.base/share/classes/java/security/interfaces/ECPublicKey.java b/src/java.base/share/classes/java/security/interfaces/ECPublicKey.java
@@ -50,7 +50,6 @@ public interface ECPublicKey extends PublicKey, ECKey {
     * ineffectual. Do not use; no replacement.
     */
     @Deprecated
-    @SuppressWarnings("serial")
     @java.io.Serial
    long serialVersionUID = -3314988629879632826L;
 
diff --git a/src/java.base/share/classes/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java b/src/java.base/share/classes/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java
@@ -57,7 +57,6 @@ public interface RSAMultiPrimePrivateCrtKey extends RSAPrivateKey {
      * ineffectual. Do not use; no replacement.
      */
     @Deprecated
-    @SuppressWarnings("serial")
     @java.io.Serial
     long serialVersionUID = 618058533534628008L;
 
diff --git a/src/java.base/share/classes/java/security/interfaces/RSAPrivateCrtKey.java b/src/java.base/share/classes/java/security/interfaces/RSAPrivateCrtKey.java
@@ -52,7 +52,6 @@ public interface RSAPrivateCrtKey extends RSAPrivateKey {
      * ineffectual. Do not use; no replacement.
      */
     @Deprecated
-    @SuppressWarnings("serial")
     @java.io.Serial
     long serialVersionUID = -5682214253527700368L;
 
diff --git a/src/java.base/share/classes/java/security/interfaces/RSAPrivateKey.java b/src/java.base/share/classes/java/security/interfaces/RSAPrivateKey.java
@@ -50,7 +50,6 @@ public interface RSAPrivateKey extends java.security.PrivateKey, RSAKey
      * ineffectual. Do not use; no replacement.
      */
     @Deprecated
-    @SuppressWarnings("serial")
     @java.io.Serial
     long serialVersionUID = 5187144804936595022L;
 
diff --git a/src/java.base/share/classes/java/security/interfaces/RSAPublicKey.java b/src/java.base/share/classes/java/security/interfaces/RSAPublicKey.java
@@ -47,7 +47,6 @@ public interface RSAPublicKey extends java.security.PublicKey, RSAKey
      * ineffectual. Do not use; no replacement.
      */
     @Deprecated
-    @SuppressWarnings("serial")
     @java.io.Serial
     long serialVersionUID = -8727434096241101194L;
 
diff --git a/src/java.base/share/classes/javax/crypto/SecretKey.java b/src/java.base/share/classes/javax/crypto/SecretKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, 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
@@ -68,6 +68,5 @@ public interface SecretKey extends
      * ineffectual. Do not use; no replacement.
      */
     @Deprecated
-    @SuppressWarnings("serial")
     long serialVersionUID = -4795878709595146952L;
 }
diff --git a/src/java.base/share/classes/javax/crypto/interfaces/DHPrivateKey.java b/src/java.base/share/classes/javax/crypto/interfaces/DHPrivateKey.java
@@ -47,7 +47,6 @@ public interface DHPrivateKey extends DHKey, java.security.PrivateKey {
      * ineffectual. Do not use; no replacement.
      */
     @Deprecated
-    @SuppressWarnings("serial")
     @java.io.Serial
     long serialVersionUID = 2211791113380396553L;
 
diff --git a/src/java.base/share/classes/javax/crypto/interfaces/DHPublicKey.java b/src/java.base/share/classes/javax/crypto/interfaces/DHPublicKey.java
@@ -47,7 +47,6 @@ public interface DHPublicKey extends DHKey, java.security.PublicKey {
      * ineffectual. Do not use; no replacement.
      */
     @Deprecated
-    @SuppressWarnings("serial")
     @java.io.Serial
     long serialVersionUID = -6628103563352519193L;
 
diff --git a/src/java.base/share/classes/javax/crypto/interfaces/PBEKey.java b/src/java.base/share/classes/javax/crypto/interfaces/PBEKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -44,7 +44,6 @@ public interface PBEKey extends javax.crypto.SecretKey {
      * ineffectual. Do not use; no replacement.
      */
     @Deprecated
-    @SuppressWarnings("serial")
     @java.io.Serial
     long serialVersionUID = -1430015993304333921L;
 
diff --git a/src/java.base/share/classes/sun/security/internal/interfaces/TlsMasterSecret.java b/src/java.base/share/classes/sun/security/internal/interfaces/TlsMasterSecret.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, 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,6 @@ public interface TlsMasterSecret extends SecretKey {
      * ineffectual. Do not use; no replacement.
      */
     @Deprecated
-    @SuppressWarnings("serial")
     @java.io.Serial
     long serialVersionUID = -461748105810469773L;
 
diff --git a/src/java.base/share/classes/sun/security/jca/ProviderConfig.java b/src/java.base/share/classes/sun/security/jca/ProviderConfig.java
@@ -149,7 +149,6 @@ public String toString() {
     /**
      * Get the provider object. Loads the provider if it is not already loaded.
      */
-    @SuppressWarnings("deprecation")
     Provider getProvider() {
         // volatile variable load
         Provider p = provider;
diff --git a/src/java.security.jgss/share/classes/sun/security/jgss/krb5/SubjectComber.java b/src/java.security.jgss/share/classes/sun/security/jgss/krb5/SubjectComber.java
@@ -151,8 +151,7 @@ private static <T> Object findAux(Subject subject, String serverPrincipal,
                     Iterator<Object> iterator = pcs.iterator();
                     while (iterator.hasNext()) {
                         Object obj = iterator.next();
-                        if (!(obj instanceof @SuppressWarnings("unchecked")
-                                KerberosTicket ticket)) {
+                        if (!(obj instanceof KerberosTicket ticket)) {
                             continue;
                         }
                         if (DEBUG != null) {
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, 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
@@ -107,7 +107,6 @@ protected void engineInit(AlgorithmParameterSpec params,
     // compatibility, it is nonsensical for an anonymous class to define a
     // serialVersionUID. Suppress warnings relative to missing serialVersionUID
     // field in the anonymous subclass of serializable SecretKey.
-    @SuppressWarnings("serial")
     private static final SecretKey NULL_KEY = new SecretKey() {
         public byte[] getEncoded() {
             return new byte[0];
diff --git a/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNet.java b/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNet.java
@@ -304,7 +304,7 @@ static native void setInitMsgOption0(int fd, int arg1, int arg2)
         loadSctpLibrary();
     }
 
-    @SuppressWarnings({"removal", "restricted"})
+    @SuppressWarnings("restricted")
     private static void loadSctpLibrary() {
         IOUtil.load();   // loads nio & net native libraries
         System.loadLibrary("sctp");

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,6 @@ protected void engineInit(AlgorithmParameterSpec paramSpec)`
`206`	`206`	`this.cipherParam = ((PBEParameterSpec)paramSpec).getParameterSpec();`
`207`	`207`	`}`
`208`	`208`
`209`		`- @SuppressWarnings("deprecation")`
`210`	`209`	`protected void engineInit(byte[] encoded)`
`211`	`210`	`throws IOException`
`212`	`211`	`{`
`@@ -239,7 +238,6 @@ protected void engineInit(byte[] encoded)`
`239`	`238`	`this.pbes2AlgorithmName = "PBEWith" + kdfAlgo + "And" + cipherAlgo;`
`240`	`239`	`}`
`241`	`240`
`242`		`- @SuppressWarnings("deprecation")`
`243`	`241`	`private String parseKDF(DerValue keyDerivationFunc) throws IOException {`
`244`	`242`
`245`	`243`	`if (!pkcs5PBKDF2_OID.equals(keyDerivationFunc.data.getOID())) {`
`@@ -299,7 +297,6 @@ private String parseKDF(DerValue keyDerivationFunc) throws IOException {`
`299`	`297`	`return kdfAlgo;`
`300`	`298`	`}`
`301`	`299`
`302`		`- @SuppressWarnings("deprecation")`
`303`	`300`	`private String parseES(DerValue encryptionScheme) throws IOException {`
`304`	`301`	`String cipherAlgo;`
`305`	`302`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* This code is free software; you can redistribute it and/or modify it`
`@@ -68,7 +68,6 @@ public interface PrivateKey extends AsymmetricKey, javax.security.auth.Destroyab`
`68`	`68`	`* ineffectual. Do not use; no replacement.`
`69`	`69`	`*/`
`70`	`70`	`@Deprecated`
`71`		`- @SuppressWarnings("serial")`
`72`	`71`	`@java.io.Serial`
`73`	`72`	`long serialVersionUID = 6034044314589513430L;`
`74`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -827,7 +827,7 @@ private Object implReplace(Object key, Object value) {`
`827`	`827`	`return o;`
`828`	`828`	`}`
`829`	`829`
`830`		`- @SuppressWarnings("unchecked") // Function must actually operate over strings`
	`830`	`+ // Function must actually operate over strings`
`831`	`831`	`private void implReplaceAll(BiFunction<? super Object, ? super Object,`
`832`	`832`	`? extends Object> function) {`
`833`	`833`
`@@ -847,7 +847,7 @@ private void implReplaceAll(BiFunction<? super Object, ? super Object,`
`847`	`847`	`}`
`848`	`848`	`}`
`849`	`849`
`850`		`- @SuppressWarnings("unchecked") // Function must actually operate over strings`
	`850`	`+ // Function must actually operate over strings`
`851`	`851`	`private Object implMerge(Object key, Object value,`
`852`	`852`	`BiFunction<? super Object, ? super Object, ? extends Object>`
`853`	`853`	`remappingFunction) {`
`@@ -864,7 +864,7 @@ private Object implMerge(Object key, Object value,`
`864`	`864`	`return o;`
`865`	`865`	`}`
`866`	`866`
`867`		`- @SuppressWarnings("unchecked") // Function must actually operate over strings`
	`867`	`+ // Function must actually operate over strings`
`868`	`868`	`private Object implCompute(Object key, BiFunction<? super Object,`
`869`	`869`	`? super Object, ? extends Object> remappingFunction) {`
`870`	`870`
`@@ -881,7 +881,7 @@ private Object implCompute(Object key, BiFunction<? super Object,`
`881`	`881`	`return o;`
`882`	`882`	`}`
`883`	`883`
`884`		`- @SuppressWarnings("unchecked") // Function must actually operate over strings`
	`884`	`+ // Function must actually operate over strings`
`885`	`885`	`private Object implComputeIfAbsent(Object key, Function<? super Object,`
`886`	`886`	`? extends Object> mappingFunction) {`
`887`	`887`	`if (!checkLegacy(key)) return null;`
`@@ -893,7 +893,7 @@ private Object implComputeIfAbsent(Object key, Function<? super Object,`
`893`	`893`	`return o;`
`894`	`894`	`}`
`895`	`895`
`896`		`- @SuppressWarnings("unchecked") // Function must actually operate over strings`
	`896`	`+ // Function must actually operate over strings`
`897`	`897`	`private Object implComputeIfPresent(Object key, BiFunction<? super Object,`
`898`	`898`	`? super Object, ? extends Object> remappingFunction) {`
`899`	`899`	`if (!checkLegacy(key)) return null;`