Remove deprecated code

apache · Jun 23, 2023 · d6c962a · d6c962a
1 parent e6ad02f
commit d6c962a
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 37 deletions.
diff --git a/java/org/apache/catalina/connector/Request.java b/java/org/apache/catalina/connector/Request.java
@@ -3162,34 +3162,6 @@ protected void parseParameters() {
     }
 
 
-    /**
-     * Read post body into an array.
-     *
-     * @param body The bytes array in which the body will be read
-     * @param len  The body length
-     *
-     * @return the bytes count that has been read
-     *
-     * @throws IOException if an IO exception occurred
-     *
-     * @deprecated Unused. Will be removed in Tomcat 11.0.x onwards. Use {@link #readPostBodyFully(byte[], int)}
-     */
-    @Deprecated
-    protected int readPostBody(byte[] body, int len) throws IOException {
-
-        int offset = 0;
-        do {
-            int inputLen = getStream().read(body, offset, len - offset);
-            if (inputLen <= 0) {
-                return offset;
-            }
-            offset += inputLen;
-        } while ((len - offset) > 0);
-        return len;
-
-    }
-
-
     /**
      * Read post body into an array.
      *

diff --git a/java/org/apache/catalina/filters/FailedRequestFilter.java b/java/org/apache/catalina/filters/FailedRequestFilter.java
@@ -49,7 +49,6 @@ protected Log getLogger() {
         return log;
     }
 
-    @SuppressWarnings("deprecation")
     @Override
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
             throws IOException, ServletException {
@@ -76,7 +75,6 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
                 case INVALID_CONTENT_TYPE:
                 case MULTIPART_CONFIG_INVALID:
                 case NO_NAME:
-                case REQUEST_BODY_INCOMPLETE:
                 case URL_DECODING:
                 case CLIENT_DISCONNECT:
                     // Client is never going to see this so this is really just

diff --git a/java/org/apache/tomcat/util/http/Parameters.java b/java/org/apache/tomcat/util/http/Parameters.java
@@ -503,13 +503,6 @@ public enum FailReason {
         IO_ERROR,
         NO_NAME,
         POST_TOO_LARGE,
-        /**
-         * Same as {@link #CLIENT_DISCONNECT}.
-         *
-         * @deprecated Unused. Will be removed in Tomcat 11.0.x onwards
-         */
-        @Deprecated
-        REQUEST_BODY_INCOMPLETE,
         TOO_MANY_PARAMETERS,
         UNKNOWN,
         URL_DECODING