This is an automated email from the ASF dual-hosted git repository. dsoumis pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit e77ac30ead7e53b35c7ea38a4d488574d248bd16 Author: Dimitris Soumis <[email protected]> AuthorDate: Fri Feb 27 13:30:28 2026 +0200 Comply with JDK8 --- test/org/apache/tomcat/integration/httpd/TestBasicProxy.java | 2 +- .../integration/httpd/TestChunkedTransferEncodingWithProxy.java | 5 +++-- test/org/apache/tomcat/integration/httpd/TestErrorHandling.java | 8 ++++---- .../apache/tomcat/integration/httpd/TestFullReverseProxy.java | 2 +- .../tomcat/integration/httpd/TestLargePayloadWithProxy.java | 7 ++++--- .../tomcat/integration/httpd/TestRemoteIpValveWithProxy.java | 2 +- .../apache/tomcat/integration/httpd/TestSSLValveWithProxy01.java | 2 +- .../apache/tomcat/integration/httpd/TestSSLValveWithProxy02.java | 2 +- .../apache/tomcat/integration/httpd/TestSessionWithProxy.java | 5 +++-- test/org/apache/tomcat/integration/httpd/TesterHttpd.java | 9 ++++++++- 10 files changed, 27 insertions(+), 17 deletions(-) diff --git a/test/org/apache/tomcat/integration/httpd/TestBasicProxy.java b/test/org/apache/tomcat/integration/httpd/TestBasicProxy.java index a9592ad2f5..d89fdb1549 100644 --- a/test/org/apache/tomcat/integration/httpd/TestBasicProxy.java +++ b/test/org/apache/tomcat/integration/httpd/TestBasicProxy.java @@ -20,7 +20,7 @@ package org.apache.tomcat.integration.httpd; import java.util.ArrayList; import java.util.List; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletResponse; import org.junit.Assert; import org.junit.Test; diff --git a/test/org/apache/tomcat/integration/httpd/TestChunkedTransferEncodingWithProxy.java b/test/org/apache/tomcat/integration/httpd/TestChunkedTransferEncodingWithProxy.java index bc748a84be..4ce39545f4 100644 --- a/test/org/apache/tomcat/integration/httpd/TestChunkedTransferEncodingWithProxy.java +++ b/test/org/apache/tomcat/integration/httpd/TestChunkedTransferEncodingWithProxy.java @@ -19,11 +19,12 @@ package org.apache.tomcat.integration.httpd; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletResponse; import org.junit.Assert; import org.junit.Test; @@ -86,7 +87,7 @@ public class TestChunkedTransferEncodingWithProxy extends HttpdIntegrationBaseTe ByteChunk res = new ByteChunk(); Map<String, List<String>> reqHead = new HashMap<>(); - reqHead.put("Content-Type", List.of("application/octet-stream")); + reqHead.put("Content-Type", new ArrayList<>(Collections.singletonList("application/octet-stream"))); int rc = postUrl(true, streamer, "http://localhost:"; + getHttpdPort() + "/endpoint", res, reqHead, null); Assert.assertEquals(HttpServletResponse.SC_OK, rc); diff --git a/test/org/apache/tomcat/integration/httpd/TestErrorHandling.java b/test/org/apache/tomcat/integration/httpd/TestErrorHandling.java index 06b562ecc1..ef5c23f625 100644 --- a/test/org/apache/tomcat/integration/httpd/TestErrorHandling.java +++ b/test/org/apache/tomcat/integration/httpd/TestErrorHandling.java @@ -20,10 +20,10 @@ package org.apache.tomcat.integration.httpd; import java.util.ArrayList; import java.util.List; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.junit.Assert; import org.junit.Test; diff --git a/test/org/apache/tomcat/integration/httpd/TestFullReverseProxy.java b/test/org/apache/tomcat/integration/httpd/TestFullReverseProxy.java index ff6449a65e..8b3dae5418 100644 --- a/test/org/apache/tomcat/integration/httpd/TestFullReverseProxy.java +++ b/test/org/apache/tomcat/integration/httpd/TestFullReverseProxy.java @@ -20,7 +20,7 @@ package org.apache.tomcat.integration.httpd; import java.util.ArrayList; import java.util.List; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletResponse; import org.junit.Assert; import org.junit.Test; diff --git a/test/org/apache/tomcat/integration/httpd/TestLargePayloadWithProxy.java b/test/org/apache/tomcat/integration/httpd/TestLargePayloadWithProxy.java index 9c93649c6d..33e4dc35f8 100644 --- a/test/org/apache/tomcat/integration/httpd/TestLargePayloadWithProxy.java +++ b/test/org/apache/tomcat/integration/httpd/TestLargePayloadWithProxy.java @@ -19,11 +19,12 @@ package org.apache.tomcat.integration.httpd; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletResponse; import org.junit.Assert; import org.junit.Test; @@ -63,7 +64,7 @@ public class TestLargePayloadWithProxy extends HttpdIntegrationBaseTest { ByteChunk res = new ByteChunk(); Map<String, List<String>> reqHead = new HashMap<>(); - reqHead.put("Content-Type", List.of("application/octet-stream")); + reqHead.put("Content-Type", new ArrayList<>(Collections.singletonList("application/octet-stream"))); int rc = postUrl(payload, "http://localhost:"; + getHttpdPort() + "/endpoint", res, reqHead, null); Assert.assertEquals(HttpServletResponse.SC_OK, rc); @@ -101,7 +102,7 @@ public class TestLargePayloadWithProxy extends HttpdIntegrationBaseTest { ByteChunk res = new ByteChunk(); Map<String, List<String>> reqHead = new HashMap<>(); - reqHead.put("Content-Type", List.of("application/octet-stream")); + reqHead.put("Content-Type", new ArrayList<>(Collections.singletonList("application/octet-stream"))); int rc = postUrl(true, streamer, "http://localhost:"; + getHttpdPort() + "/endpoint", res, reqHead, null); Assert.assertEquals(HttpServletResponse.SC_OK, rc); diff --git a/test/org/apache/tomcat/integration/httpd/TestRemoteIpValveWithProxy.java b/test/org/apache/tomcat/integration/httpd/TestRemoteIpValveWithProxy.java index cadb47ecc2..04e0d6fef0 100644 --- a/test/org/apache/tomcat/integration/httpd/TestRemoteIpValveWithProxy.java +++ b/test/org/apache/tomcat/integration/httpd/TestRemoteIpValveWithProxy.java @@ -20,7 +20,7 @@ package org.apache.tomcat.integration.httpd; import java.util.ArrayList; import java.util.List; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletResponse; import org.junit.Assert; import org.junit.Test; diff --git a/test/org/apache/tomcat/integration/httpd/TestSSLValveWithProxy01.java b/test/org/apache/tomcat/integration/httpd/TestSSLValveWithProxy01.java index 1fae625009..537ac7df6b 100644 --- a/test/org/apache/tomcat/integration/httpd/TestSSLValveWithProxy01.java +++ b/test/org/apache/tomcat/integration/httpd/TestSSLValveWithProxy01.java @@ -20,7 +20,7 @@ package org.apache.tomcat.integration.httpd; import java.util.ArrayList; import java.util.List; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletResponse; import org.junit.Assert; import org.junit.Test; diff --git a/test/org/apache/tomcat/integration/httpd/TestSSLValveWithProxy02.java b/test/org/apache/tomcat/integration/httpd/TestSSLValveWithProxy02.java index 2385d04278..163096639e 100644 --- a/test/org/apache/tomcat/integration/httpd/TestSSLValveWithProxy02.java +++ b/test/org/apache/tomcat/integration/httpd/TestSSLValveWithProxy02.java @@ -20,7 +20,7 @@ package org.apache.tomcat.integration.httpd; import java.util.ArrayList; import java.util.List; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletResponse; import org.junit.Assert; import org.junit.Test; diff --git a/test/org/apache/tomcat/integration/httpd/TestSessionWithProxy.java b/test/org/apache/tomcat/integration/httpd/TestSessionWithProxy.java index aa6b80d53f..39e46a8154 100644 --- a/test/org/apache/tomcat/integration/httpd/TestSessionWithProxy.java +++ b/test/org/apache/tomcat/integration/httpd/TestSessionWithProxy.java @@ -18,11 +18,12 @@ package org.apache.tomcat.integration.httpd; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletResponse; import org.junit.Assert; import org.junit.Test; @@ -91,7 +92,7 @@ public class TestSessionWithProxy extends HttpdIntegrationBaseTest { // Send the session cookie back Map<String, List<String>> reqHead = new HashMap<>(); - reqHead.put("Cookie", List.of("JSESSIONID=" + sessionId)); + reqHead.put("Cookie", new ArrayList<>(Collections.singletonList("JSESSIONID=" + sessionId))); rc = getUrl("http://localhost:"; + getHttpdPort() + "/endpoint", res, reqHead, null); Assert.assertEquals(HttpServletResponse.SC_OK, rc); diff --git a/test/org/apache/tomcat/integration/httpd/TesterHttpd.java b/test/org/apache/tomcat/integration/httpd/TesterHttpd.java index d6e4a22aa7..60b0b26e99 100644 --- a/test/org/apache/tomcat/integration/httpd/TesterHttpd.java +++ b/test/org/apache/tomcat/integration/httpd/TesterHttpd.java @@ -18,6 +18,7 @@ package org.apache.tomcat.integration.httpd; import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; import java.io.InputStreamReader; @@ -126,7 +127,13 @@ public class TesterHttpd { Process p = pb.start(); - String output = new String(p.getInputStream().readAllBytes()); + ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); + byte[] buf = new byte[8192]; + int len; + while ((len = p.getInputStream().read(buf)) != -1) { + byteArrayOutputStream.write(buf, 0, len); + } + String output = byteArrayOutputStream.toString(); int exitCode = p.waitFor(); if (exitCode != 0) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
