8215430: Remove the internal package com.sun.net.ssl

Reviewed-by: chegar, mullan, wetmore

src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, 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
@@ -71,10 +71,6 @@ public abstract class AbstractDelegateHttpsURLConnection extends
      * Create a new HttpClient object, bypassing the cache of
      * HTTP client objects/connections.
      *
-     * Note: this method is changed from protected to public because
-     * the com.sun.ssl.internal.www.protocol.https handler reuses this
-     * class for its actual implemantation
-     *
      * @param url the URL being accessed
      */
     public void setNewClient (URL url)
@@ -85,10 +81,6 @@ public abstract class AbstractDelegateHttpsURLConnection extends
     /**
      * Obtain a HttpClient object. Use the cached copy if specified.
      *
-     * Note: this method is changed from protected to public because
-     * the com.sun.ssl.internal.www.protocol.https handler reuses this
-     * class for its actual implemantation
-     *
      * @param url       the URL being accessed
      * @param useCache  whether the cached connection should be used
      *        if present
@@ -107,10 +99,6 @@ public abstract class AbstractDelegateHttpsURLConnection extends
      * per-instance proxying to the given HTTP proxy.  This
      * bypasses the cache of HTTP client objects/connections.
      *
-     * Note: this method is changed from protected to public because
-     * the com.sun.ssl.internal.www.protocol.https handler reuses this
-     * class for its actual implemantation
-     *
      * @param url       the URL being accessed
      * @param proxyHost the proxy host to use
      * @param proxyPort the proxy port to use
@@ -125,10 +113,6 @@ public abstract class AbstractDelegateHttpsURLConnection extends
      * proxying to the given HTTP proxy. Use the cached copy of HTTP
      * client objects/connections if specified.
      *
-     * Note: this method is changed from protected to public because
-     * the com.sun.ssl.internal.www.protocol.https handler reuses this
-     * class for its actual implemantation
-     *
      * @param url       the URL being accessed
      * @param proxyHost the proxy host to use
      * @param proxyPort the proxy port to use

src/java.base/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, 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
@@ -23,17 +23,7 @@
  * questions.
  */
 
-/*
- * NOTE: This class lives in the package sun.net.www.protocol.https.
- * There is a copy in com.sun.net.ssl.internal.www.protocol.https for JSSE
- * 1.0.2 compatibility. It is 100% identical except the package and extends
- * lines. Any changes should be made to be class in sun.net.* and then copied
- * to com.sun.net.*.
- */
-
-// For both copies of the file, uncomment one line and comment the other
 package sun.net.www.protocol.https;
-// package com.sun.net.ssl.internal.www.protocol.https;
 
 import java.net.URL;
 import java.net.Proxy;
@@ -64,21 +54,13 @@ import sun.net.www.http.HttpClient;
  * the way to Object.
  *
  */
-
-// For both copies of the file, uncomment one line and comment the
-// other. The differences between the two copies are introduced for
-// plugin, and it is marked as such.
 public class HttpsURLConnectionImpl
         extends javax.net.ssl.HttpsURLConnection {
-// public class HttpsURLConnectionOldImpl
-//      extends com.sun.net.ssl.HttpsURLConnection {
 
     // NOTE: made protected for plugin so that subclass can set it.
     protected DelegateHttpsURLConnection delegate;
 
-// For both copies of the file, uncomment one line and comment the other
     HttpsURLConnectionImpl(URL u, Handler handler) throws IOException {
-//    HttpsURLConnectionOldImpl(URL u, Handler handler) throws IOException {
         this(u, null, handler);
     }
 
@@ -90,9 +72,8 @@ public class HttpsURLConnectionImpl
         }
         return u;
     }
-// For both copies of the file, uncomment one line and comment the other
+
     HttpsURLConnectionImpl(URL u, Proxy p, Handler handler) throws IOException {
-//    HttpsURLConnectionOldImpl(URL u, Proxy p, Handler handler) throws IOException {
         super(checkURL(u));
         delegate = new DelegateHttpsURLConnection(url, p, handler, this);
     }

src/java.base/share/classes/sun/security/jca/ProviderConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, 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
@@ -178,8 +178,12 @@ final class ProviderConfig {
             p = new sun.security.rsa.SunRsaSign();
         } else if (provName.equals("SunJCE") || provName.equals("com.sun.crypto.provider.SunJCE")) {
             p = new com.sun.crypto.provider.SunJCE();
-        } else if (provName.equals("SunJSSE") || provName.equals("com.sun.net.ssl.internal.ssl.Provider")) {
-            p = new com.sun.net.ssl.internal.ssl.Provider();
+        } else if (provName.equals("SunJSSE") ||
+                provName.equals("com.sun.net.ssl.internal.ssl.Provider")) {
+            // com.sun.net.ssl.internal.ssl.Provider is the legacy SunJSSE
+            // provider implementation. For compatibility, let's continue to
+            // support the legacy name for a while.
+            p = new sun.security.ssl.SunJSSE();
         } else if (provName.equals("Apple") || provName.equals("apple.security.AppleProvider")) {
             // need to use reflection since this class only exists on MacOsx
             p = AccessController.doPrivileged(new PrivilegedAction<Provider>() {

src/java.base/share/classes/sun/security/ssl/SunJSSE.java

@@ -58,7 +58,7 @@ import static sun.security.provider.SunEntries.createAliases;
  * FIPS mode.
  *
  */
-public abstract class SunJSSE extends java.security.Provider {
+public class SunJSSE extends java.security.Provider {
 
     private static final long serialVersionUID = 3231825739635378733L;
 
@@ -66,9 +66,8 @@ public abstract class SunJSSE extends java.security.Provider {
         "(PKCS12, SunX509/PKIX key/trust factories, " +
         "SSLv3/TLSv1/TLSv1.1/TLSv1.2/TLSv1.3/DTLSv1.0/DTLSv1.2)";
 
-    protected SunJSSE() {
+    public SunJSSE() {
         super("SunJSSE", PROVIDER_VER, info);
-        subclassCheck();
         registerAlgorithms();
     }
 
@@ -136,12 +135,4 @@ public abstract class SunJSSE extends java.security.Provider {
         ps("KeyStore", "PKCS12",
             "sun.security.pkcs12.PKCS12KeyStore", null, null);
     }
-
-    // com.sun.net.ssl.internal.ssl.Provider has been deprecated since JDK 9
-    @SuppressWarnings("deprecation")
-    private void subclassCheck() {
-        if (getClass() != com.sun.net.ssl.internal.ssl.Provider.class) {
-            throw new AssertionError("Illegal subclass: " + getClass());
-        }
-    }
 }