revert #5962 and #5806 for TCK compatibility

Author: senivam

containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/ServletEntityInputStream.java

@@ -138,30 +138,6 @@ public final class ServletProperties {
      */
     public static final String QUERY_PARAMS_AS_FORM_PARAMS_DISABLED = "jersey.config.servlet.form.queryParams.disabled";
 
-    /**
-     * Indicates if any input stream is expected and shall be waited while using POST method. It can happen that a delay
-     * appear between the time the request is received and the time the input stream is available. In this case, the
-     * server will wait for the input stream to be available before processing the request.
-     *
-     * @since 3.1.11
-     */
-    public static final String WAIT_FOR_INPUT = "jersey.config.servlet.expect.input";
-
-    /**
-     * Timeout which shall be respected while waiting for the input stream to be available.
-     * The timeout is in milliseconds.
-     *
-     * @since 3.1.11
-     */
-    public static final String WAIT_FOR_INPUT_TIMEOUT = "jersey.config.servlet.input.timeout";
-
-    /**
-     * Default timeout which shall be respected while waiting for the input stream to be available.
-     *
-     * @since 3.1.11
-     */
-    public static final Long WAIT_FOR_INPUT_DEFAULT_TIMEOUT = 100L;
-
     /**
      * Identifies the object that will be used as a parent {@code HK2 ServiceLocator} in the Jersey
      * {@link WebComponent}.

containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/ServletProperties.java

@@ -17,6 +17,7 @@
 package org.glassfish.jersey.servlet;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.UncheckedIOException;
 import java.lang.reflect.Type;
 import java.net.URI;
@@ -56,6 +57,7 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
+import org.glassfish.jersey.innate.io.InputStreamWrapper;
 import org.glassfish.jersey.internal.ServiceFinderBinder;
 import org.glassfish.jersey.internal.inject.AbstractBinder;
 import org.glassfish.jersey.internal.inject.InjectionManager;
@@ -423,15 +425,11 @@ private void initContainerRequest(
             final ResponseWriter responseWriter) throws IOException {
 
         try {
-            boolean waitForInputEnable = requestContext.resolveProperty(ServletProperties.WAIT_FOR_INPUT, Boolean.TRUE);
-            long waitForInputTimeOut = requestContext.resolveProperty(ServletProperties.WAIT_FOR_INPUT_TIMEOUT,
-                    ServletProperties.WAIT_FOR_INPUT_DEFAULT_TIMEOUT);
-            requestContext.wrapEntityInputStream(new ServletEntityInputStream(waitForInputEnable,
-                    waitForInputTimeOut) {
-                private ServletInputStream wrappedStream;
+            requestContext.setEntityStream(new InputStreamWrapper() {
 
+                private ServletInputStream wrappedStream;
                 @Override
-                protected ServletInputStream getWrappedStream() {
+                protected InputStream getWrapped() {
                     if (wrappedStream == null) {
                         try {
                             wrappedStream = servletRequest.getInputStream();