From 4b5eb504264760f6bf2d160f32d3d80ae16370fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9da=20Housni=20Alaoui?= Date: Mon, 23 Jan 2023 00:30:35 +0100 Subject: [PATCH] Migrate to jakarta namespace --- pom.xml | 19 +++++++++---------- .../mitre/dsmiley/httpproxy/ProxyServlet.java | 19 ++++++++----------- .../httpproxy/URITemplateProxyServlet.java | 6 +++--- .../dsmiley/httpproxy/AcceptEncodingTest.java | 11 ++++++----- .../httpproxy/ChunkedTransferTest.java | 8 ++++---- .../ModifyHeadersProxyServletTest.java | 4 ++-- .../httpproxy/ParallelConnectionsTest.java | 8 ++++---- 7 files changed, 36 insertions(+), 39 deletions(-) diff --git a/pom.xml b/pom.xml index d019b02f..e0d40100 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.mitre.dsmiley.httpproxy smiley-http-proxy-servlet - 1.13-SNAPSHOT + 2.0-SNAPSHOT jar Smiley's HTTP Proxy Servlet @@ -54,11 +54,10 @@ - - javax.servlet - javax.servlet-api - 3.1.0 + jakarta.servlet + jakarta.servlet-api + 5.0.0 provided @@ -84,9 +83,9 @@ - httpunit + com.github.hazendaz.httpunit httpunit - 1.7 + 2.0.0 test @@ -106,7 +105,7 @@ org.eclipse.jetty jetty-servlet - 9.4.30.v20200611 + 11.0.13 test @@ -147,8 +146,8 @@ org.apache.http.util; version="0", org.apache.http.client.utils;version="0", org.apache.http.client.methods;version="0", - javax.servlet;version="0", - javax.servlet.http;version="0", + jakarta.servlet;version="0", + jakarta.servlet.http;version="0", javax.net.ssl;version="0", org.apache.http.client.config;version="0" diff --git a/src/main/java/org/mitre/dsmiley/httpproxy/ProxyServlet.java b/src/main/java/org/mitre/dsmiley/httpproxy/ProxyServlet.java index 7be138b9..a22ace65 100755 --- a/src/main/java/org/mitre/dsmiley/httpproxy/ProxyServlet.java +++ b/src/main/java/org/mitre/dsmiley/httpproxy/ProxyServlet.java @@ -37,11 +37,11 @@ import org.apache.http.message.HeaderGroup; import org.apache.http.util.EntityUtils; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.Closeable; import java.io.IOException; import java.io.InputStream; @@ -272,7 +272,7 @@ protected void initTarget() throws ServletException { } /** - * Called from {@link #init(javax.servlet.ServletConfig)}. + * Called from {@link #init(jakarta.servlet.ServletConfig)}. * HttpClient offers many opportunities for customization. * In any case, it should be thread-safe. */ @@ -374,11 +374,8 @@ protected void service(HttpServletRequest servletRequest, HttpServletResponse se // Process the response: - // Pass the response code. This method with the "reason phrase" is deprecated but it's the - // only way to pass the reason along too. int statusCode = proxyResponse.getStatusLine().getStatusCode(); - //noinspection deprecation - servletResponse.setStatus(statusCode, proxyResponse.getStatusLine().getReasonPhrase()); + servletResponse.setStatus(statusCode); // Copying response headers to make sure SESSIONID or other Cookie which comes from the remote // server will be saved in client when the proxied url was redirected to another one. @@ -751,7 +748,7 @@ protected String rewriteQueryStringFromRequest(HttpServletRequest servletRequest } /** - * Allow overrides of {@link javax.servlet.http.HttpServletRequest#getPathInfo()}. + * Allow overrides of {@link jakarta.servlet.http.HttpServletRequest#getPathInfo()}. * Useful when url-pattern of servlet-mapping (web.xml) requires manipulation. */ protected String rewritePathInfoFromRequest(HttpServletRequest servletRequest) { diff --git a/src/main/java/org/mitre/dsmiley/httpproxy/URITemplateProxyServlet.java b/src/main/java/org/mitre/dsmiley/httpproxy/URITemplateProxyServlet.java index eeada074..b0e9da99 100644 --- a/src/main/java/org/mitre/dsmiley/httpproxy/URITemplateProxyServlet.java +++ b/src/main/java/org/mitre/dsmiley/httpproxy/URITemplateProxyServlet.java @@ -20,9 +20,9 @@ import org.apache.http.client.utils.URIUtils; import org.apache.http.client.utils.URLEncodedUtils; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; diff --git a/src/test/java/org/mitre/dsmiley/httpproxy/AcceptEncodingTest.java b/src/test/java/org/mitre/dsmiley/httpproxy/AcceptEncodingTest.java index 58a71b11..04820e56 100644 --- a/src/test/java/org/mitre/dsmiley/httpproxy/AcceptEncodingTest.java +++ b/src/test/java/org/mitre/dsmiley/httpproxy/AcceptEncodingTest.java @@ -15,15 +15,17 @@ */ package org.mitre.dsmiley.httpproxy; +import static org.junit.Assert.assertEquals; + +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.HashSet; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.CloseableHttpClient; @@ -34,7 +36,6 @@ import org.eclipse.jetty.servlet.ServletHandler; import org.eclipse.jetty.servlet.ServletHolder; import org.junit.After; -import static org.junit.Assert.assertEquals; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/org/mitre/dsmiley/httpproxy/ChunkedTransferTest.java b/src/test/java/org/mitre/dsmiley/httpproxy/ChunkedTransferTest.java index 8bd5c400..91b538b9 100644 --- a/src/test/java/org/mitre/dsmiley/httpproxy/ChunkedTransferTest.java +++ b/src/test/java/org/mitre/dsmiley/httpproxy/ChunkedTransferTest.java @@ -23,10 +23,10 @@ import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.http.MalformedChunkCodingException; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; diff --git a/src/test/java/org/mitre/dsmiley/httpproxy/ModifyHeadersProxyServletTest.java b/src/test/java/org/mitre/dsmiley/httpproxy/ModifyHeadersProxyServletTest.java index 6868dc79..66cc8451 100644 --- a/src/test/java/org/mitre/dsmiley/httpproxy/ModifyHeadersProxyServletTest.java +++ b/src/test/java/org/mitre/dsmiley/httpproxy/ModifyHeadersProxyServletTest.java @@ -25,8 +25,8 @@ import org.apache.http.protocol.HttpContext; import org.junit.Test; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/org/mitre/dsmiley/httpproxy/ParallelConnectionsTest.java b/src/test/java/org/mitre/dsmiley/httpproxy/ParallelConnectionsTest.java index 16a0bc6a..967b93b8 100644 --- a/src/test/java/org/mitre/dsmiley/httpproxy/ParallelConnectionsTest.java +++ b/src/test/java/org/mitre/dsmiley/httpproxy/ParallelConnectionsTest.java @@ -31,10 +31,10 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector;