[tomcat] 01/02: Delete some deprecated code planned 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

commit d9b030cfb24555169c49da3306110f8f21d5cc23
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 15 09:29:43 2020 +0000

    Delete some deprecated code planned for removal in Tomcat 10
---
 java/org/apache/catalina/realm/JNDIRealm.java |  1 -
 java/org/apache/catalina/realm/RealmBase.java | 22 ----------------------
 2 files changed, 23 deletions(-)

diff --git a/java/org/apache/catalina/realm/JNDIRealm.java 
b/java/org/apache/catalina/realm/JNDIRealm.java
index 375edc7..b814b00 100644
--- a/java/org/apache/catalina/realm/JNDIRealm.java
+++ b/java/org/apache/catalina/realm/JNDIRealm.java
@@ -2261,7 +2261,6 @@ public class JNDIRealm extends RealmBase {
         return getPrincipal(name, gssCredential);
     }
 
-    @Override
     protected Principal getPrincipal(String username,
             GSSCredential gssCredential) {
 
diff --git a/java/org/apache/catalina/realm/RealmBase.java 
b/java/org/apache/catalina/realm/RealmBase.java
index d9917cf..7d3464b 100644
--- a/java/org/apache/catalina/realm/RealmBase.java
+++ b/java/org/apache/catalina/realm/RealmBase.java
@@ -1224,28 +1224,6 @@ public abstract class RealmBase extends 
LifecycleMBeanBase implements Realm {
 
 
     /**
-     * Get the principal associated with the specified user name.
-     *
-     * @param username The user name
-     * @param gssCredential the GSS credential of the principal
-     * @return the principal associated with the given user name.
-     * @deprecated This will be removed in Tomcat 10 onwards. Use
-     *             {@link #getPrincipal(GSSName, GSSCredential)} instead.
-     */
-    @Deprecated
-    protected Principal getPrincipal(String username,
-            GSSCredential gssCredential) {
-        Principal p = getPrincipal(username);
-
-        if (p instanceof GenericPrincipal) {
-            ((GenericPrincipal) p).setGssCredential(gssCredential);
-        }
-
-        return p;
-    }
-
-
-    /**
      * Get the principal associated with the specified {@link GSSName}.
      *
      * @param gssName The GSS name


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