This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 0a8c2cfe97 Remove deprecated code
0a8c2cfe97 is described below
commit 0a8c2cfe97bf97c6153f83157afbbf32c8456c65
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Sep 9 10:46:56 2022 +0100
Remove deprecated code
---
.../org/apache/tomcat/websocket/Authenticator.java | 40 ----------------------
1 file changed, 40 deletions(-)
diff --git a/java/org/apache/tomcat/websocket/Authenticator.java
b/java/org/apache/tomcat/websocket/Authenticator.java
index 0c82ea7fb0..2766330cb3 100644
--- a/java/org/apache/tomcat/websocket/Authenticator.java
+++ b/java/org/apache/tomcat/websocket/Authenticator.java
@@ -33,30 +33,6 @@ public abstract class Authenticator {
private static final Pattern pattern =
Pattern.compile("(\\w+)\\s*=\\s*(\"([^\"]+)\"|([^,=\"]+))\\s*,?");
- /**
- * Generate the authorization header value that will be sent to the server.
- *
- * @param requestUri The request URI
- * @param authenticateHeader The server authentication header received
- * @param userProperties The user information
- *
- * @return The generated authorization header value
- *
- * @throws AuthenticationException When an error occurs
- *
- * @deprecated Use {@link
- * #getAuthorization(String, String, String, String, String)}.
- * Will be removed in Tomcat 10.1.x
- */
- @Deprecated
- public String getAuthorization(String requestUri, String
authenticateHeader, Map<String, Object> userProperties)
- throws AuthenticationException {
- return getAuthorization(requestUri, authenticateHeader,
- (String)
userProperties.get(Constants.WS_AUTHENTICATION_USER_NAME),
- (String)
userProperties.get(Constants.WS_AUTHENTICATION_PASSWORD),
- (String)
userProperties.get(Constants.WS_AUTHENTICATION_REALM));
- }
-
/**
* Generate the authorization header value that will be sent to the server.
*
@@ -84,22 +60,6 @@ public abstract class Authenticator {
public abstract String getSchemeName();
- /**
- * Utility method to parse the authentication header.
- *
- * @param authenticateHeader The server authenticate header received
- *
- * @return a map of authentication parameter names and values
- *
- * @deprecated Use {@link Authenticator#parseAuthenticateHeader(String)}.
- * Will be removed in Tomcat 10.1.x onwards
- */
- @Deprecated
- public Map<String, String> parseWWWAuthenticateHeader(String
authenticateHeader) {
- return parseAuthenticateHeader(authenticateHeader);
- }
-
-
/**
* Utility method to parse the authentication header.
*
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
