The attached patch fixes a few warnings in javax.net.ssl.*. All the
overrides appear to be intentional.
--
Florian Weimer / Red Hat Product Security Team
# HG changeset patch
# User Florian Weimer <[email protected]>
# Date 1353076204 -3600
# Node ID 1978e4b72308472c5b70f31d2bf2b927b73e08a0
# Parent 64a42798ea5eba4bd5e6733b0f26a4d6204530ac
Warning cleanup in package javax.net.ssl
This removes unnecessary imports and adds missing @Override annotations.
diff -r 64a42798ea5e -r 1978e4b72308 src/share/classes/javax/net/ssl/HandshakeCompletedEvent.java
--- a/src/share/classes/javax/net/ssl/HandshakeCompletedEvent.java Thu Nov 15 20:17:05 2012 -0800
+++ b/src/share/classes/javax/net/ssl/HandshakeCompletedEvent.java Fri Nov 16 15:30:04 2012 +0100
@@ -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 -r 64a42798ea5e -r 1978e4b72308 src/share/classes/javax/net/ssl/HttpsURLConnection.java
--- a/src/share/classes/javax/net/ssl/HttpsURLConnection.java Thu Nov 15 20:17:05 2012 -0800
+++ b/src/share/classes/javax/net/ssl/HttpsURLConnection.java Fri Nov 16 15:30:04 2012 +0100
@@ -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,7 +195,7 @@
*/
private static class DefaultHostnameVerifier
implements HostnameVerifier {
- public boolean verify(String hostname, SSLSession session) {
+ @Override public boolean verify(String hostname, SSLSession session) {
return false;
}
}
diff -r 64a42798ea5e -r 1978e4b72308 src/share/classes/javax/net/ssl/KeyManagerFactory.java
--- a/src/share/classes/javax/net/ssl/KeyManagerFactory.java Thu Nov 15 20:17:05 2012 -0800
+++ b/src/share/classes/javax/net/ssl/KeyManagerFactory.java Fri Nov 16 15:30:04 2012 +0100
@@ -68,7 +68,7 @@
public final static String getDefaultAlgorithm() {
String type;
type = AccessController.doPrivileged(new PrivilegedAction<String>() {
- public String run() {
+ @Override public String run() {
return Security.getProperty(
"ssl.KeyManagerFactory.algorithm");
}
diff -r 64a42798ea5e -r 1978e4b72308 src/share/classes/javax/net/ssl/SSLContext.java
--- a/src/share/classes/javax/net/ssl/SSLContext.java Thu Nov 15 20:17:05 2012 -0800
+++ b/src/share/classes/javax/net/ssl/SSLContext.java Fri Nov 16 15:30:04 2012 +0100
@@ -26,7 +26,6 @@
package javax.net.ssl;
import java.security.*;
-import java.util.*;
import sun.security.jca.GetInstance;
diff -r 64a42798ea5e -r 1978e4b72308 src/share/classes/javax/net/ssl/SSLContextSpi.java
--- a/src/share/classes/javax/net/ssl/SSLContextSpi.java Thu Nov 15 20:17:05 2012 -0800
+++ b/src/share/classes/javax/net/ssl/SSLContextSpi.java Fri Nov 16 15:30:04 2012 +0100
@@ -25,7 +25,6 @@
package javax.net.ssl;
-import java.util.*;
import java.security.*;
/**
diff -r 64a42798ea5e -r 1978e4b72308 src/share/classes/javax/net/ssl/SSLEngineResult.java
--- a/src/share/classes/javax/net/ssl/SSLEngineResult.java Thu Nov 15 20:17:05 2012 -0800
+++ b/src/share/classes/javax/net/ssl/SSLEngineResult.java Fri Nov 16 15:30:04 2012 +0100
@@ -230,6 +230,7 @@
/**
* Returns a String representation of this object.
*/
+ @Override
public String toString() {
return ("Status = " + status +
" HandshakeStatus = " + handshakeStatus +
diff -r 64a42798ea5e -r 1978e4b72308 src/share/classes/javax/net/ssl/SSLParameters.java
--- a/src/share/classes/javax/net/ssl/SSLParameters.java Thu Nov 15 20:17:05 2012 -0800
+++ b/src/share/classes/javax/net/ssl/SSLParameters.java Fri Nov 16 15:30:04 2012 +0100
@@ -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 -r 64a42798ea5e -r 1978e4b72308 src/share/classes/javax/net/ssl/SSLPermission.java
--- a/src/share/classes/javax/net/ssl/SSLPermission.java Thu Nov 15 20:17:05 2012 -0800
+++ b/src/share/classes/javax/net/ssl/SSLPermission.java Fri Nov 16 15:30:04 2012 +0100
@@ -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 -r 64a42798ea5e -r 1978e4b72308 src/share/classes/javax/net/ssl/SSLServerSocketFactory.java
--- a/src/share/classes/javax/net/ssl/SSLServerSocketFactory.java Thu Nov 15 20:17:05 2012 -0800
+++ b/src/share/classes/javax/net/ssl/SSLServerSocketFactory.java Fri Nov 16 15:30:04 2012 +0100
@@ -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 -r 64a42798ea5e -r 1978e4b72308 src/share/classes/javax/net/ssl/SSLSession.java
--- a/src/share/classes/javax/net/ssl/SSLSession.java Thu Nov 15 20:17:05 2012 -0800
+++ b/src/share/classes/javax/net/ssl/SSLSession.java Fri Nov 16 15:30:04 2012 +0100
@@ -25,7 +25,6 @@
package javax.net.ssl;
-import java.net.InetAddress;
import java.security.Principal;
/**
diff -r 64a42798ea5e -r 1978e4b72308 src/share/classes/javax/net/ssl/SSLSocket.java
--- a/src/share/classes/javax/net/ssl/SSLSocket.java Thu Nov 15 20:17:05 2012 -0800
+++ b/src/share/classes/javax/net/ssl/SSLSocket.java Fri Nov 16 15:30:04 2012 +0100
@@ -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 -r 64a42798ea5e -r 1978e4b72308 src/share/classes/javax/net/ssl/SSLSocketFactory.java
--- a/src/share/classes/javax/net/ssl/SSLSocketFactory.java Thu Nov 15 20:17:05 2012 -0800
+++ b/src/share/classes/javax/net/ssl/SSLSocketFactory.java Fri Nov 16 15:30:04 2012 +0100
@@ -127,7 +127,7 @@
static String getSecurityProperty(final String name) {
return AccessController.doPrivileged(new PrivilegedAction<String>() {
- public String run() {
+ @Override public String run() {
String s = java.security.Security.getProperty(name);
if (s != null) {
s = s.trim();
@@ -247,18 +247,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 +269,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 +284,7 @@
return throwException();
}
+ @Override
public Socket createSocket(InetAddress address, int port,
InetAddress clientAddress, int clientPort)
throws IOException
@@ -286,10 +292,12 @@
return throwException();
}
+ @Override
public String [] getDefaultCipherSuites() {
return new String[0];
}
+ @Override
public String [] getSupportedCipherSuites() {
return new String[0];
}
diff -r 64a42798ea5e -r 1978e4b72308 src/share/classes/javax/net/ssl/TrustManagerFactory.java
--- a/src/share/classes/javax/net/ssl/TrustManagerFactory.java Thu Nov 15 20:17:05 2012 -0800
+++ b/src/share/classes/javax/net/ssl/TrustManagerFactory.java Fri Nov 16 15:30:04 2012 +0100
@@ -65,7 +65,7 @@
public final static String getDefaultAlgorithm() {
String type;
type = AccessController.doPrivileged(new PrivilegedAction<String>() {
- public String run() {
+ @Override public String run() {
return Security.getProperty(
"ssl.TrustManagerFactory.algorithm");
}
diff -r 64a42798ea5e -r 1978e4b72308 src/share/classes/javax/net/ssl/X509KeyManager.java
--- a/src/share/classes/javax/net/ssl/X509KeyManager.java Thu Nov 15 20:17:05 2012 -0800
+++ b/src/share/classes/javax/net/ssl/X509KeyManager.java Fri Nov 16 15:30:04 2012 +0100
@@ -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;
