Skip to content

Jakarta servlet version 5 #639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
decebals merged 8 commits into from
Mar 22, 2023
Merged

Jakarta servlet version 5 #639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a2b197c
Servlet version 5
gkresic Feb 15, 2023
f40748a
Merge branch 'master' into jakarta
gkresic Feb 21, 2023
d10a05c
Use single Pippo instance for all tests
gkresic Feb 21, 2023
5d9e477
Improve coding style
gkresic Mar 2, 2023
a58e5a4
Removed logback from pippo-test
gkresic Mar 2, 2023
4f92378
Added missing copyright header
gkresic Mar 2, 2023
874ab19
Pass Jetty Server instance to JettyWebSocketFilter
gkresic Mar 2, 2023
1a6b54c
Refactored WebSocket-related tests
gkresic Mar 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pippo-controller-parent/pippo-controller/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions pippo-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion pippo-core/src/main/java/ro/pippo/core/AbstractWebServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion pippo-core/src/main/java/ro/pippo/core/Application.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion pippo-core/src/main/java/ro/pippo/core/FileItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion pippo-core/src/main/java/ro/pippo/core/Languages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
20 changes: 10 additions & 10 deletions pippo-core/src/main/java/ro/pippo/core/PippoFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
16 changes: 8 additions & 8 deletions pippo-core/src/main/java/ro/pippo/core/PippoServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions pippo-core/src/main/java/ro/pippo/core/PippoServletContextListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
8 changes: 4 additions & 4 deletions pippo-core/src/main/java/ro/pippo/core/Request.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions pippo-core/src/main/java/ro/pippo/core/RequestResponseFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions pippo-core/src/main/java/ro/pippo/core/Response.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion pippo-core/src/main/java/ro/pippo/core/Session.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
20 changes: 10 additions & 10 deletions pippo-core/src/main/java/ro/pippo/core/WebServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pippo-core/src/main/java/ro/pippo/core/WebServerInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions pippo-core/src/main/java/ro/pippo/core/gzip/GZipFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
4 changes: 2 additions & 2 deletions pippo-core/src/main/java/ro/pippo/core/gzip/GZipRequestResponseFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 14 additions & 2 deletions pippo-core/src/main/java/ro/pippo/core/gzip/GZipResponseStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
}

}
6 changes: 3 additions & 3 deletions pippo-core/src/main/java/ro/pippo/core/gzip/GZipResponseWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion pippo-core/src/main/java/ro/pippo/core/route/CSRFHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions pippo-core/src/main/java/ro/pippo/core/route/RouteDispatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions pippo-core/src/main/java/ro/pippo/core/util/CookieUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions pippo-core/src/main/java/ro/pippo/core/websocket/AbstractWebSocketFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions pippo-core/src/main/java/ro/pippo/core/websocket/WebSocketConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
package ro.pippo.core.websocket;

import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.SocketAddress;

/**
* @author Decebal Suiu
Expand Down Expand Up @@ -49,6 +49,6 @@ public interface WebSocketConnection {
*/
WebSocketConnection sendMessage(byte[] message) throws IOException;

InetSocketAddress getRemoteAddress();
SocketAddress getRemoteAddress();

}
2 changes: 1 addition & 1 deletion pippo-core/src/test/java/ro/pippo/core/RequestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion pippo-core/src/test/java/ro/pippo/core/ResponseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion pippo-core/src/test/java/ro/pippo/core/gzip/GZipRequestResponseFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion pippo-core/src/test/java/ro/pippo/core/route/CorsHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions pippo-metrics-parent/pippo-metrics/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading