Remove deprecated code scheduled for removal in Tomcat 12.

Author: markt-asf

java/org/apache/catalina/filters/Constants.java

@@ -16,8 +16,6 @@
  */
 package org.apache.catalina.filters;
 
-import org.apache.tomcat.util.http.Method;
-
 /**
  * Manifest constants for this Java package.
  */
@@ -43,9 +41,6 @@ public final class Constants {
      */
     public static final String CSRF_NONCE_REQUEST_PARAM_NAME_KEY = "org.apache.catalina.filters.CSRF_NONCE_PARAM_NAME";
 
-    @Deprecated
-    public static final String METHOD_GET = Method.GET;
-
     public static final String CSRF_REST_NONCE_HEADER_NAME = "X-CSRF-Token";
 
     public static final String CSRF_REST_NONCE_HEADER_FETCH_VALUE = "Fetch";

java/org/apache/catalina/valves/rewrite/ResolverImpl.java

@@ -51,19 +51,6 @@ public class ResolverImpl extends Resolver {
     private final Log containerLog;
 
 
-    /**
-     * Create a resolver for the given request.
-     *
-     * @param request The request
-     *
-     * @deprecated Will be removed in Tomcat 12 onwards. Use {@link #ResolverImpl(Request, Log)}
-     */
-    @Deprecated
-    public ResolverImpl(Request request) {
-        this(request, request.getContext().getLogger());
-    }
-
-
     public ResolverImpl(Request request, Log containerLog) {
         this.request = request;
         this.containerLog = containerLog;