Jakarta servlet version 5 (#639)

pippo-java · Mar 22, 2023 · 6bb5d3e · 6bb5d3e
1 parent 5d412c0
commit 6bb5d3e
Show file tree

Hide file tree

Showing 55 changed files with 424 additions and 178 deletions.
diff --git a/pippo-controller-parent/pippo-controller/pom.xml b/pippo-controller-parent/pippo-controller/pom.xml
@@ -33,8 +33,8 @@
 
         <!-- Servlet -->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
             <version>${servlet.version}</version>
             <scope>provided</scope>
         </dependency>

diff --git a/pippo-core/pom.xml b/pippo-core/pom.xml
@@ -16,8 +16,8 @@
     <dependencies>
         <!-- Servlet -->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
             <version>${servlet.version}</version>
             <scope>provided</scope>
         </dependency>

diff --git a/pippo-core/src/main/java/ro/pippo/core/AbstractWebServer.java b/pippo-core/src/main/java/ro/pippo/core/AbstractWebServer.java
@@ -15,7 +15,7 @@
  */
 package ro.pippo.core;
 
-import javax.servlet.MultipartConfigElement;
+import jakarta.servlet.MultipartConfigElement;
 import java.util.EventListener;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;

diff --git a/pippo-core/src/main/java/ro/pippo/core/Application.java b/pippo-core/src/main/java/ro/pippo/core/Application.java
@@ -37,7 +37,7 @@
 import ro.pippo.core.websocket.WebSocketHandler;
 import ro.pippo.core.websocket.WebSocketRouter;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;

diff --git a/pippo-core/src/main/java/ro/pippo/core/FileItem.java b/pippo-core/src/main/java/ro/pippo/core/FileItem.java
@@ -17,7 +17,7 @@
 
 import ro.pippo.core.util.IoUtils;
 
-import javax.servlet.http.Part;
+import jakarta.servlet.http.Part;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/pippo-core/src/main/java/ro/pippo/core/Languages.java b/pippo-core/src/main/java/ro/pippo/core/Languages.java
@@ -20,7 +20,7 @@
 import ro.pippo.core.route.RouteContext;
 import ro.pippo.core.util.StringUtils;
 
-import javax.servlet.http.Cookie;
+import jakarta.servlet.http.Cookie;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;

diff --git a/pippo-core/src/main/java/ro/pippo/core/PippoFilter.java b/pippo-core/src/main/java/ro/pippo/core/PippoFilter.java
@@ -21,16 +21,16 @@
 import ro.pippo.core.util.PippoUtils;
 import ro.pippo.core.util.StringUtils;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.FilterRegistration;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.FilterRegistration;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URI;
 import java.util.Collection;

diff --git a/pippo-core/src/main/java/ro/pippo/core/PippoServlet.java b/pippo-core/src/main/java/ro/pippo/core/PippoServlet.java
@@ -21,14 +21,14 @@
 import ro.pippo.core.util.PippoUtils;
 import ro.pippo.core.util.StringUtils;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URI;
 

diff --git a/pippo-core/src/main/java/ro/pippo/core/PippoServletContextListener.java b/pippo-core/src/main/java/ro/pippo/core/PippoServletContextListener.java
@@ -19,8 +19,8 @@
 import org.slf4j.LoggerFactory;
 import ro.pippo.core.util.ServiceLocator;
 
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
 import java.util.List;
 
 /**

diff --git a/pippo-core/src/main/java/ro/pippo/core/Request.java b/pippo-core/src/main/java/ro/pippo/core/Request.java
@@ -24,10 +24,10 @@
 import ro.pippo.core.util.IoUtils;
 import ro.pippo.core.util.StringUtils;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.Part;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.Part;
 import java.net.URI;
 import java.util.Collection;
 import java.util.Collections;

diff --git a/pippo-core/src/main/java/ro/pippo/core/RequestResponseFactory.java b/pippo-core/src/main/java/ro/pippo/core/RequestResponseFactory.java
@@ -15,8 +15,8 @@
  */
 package ro.pippo.core;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * Helps in creating <code>Request<code/> and <code>Response<code/> objects.

diff --git a/pippo-core/src/main/java/ro/pippo/core/Response.java b/pippo-core/src/main/java/ro/pippo/core/Response.java
@@ -25,9 +25,9 @@
 import ro.pippo.core.util.MimeTypes;
 import ro.pippo.core.util.StringUtils;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;

diff --git a/pippo-core/src/main/java/ro/pippo/core/Session.java b/pippo-core/src/main/java/ro/pippo/core/Session.java
@@ -18,7 +18,7 @@
 import ro.pippo.core.route.RouteContext;
 import ro.pippo.core.route.RouteDispatcher;
 
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;

diff --git a/pippo-core/src/main/java/ro/pippo/core/WebServer.java b/pippo-core/src/main/java/ro/pippo/core/WebServer.java
@@ -23,7 +23,7 @@
 public interface WebServer<T extends WebServerSettings> {
 
     /**
-     * Attribute name used to retrieve the application instance from a {@link javax.servlet.ServletContext}.
+     * Attribute name used to retrieve the application instance from a {@link jakarta.servlet.ServletContext}.
      * See also {@link WebServerInitializer}.
      *
      * <pre>
@@ -100,15 +100,15 @@ public interface WebServer<T extends WebServerSettings> {
      * Servlet API provides following Listener interfaces:
      *
      * <ul>
-     * <li>{@code javax.servlet.ServletContextListener}</li>
-     * <li>{@code javax.servlet.ServletContextAttributeListener}</li>
-     * <li>{@code javax.servlet.ServletRequestListener}</li>
-     * <li>{@code javax.servlet.ServletRequestAttributeListener}</li>
-     * <li>{@code javax.servlet.http.HttpSessionListener}</li>
-     * <li>{@code javax.servlet.http.HttpSessionBindingListener}</li>
-     * <li>{@code javax.servlet.http.HttpSessionAttributeListener}</li>
-     * <li>{@code javax.servlet.http.HttpSessionActivationListener}</li>
-     * <li>{@code javax.servlet.AsyncListener}</li>
+     * <li>{@link jakarta.servlet.ServletContextListener}</li>
+     * <li>{@link jakarta.servlet.ServletContextAttributeListener}</li>
+     * <li>{@link jakarta.servlet.ServletRequestListener}</li>
+     * <li>{@link jakarta.servlet.ServletRequestAttributeListener}</li>
+     * <li>{@link jakarta.servlet.http.HttpSessionListener}</li>
+     * <li>{@link jakarta.servlet.http.HttpSessionBindingListener}</li>
+     * <li>{@link jakarta.servlet.http.HttpSessionAttributeListener}</li>
+     * <li>{@link jakarta.servlet.http.HttpSessionActivationListener}</li>
+     * <li>{@link jakarta.servlet.AsyncListener}</li>
      * </ul>
      *
      * @param listener

diff --git a/pippo-core/src/main/java/ro/pippo/core/WebServerInitializer.java b/pippo-core/src/main/java/ro/pippo/core/WebServerInitializer.java
@@ -15,7 +15,7 @@
  */
 package ro.pippo.core;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 /**
  * Interface to be implemented in Servlet 3.0+ environments in order to configure the

diff --git a/pippo-core/src/main/java/ro/pippo/core/gzip/GZipFilter.java b/pippo-core/src/main/java/ro/pippo/core/gzip/GZipFilter.java
@@ -17,14 +17,14 @@
 
 import ro.pippo.core.util.StringUtils;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 /**

diff --git a/pippo-core/src/main/java/ro/pippo/core/gzip/GZipRequestResponseFactory.java b/pippo-core/src/main/java/ro/pippo/core/gzip/GZipRequestResponseFactory.java
@@ -22,8 +22,8 @@
 import ro.pippo.core.Response;
 import ro.pippo.core.util.StringUtils;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * @author Decebal Suiu

diff --git a/pippo-core/src/main/java/ro/pippo/core/gzip/GZipResponseStream.java b/pippo-core/src/main/java/ro/pippo/core/gzip/GZipResponseStream.java
@@ -15,8 +15,9 @@
  */
 package ro.pippo.core.gzip;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.WriteListener;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.zip.GZIPOutputStream;
@@ -94,4 +95,15 @@ public void write(byte[] b, int off, int len) throws IOException {
         gzipOutputStream.write(b, off, len);
     }
 
+    @Override
+    public boolean isReady() {
+        // we are writing to internal buffer, so we are always ready
+        return true;
+    }
+
+    @Override
+    public void setWriteListener(WriteListener writeListener) {
+        // we are always ready, ignore
+    }
+
 }
diff --git a/pippo-core/src/main/java/ro/pippo/core/gzip/GZipResponseWrapper.java b/pippo-core/src/main/java/ro/pippo/core/gzip/GZipResponseWrapper.java
@@ -17,9 +17,9 @@
 
 import ro.pippo.core.util.IoUtils;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;

diff --git a/pippo-core/src/main/java/ro/pippo/core/route/CSRFHandler.java b/pippo-core/src/main/java/ro/pippo/core/route/CSRFHandler.java
@@ -23,7 +23,7 @@
 import ro.pippo.core.util.CryptoUtils;
 import ro.pippo.core.util.StringUtils;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.List;
 

diff --git a/pippo-core/src/main/java/ro/pippo/core/route/RouteDispatcher.java b/pippo-core/src/main/java/ro/pippo/core/route/RouteDispatcher.java
@@ -25,8 +25,8 @@
 import ro.pippo.core.Response;
 import ro.pippo.core.util.ServiceLocator;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.List;

diff --git a/pippo-core/src/main/java/ro/pippo/core/util/CookieUtils.java b/pippo-core/src/main/java/ro/pippo/core/util/CookieUtils.java
@@ -15,8 +15,8 @@
  */
 package ro.pippo.core.util;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;

diff --git a/pippo-core/src/main/java/ro/pippo/core/websocket/AbstractWebSocketFilter.java b/pippo-core/src/main/java/ro/pippo/core/websocket/AbstractWebSocketFilter.java
@@ -20,7 +20,7 @@
 import ro.pippo.core.Response;
 import ro.pippo.core.util.StringUtils;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Enumeration;
@@ -50,7 +50,7 @@ protected boolean acceptWebSocket(Request request, Response response)
             return false;
         }
 
