On 11/16/2012 04:40 PM, Xuelei Fan wrote:
The patch looks fine to me. Personally, I prefer a consistent style to have the "Override" tag in a full line, for example:+ @Override public String run() {
That's my preference as well, but the existing style is mixed, so I wasn't sure what to use. Let's use the attached version instead.
Please let me know if you want a sponsor to push the patch.
Yes, I would appreciate that. -- Florian Weimer / Red Hat Product Security Team
# HG changeset patch # User Florian Weimer <[email protected]> # Date 1353076204 -3600 # Node ID bb583235e6ed716d2b731397737cd16f83f06f56 # Parent 64a42798ea5eba4bd5e6733b0f26a4d6204530ac Warning cleanup in package javax.net.ssl This removes unnecessary imports and adds missing @Override annotations. diff --git a/src/share/classes/javax/net/ssl/HandshakeCompletedEvent.java b/src/share/classes/javax/net/ssl/HandshakeCompletedEvent.java --- a/src/share/classes/javax/net/ssl/HandshakeCompletedEvent.java +++ b/src/share/classes/javax/net/ssl/HandshakeCompletedEvent.java @@ -29,7 +29,6 @@ import java.security.cert.Certificate; import java.security.Principal; import java.security.cert.X509Certificate; -import javax.security.auth.x500.X500Principal; /** * This event indicates that an SSL handshake completed on a given diff --git a/src/share/classes/javax/net/ssl/HostnameVerifier.java b/src/share/classes/javax/net/ssl/HostnameVerifier.java --- a/src/share/classes/javax/net/ssl/HostnameVerifier.java +++ b/src/share/classes/javax/net/ssl/HostnameVerifier.java @@ -40,6 +40,7 @@ * verification fail. * * @author Brad R. Wetmore + * @see HostnameVerifierFactory * @since 1.4 */ diff --git a/src/share/classes/javax/net/ssl/HttpsURLConnection.java b/src/share/classes/javax/net/ssl/HttpsURLConnection.java --- a/src/share/classes/javax/net/ssl/HttpsURLConnection.java +++ b/src/share/classes/javax/net/ssl/HttpsURLConnection.java @@ -29,7 +29,6 @@ import java.net.HttpURLConnection; import java.security.Principal; import java.security.cert.X509Certificate; -import javax.security.auth.x500.X500Principal; /** * <code>HttpsURLConnection</code> extends <code>HttpURLConnection</code> @@ -196,6 +195,7 @@ */ private static class DefaultHostnameVerifier implements HostnameVerifier { + @Override public boolean verify(String hostname, SSLSession session) { return false; } diff --git a/src/share/classes/javax/net/ssl/KeyManagerFactory.java b/src/share/classes/javax/net/ssl/KeyManagerFactory.java --- a/src/share/classes/javax/net/ssl/KeyManagerFactory.java +++ b/src/share/classes/javax/net/ssl/KeyManagerFactory.java @@ -68,6 +68,7 @@ public final static String getDefaultAlgorithm() { String type; type = AccessController.doPrivileged(new PrivilegedAction<String>() { + @Override public String run() { return Security.getProperty( "ssl.KeyManagerFactory.algorithm"); diff --git a/src/share/classes/javax/net/ssl/SSLContext.java b/src/share/classes/javax/net/ssl/SSLContext.java --- a/src/share/classes/javax/net/ssl/SSLContext.java +++ b/src/share/classes/javax/net/ssl/SSLContext.java @@ -26,7 +26,6 @@ package javax.net.ssl; import java.security.*; -import java.util.*; import sun.security.jca.GetInstance; diff --git a/src/share/classes/javax/net/ssl/SSLContextSpi.java b/src/share/classes/javax/net/ssl/SSLContextSpi.java --- a/src/share/classes/javax/net/ssl/SSLContextSpi.java +++ b/src/share/classes/javax/net/ssl/SSLContextSpi.java @@ -25,7 +25,6 @@ package javax.net.ssl; -import java.util.*; import java.security.*; /** diff --git a/src/share/classes/javax/net/ssl/SSLEngineResult.java b/src/share/classes/javax/net/ssl/SSLEngineResult.java --- a/src/share/classes/javax/net/ssl/SSLEngineResult.java +++ b/src/share/classes/javax/net/ssl/SSLEngineResult.java @@ -230,6 +230,7 @@ /** * Returns a String representation of this object. */ + @Override public String toString() { return ("Status = " + status + " HandshakeStatus = " + handshakeStatus + diff --git a/src/share/classes/javax/net/ssl/SSLParameters.java b/src/share/classes/javax/net/ssl/SSLParameters.java --- a/src/share/classes/javax/net/ssl/SSLParameters.java +++ b/src/share/classes/javax/net/ssl/SSLParameters.java @@ -28,13 +28,11 @@ import java.security.AlgorithmConstraints; import java.util.Map; import java.util.List; -import java.util.HashSet; import java.util.HashMap; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.LinkedHashMap; -import java.util.regex.Pattern; /** * Encapsulates parameters for an SSL/TLS connection. The parameters diff --git a/src/share/classes/javax/net/ssl/SSLPermission.java b/src/share/classes/javax/net/ssl/SSLPermission.java --- a/src/share/classes/javax/net/ssl/SSLPermission.java +++ b/src/share/classes/javax/net/ssl/SSLPermission.java @@ -26,11 +26,6 @@ package javax.net.ssl; import java.security.*; -import java.util.Enumeration; -import java.util.Hashtable; -import java.util.StringTokenizer; -import java.security.Permissions; -import java.lang.SecurityManager; /** * This class is for various network permissions. diff --git a/src/share/classes/javax/net/ssl/SSLServerSocketFactory.java b/src/share/classes/javax/net/ssl/SSLServerSocketFactory.java --- a/src/share/classes/javax/net/ssl/SSLServerSocketFactory.java +++ b/src/share/classes/javax/net/ssl/SSLServerSocketFactory.java @@ -160,23 +160,27 @@ new SocketException(reason.toString()).initCause(reason); } + @Override public ServerSocket createServerSocket() throws IOException { return throwException(); } + @Override public ServerSocket createServerSocket(int port) throws IOException { return throwException(); } + @Override public ServerSocket createServerSocket(int port, int backlog) throws IOException { return throwException(); } + @Override public ServerSocket createServerSocket(int port, int backlog, InetAddress ifAddress) throws IOException @@ -184,10 +188,12 @@ return throwException(); } + @Override public String [] getDefaultCipherSuites() { return new String[0]; } + @Override public String [] getSupportedCipherSuites() { return new String[0]; } diff --git a/src/share/classes/javax/net/ssl/SSLSession.java b/src/share/classes/javax/net/ssl/SSLSession.java --- a/src/share/classes/javax/net/ssl/SSLSession.java +++ b/src/share/classes/javax/net/ssl/SSLSession.java @@ -25,7 +25,6 @@ package javax.net.ssl; -import java.net.InetAddress; import java.security.Principal; /** diff --git a/src/share/classes/javax/net/ssl/SSLSocket.java b/src/share/classes/javax/net/ssl/SSLSocket.java --- a/src/share/classes/javax/net/ssl/SSLSocket.java +++ b/src/share/classes/javax/net/ssl/SSLSocket.java @@ -28,9 +28,6 @@ import java.io.IOException; import java.net.*; -import java.util.Enumeration; -import java.util.Vector; - /** * This class extends <code>Socket</code>s and provides secure diff --git a/src/share/classes/javax/net/ssl/SSLSocketFactory.java b/src/share/classes/javax/net/ssl/SSLSocketFactory.java --- a/src/share/classes/javax/net/ssl/SSLSocketFactory.java +++ b/src/share/classes/javax/net/ssl/SSLSocketFactory.java @@ -127,6 +127,7 @@ static String getSecurityProperty(final String name) { return AccessController.doPrivileged(new PrivilegedAction<String>() { + @Override public String run() { String s = java.security.Security.getProperty(name); if (s != null) { @@ -247,18 +248,21 @@ new SocketException(reason.toString()).initCause(reason); } + @Override public Socket createSocket() throws IOException { return throwException(); } + @Override public Socket createSocket(String host, int port) throws IOException { return throwException(); } + @Override public Socket createSocket(Socket s, String host, int port, boolean autoClose) throws IOException @@ -266,12 +270,14 @@ return throwException(); } + @Override public Socket createSocket(InetAddress address, int port) throws IOException { return throwException(); } + @Override public Socket createSocket(String host, int port, InetAddress clientAddress, int clientPort) throws IOException @@ -279,6 +285,7 @@ return throwException(); } + @Override public Socket createSocket(InetAddress address, int port, InetAddress clientAddress, int clientPort) throws IOException @@ -286,10 +293,12 @@ return throwException(); } + @Override public String [] getDefaultCipherSuites() { return new String[0]; } + @Override public String [] getSupportedCipherSuites() { return new String[0]; } diff --git a/src/share/classes/javax/net/ssl/TrustManagerFactory.java b/src/share/classes/javax/net/ssl/TrustManagerFactory.java --- a/src/share/classes/javax/net/ssl/TrustManagerFactory.java +++ b/src/share/classes/javax/net/ssl/TrustManagerFactory.java @@ -65,6 +65,7 @@ public final static String getDefaultAlgorithm() { String type; type = AccessController.doPrivileged(new PrivilegedAction<String>() { + @Override public String run() { return Security.getProperty( "ssl.TrustManagerFactory.algorithm"); diff --git a/src/share/classes/javax/net/ssl/X509KeyManager.java b/src/share/classes/javax/net/ssl/X509KeyManager.java --- a/src/share/classes/javax/net/ssl/X509KeyManager.java +++ b/src/share/classes/javax/net/ssl/X509KeyManager.java @@ -25,7 +25,6 @@ package javax.net.ssl; -import java.security.KeyManagementException; import java.security.PrivateKey; import java.security.Principal; import java.security.cert.X509Certificate;
