[tomcat] branch master updated: Delete deprecated code marked for removal in Tomcat 10

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
     new 2544d4e  Delete deprecated code marked for removal in Tomcat 10
2544d4e is described below

commit 2544d4ecf2aa56983d54af6a52858fffd66f436c
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jan 13 21:18:35 2020 +0000

    Delete deprecated code marked for removal in Tomcat 10
    
    I'm doing this in stages so I can test the buildbot changes I just made
    using meaningful changes.
---
 .../catalina/authenticator/BasicAuthenticator.java     | 18 ------------------
 java/org/apache/catalina/authenticator/Constants.java  |  8 --------
 2 files changed, 26 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/BasicAuthenticator.java 
b/java/org/apache/catalina/authenticator/BasicAuthenticator.java
index cd342d9..a34f08b 100644
--- a/java/org/apache/catalina/authenticator/BasicAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/BasicAuthenticator.java
@@ -159,24 +159,6 @@ public class BasicAuthenticator extends AuthenticatorBase {
          * as per RFC 2617 section 2, and the Base64 encoded credentials
          * as per RFC 2045 section 6.8.
          *
-         * @param input   The header value to parse in-place
-         * @param charset The character set to use to convert the bytes to a
-         *                string
-         *
-         * @throws IllegalArgumentException If the header does not conform
-         *                                  to RFC 2617
-         * @deprecated Unused. Will be removed in Tomcat 10. Use 3-arg 
constructor
-         */
-        @Deprecated
-        public BasicCredentials(ByteChunk input, Charset charset) throws 
IllegalArgumentException {
-            this(input, charset, true);
-        }
-
-        /**
-         * Parse the HTTP Authorization header for BASIC authentication
-         * as per RFC 2617 section 2, and the Base64 encoded credentials
-         * as per RFC 2045 section 6.8.
-         *
          * @param input           The header value to parse in-place
          * @param charset         The character set to use to convert the bytes
          *                        to a string
diff --git a/java/org/apache/catalina/authenticator/Constants.java 
b/java/org/apache/catalina/authenticator/Constants.java
index a8e9a47..7977d55 100644
--- a/java/org/apache/catalina/authenticator/Constants.java
+++ b/java/org/apache/catalina/authenticator/Constants.java
@@ -82,14 +82,6 @@ public class Constants {
      */
 
     /**
-     * The previously authenticated principal (if caching is disabled).
-     *
-     * @deprecated Unused. Will be removed in Tomcat 10.
-     */
-    @Deprecated
-    public static final String FORM_PRINCIPAL_NOTE = 
"org.apache.catalina.authenticator.PRINCIPAL";
-
-    /**
      * The original request information, to which the user will be
      * redirected if authentication succeeds.
      */


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org