-        if (!headerContainsToken(request, "Sec-websocket-version", "13")) {
+        if (!headerContainsToken(request, "Sec-WebSocket-Version", "13")) {
             response.badRequest().header("Sec-WebSocket-Version", "13"); // http://tools.ietf.org/html/rfc6455#section-4.4
             return false;
         }

diff --git a/pippo-core/src/main/java/ro/pippo/core/websocket/WebSocketConnection.java b/pippo-core/src/main/java/ro/pippo/core/websocket/WebSocketConnection.java
@@ -16,7 +16,7 @@
 package ro.pippo.core.websocket;
 
 import java.io.IOException;
-import java.net.InetSocketAddress;
+import java.net.SocketAddress;
 
 /**
  * @author Decebal Suiu
@@ -49,6 +49,6 @@ public interface WebSocketConnection {
      */
     WebSocketConnection sendMessage(byte[] message) throws IOException;
 
-    InetSocketAddress getRemoteAddress();
+    SocketAddress getRemoteAddress();
 
 }
diff --git a/pippo-core/src/test/java/ro/pippo/core/RequestTest.java b/pippo-core/src/test/java/ro/pippo/core/RequestTest.java
@@ -17,7 +17,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.Collections;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;

diff --git a/pippo-core/src/test/java/ro/pippo/core/ResponseTest.java b/pippo-core/src/test/java/ro/pippo/core/ResponseTest.java
@@ -17,7 +17,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.nio.charset.StandardCharsets;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;

diff --git a/pippo-core/src/test/java/ro/pippo/core/gzip/GZipRequestResponseFactoryTest.java b/pippo-core/src/test/java/ro/pippo/core/gzip/GZipRequestResponseFactoryTest.java
@@ -19,7 +19,7 @@
 import org.mockito.Mockito;
 import ro.pippo.core.Application;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;

diff --git a/pippo-core/src/test/java/ro/pippo/core/route/CorsHandlerTest.java b/pippo-core/src/test/java/ro/pippo/core/route/CorsHandlerTest.java
@@ -22,7 +22,7 @@
 import ro.pippo.core.PippoRuntimeException;
 import ro.pippo.core.Response;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;

diff --git a/pippo-metrics-parent/pippo-metrics/pom.xml b/pippo-metrics-parent/pippo-metrics/pom.xml
@@ -53,8 +53,8 @@
 
         <!-- Servlet -->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
             <version>${servlet.version}</version>
             <scope>provided</scope>
         </dependency>