From b9c3dc3b47459890f4abdea2f3367662d3467289 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eirik=20Bj=C3=B8rsn=C3=B8s?= Date: Tue, 12 Mar 2024 17:38:59 +0000 Subject: [PATCH] 8327738: Remove unused internal method sun.n.w.p.h.HttpURLConnection.setDefaultAuthenticator Reviewed-by: djelinski, dfuchs --- .../www/protocol/http/HttpAuthenticator.java | 78 ------------------- .../www/protocol/http/HttpURLConnection.java | 46 +---------- 2 files changed, 1 insertion(+), 123 deletions(-) delete mode 100644 src/java.base/share/classes/sun/net/www/protocol/http/HttpAuthenticator.java diff --git a/src/java.base/share/classes/sun/net/www/protocol/http/HttpAuthenticator.java b/src/java.base/share/classes/sun/net/www/protocol/http/HttpAuthenticator.java deleted file mode 100644 index 4befe58b5b9..00000000000 --- a/src/java.base/share/classes/sun/net/www/protocol/http/HttpAuthenticator.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (c) 1996, 2004, 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 - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package sun.net.www.protocol.http; - -import java.net.URL; - -/** - * An interface for all objects that implement HTTP authentication. - * See the HTTP spec for details on how this works in general. - * A single class or object can implement an arbitrary number of - * authentication schemes. - * - * @author David Brown - * - * @deprecated -- use java.net.Authenticator instead - * @see java.net.Authenticator - */ -// -// REMIND: Unless compatibility with sun.* API's from 1.2 to 2.0 is -// a goal, there's no reason to carry this forward into JDK 2.0. -@Deprecated -public interface HttpAuthenticator { - - - /** - * Indicate whether the specified authentication scheme is - * supported. In accordance with HTTP specifications, the - * scheme name should be checked in a case-insensitive fashion. - */ - - boolean schemeSupported (String scheme); - - /** - * Returns the String that should be included in the HTTP - * Authorization field. Return null if no info was - * supplied or could be found. - *

- * Example: - * 

{@code
-     * --> GET http://www.authorization-required.com/ HTTP/1.0
-     * <-- HTTP/1.0 403 Unauthorized
-     * <-- WWW-Authenticate: Basic realm="WallyWorld"
-     * call schemeSupported("Basic"); (return true)
-     * call authString(u, "Basic", "WallyWorld", null);
-     *   return "QWadhgWERghghWERfdfQ=="
-     * --> GET http://www.authorization-required.com/ HTTP/1.0
-     * --> Authorization: Basic QWadhgWERghghWERfdfQ==
-     * <-- HTTP/1.0 200 OK}
-     *  YAY!!!
-     *
- */ - - public String authString (URL u, String scheme, String realm); - -} diff --git a/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java b/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java index 644801adb77..f47261f4491 100644 --- a/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java +++ b/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 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 @@ -335,13 +335,6 @@ public class HttpURLConnection extends java.net.HttpURLConnection { private String userCookies = null; private String userCookies2 = null; - /* We only have a single static authenticator for now. - * REMIND: backwards compatibility with JDK 1.1. Should be - * eliminated for JDK 2.0. - */ - @Deprecated - private static HttpAuthenticator defaultAuth; - /* all the headers we send * NOTE: do *NOT* dump out the content of 'requests' in the * output or stacktrace since it may contain security-sensitive @@ -945,14 +938,6 @@ public class HttpURLConnection extends java.net.HttpURLConnection { }); } - /** - * @deprecated. Use java.net.Authenticator.setDefault() instead. - */ - @Deprecated - public static void setDefaultAuthenticator(HttpAuthenticator a) { - defaultAuth = a; - } - /** * opens a stream allowing redirects only to the same host. */ @@ -2524,22 +2509,6 @@ public class HttpURLConnection extends java.net.HttpURLConnection { throw new AssertionError("should not reach here"); } } - // For backwards compatibility, we also try defaultAuth - // REMIND: Get rid of this for JDK2.0. - - if (ret == null && defaultAuth != null - && defaultAuth.schemeSupported(scheme)) { - try { - @SuppressWarnings("deprecation") - URL u = new URL("http", host, port, "/"); - String a = defaultAuth.authString(u, scheme, realm); - if (a != null) { - ret = new BasicAuthentication (true, host, port, realm, a); - // not in cache by default - cache on success - } - } catch (java.net.MalformedURLException ignored) { - } - } if (ret != null) { if (!ret.setHeaders(this, p, raw)) { ret.disposeContext(); @@ -2697,19 +2666,6 @@ public class HttpURLConnection extends java.net.HttpURLConnection { throw new AssertionError("should not reach here"); } } - - // For backwards compatibility, we also try defaultAuth - // REMIND: Get rid of this for JDK2.0. - - if (ret == null && defaultAuth != null - && defaultAuth.schemeSupported(scheme)) { - String a = defaultAuth.authString(url, scheme, realm); - if (a != null) { - ret = new BasicAuthentication (false, url, realm, a); - // not in cache by default - cache on success - } - } - if (ret != null ) { if (!ret.setHeaders(this, p, raw)) { ret.disposeContext();