[tomcat] 02/02: Remove deprecated method

[ma...@apache.org]

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

commit cf43fa01d03e5acc1bf3244bd6a2a6b060c86ef6
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Oct 7 18:11:14 2021 +0100

    Remove deprecated method
---
 .../tomcat/websocket/server/WsServerContainer.java | 31 ----------------------
 1 file changed, 31 deletions(-)

diff --git a/java/org/apache/tomcat/websocket/server/WsServerContainer.java b/java/org/apache/tomcat/websocket/server/WsServerContainer.java
index b6949a6..135a1ba 100644
--- a/java/org/apache/tomcat/websocket/server/WsServerContainer.java
+++ b/java/org/apache/tomcat/websocket/server/WsServerContainer.java
@@ -296,37 +296,6 @@ public class WsServerContainer extends WsWebSocketContainer
     }
 
 
-    /**
-     * Until the WebSocket specification provides such a mechanism, this Tomcat
-     * proprietary method is provided to enable applications to programmatically
-     * determine whether or not to upgrade an individual request to WebSocket.
-     * <p>
-     * Note: This method is not used by Tomcat but is used directly by
-     *       third-party code and must not be removed.
-     *
-     * @param request The request object to be upgraded
-     * @param response The response object to be populated with the result of
-     *                 the upgrade
-     * @param sec The server endpoint to use to process the upgrade request
-     * @param pathParams The path parameters associated with the upgrade request
-     *
-     * @throws ServletException If a configuration error prevents the upgrade
-     *         from taking place
-     * @throws IOException If an I/O error occurs during the upgrade process
-     *
-     * @deprecated This method will be removed in Apache Tomcat 10.1 onwards. It
-     *             has been replaced by {@link #upgradeHttpToWebSocket(Object,
-     *             Object, ServerEndpointConfig, Map)}
-     */
-    @Deprecated
-    public void doUpgrade(HttpServletRequest request,
-            HttpServletResponse response, ServerEndpointConfig sec,
-            Map<String,String> pathParams)
-            throws ServletException, IOException {
-        UpgradeUtil.doUpgrade(this, request, response, sec, pathParams);
-    }
-
-
     @Override
     public void upgradeHttpToWebSocket(Object httpServletRequest, Object httpServletResponse,
             ServerEndpointConfig sec, Map<String, String> pathParameters)

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