diff --git a/src/share/classes/javax/net/ssl/HandshakeCompletedEvent.java b/src/share/classes/javax/net/ssl/HandshakeCompletedEvent.java
index 39e802c4d86471bfd77c3118764c23c67e75653d..f6abafaea8587cc03dd5629af1e91d3f46dcd0c7 100644
--- a/src/share/classes/javax/net/ssl/HandshakeCompletedEvent.java
+++ b/src/share/classes/javax/net/ssl/HandshakeCompletedEvent.java
@@ -29,7 +29,6 @@ import java.util.EventObject;
 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
index d2f504f0576655fcdb128d03eecb0a7a76e5288a..402a8cd66a2ea2665f601778179050974762d0ec 100644
--- a/src/share/classes/javax/net/ssl/HostnameVerifier.java
+++ b/src/share/classes/javax/net/ssl/HostnameVerifier.java
@@ -40,6 +40,7 @@ package javax.net.ssl;
  * 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
index 5027b9a578824e351b894d79c86634f4bc34c229..b4c9ffe1113d83e0ee3bdc50d8d1d1b9859c599a 100644
--- 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.URL;
 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 @@ class HttpsURLConnection extends HttpURLConnection
      */
     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
index e7fe89f65f1a4895ce7b3ad71a1f0c0771d3e43a..f9611c0f1d4bb4c2c23aedb9052f4d68abf69ec8 100644
--- a/src/share/classes/javax/net/ssl/KeyManagerFactory.java
+++ b/src/share/classes/javax/net/ssl/KeyManagerFactory.java
@@ -68,6 +68,7 @@ public class KeyManagerFactory {
     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
index d3cb9700ba97cc5ff0c04fd13eb7d525591a739d..c40d7060c39d9f219c1e618135d9e305e11fe691 100644
--- 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
index e4def55a09ed10d0857ce18bfad038b18191e542..0b06191cc5a9f5cfd217da923ec0ddbbc9cba606 100644
--- 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
index dd63ea4803acef8c148ad351ae5252787c73be9a..45dcddbdeca7b047b68311bc745dccc782492c5c 100644
--- a/src/share/classes/javax/net/ssl/SSLEngineResult.java
+++ b/src/share/classes/javax/net/ssl/SSLEngineResult.java
@@ -230,6 +230,7 @@ public class SSLEngineResult {
     /**
      * 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
index d207f6f9e6f73d3d187df5872425e6c9742f6ad0..c499b666091ebeabc79460750e59ec43f8cd3904 100644
--- a/src/share/classes/javax/net/ssl/SSLParameters.java
+++ b/src/share/classes/javax/net/ssl/SSLParameters.java
@@ -28,13 +28,11 @@ package javax.net.ssl;
 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
index f596925e0c0b2636b3ed319bcd4c684f1ddbf436..04ebfe1543c54b1de62dfe2aeaf7a9cbb1599787 100644
--- 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
index 24911295adf9be4e42e5f7ca91530e7bc0b15af8..8efbd41669eefd3a556d5e67dd9e7d5de12f5654 100644
--- a/src/share/classes/javax/net/ssl/SSLServerSocketFactory.java
+++ b/src/share/classes/javax/net/ssl/SSLServerSocketFactory.java
@@ -160,23 +160,27 @@ class DefaultSSLServerSocketFactory extends SSLServerSocketFactory {
             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 @@ class DefaultSSLServerSocketFactory extends SSLServerSocketFactory {
         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
index 93f066744fcbefa895065667ef92c69313c77c1d..7cbcf2836611c96cf8ac45fcbd3e503037ccbfb0 100644
--- 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
index ab090130f2db1dbf2e8f062c9f3cc2aa7635678b..58f943ace5df7bd54cfb7f936e3396c8f80a6038 100644
--- a/src/share/classes/javax/net/ssl/SSLSocket.java
+++ b/src/share/classes/javax/net/ssl/SSLSocket.java
@@ -28,9 +28,6 @@ package javax.net.ssl;
 
 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
index 73f48d197a466b20c044a37c8a478e77e7f294c8..151880d026f21cdf98831737399014e14cede821 100644
--- a/src/share/classes/javax/net/ssl/SSLSocketFactory.java
+++ b/src/share/classes/javax/net/ssl/SSLSocketFactory.java
@@ -127,6 +127,7 @@ public abstract class SSLSocketFactory extends SocketFactory
 
     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 @@ class DefaultSSLSocketFactory extends SSLSocketFactory
             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 @@ class DefaultSSLSocketFactory extends SSLSocketFactory
         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 @@ class DefaultSSLSocketFactory extends SSLSocketFactory
         return throwException();
     }
 
+    @Override
     public Socket createSocket(InetAddress address, int port,
         InetAddress clientAddress, int clientPort)
     throws IOException
@@ -286,10 +293,12 @@ class DefaultSSLSocketFactory extends SSLSocketFactory
         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
index b1762fc6449190bed76a43be10369bd706f0c463..91b6a0e46c167023df77fdbb3071df671f6cf83f 100644
--- a/src/share/classes/javax/net/ssl/TrustManagerFactory.java
+++ b/src/share/classes/javax/net/ssl/TrustManagerFactory.java
@@ -65,6 +65,7 @@ public class TrustManagerFactory {
     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
index 3fcf2225b5727a8e1765ce00a061d94ab3f91cda..5174adfe412a530a05e1d04215055a596883bca8 100644
--- 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;