Skip to content

Commit 620c5da

Browse files
committed
Upgraded jetty from 9.44.x to 11.0.7 because the abstraction allowed it and there are reported issues with older versions
1 parent bbe6c85 commit 620c5da

File tree

4 files changed

+7
-17
lines changed

4 files changed

+7
-17
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<dependency>
5656
<groupId>org.eclipse.jetty</groupId>
5757
<artifactId>jetty-server</artifactId>
58-
<version>9.4.44.v20210927</version>
58+
<version>11.0.7</version>
5959
<optional>true</optional>
6060
</dependency>
6161
<dependency>

src/main/java/org/javawebstack/httpserver/HTTPServer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,4 +407,5 @@ public byte[] transformResponse(Exchange exchange, Object object) {
407407
public ExceptionHandler getExceptionHandler() {
408408
return exceptionHandler;
409409
}
410+
410411
}

src/main/java/org/javawebstack/httpserver/adapter/jetty/JettyHTTPSocket.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package org.javawebstack.httpserver.adapter.jetty;
22

3+
import jakarta.servlet.http.HttpServletRequest;
4+
import jakarta.servlet.http.HttpServletResponse;
35
import org.javawebstack.httpserver.HTTPMethod;
46
import org.javawebstack.httpserver.HTTPStatus;
57
import org.javawebstack.httpserver.adapter.IHTTPSocket;
68

7-
import javax.servlet.http.HttpServletRequest;
8-
import javax.servlet.http.HttpServletResponse;
99
import java.io.IOException;
1010
import java.io.InputStream;
1111
import java.io.OutputStream;

src/main/java/org/javawebstack/httpserver/adapter/jetty/JettyHTTPSocketServer.java

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
package org.javawebstack.httpserver.adapter.jetty;
22

3+
import jakarta.servlet.ServletException;
4+
import jakarta.servlet.http.HttpServletRequest;
5+
import jakarta.servlet.http.HttpServletResponse;
36
import org.eclipse.jetty.server.Request;
47
import org.eclipse.jetty.server.Server;
58
import org.eclipse.jetty.server.handler.AbstractHandler;
69
import org.eclipse.jetty.server.handler.ErrorHandler;
710
import org.javawebstack.httpserver.adapter.IHTTPSocketHandler;
811
import org.javawebstack.httpserver.adapter.IHTTPSocketServer;
912

10-
import javax.servlet.ServletException;
11-
import javax.servlet.http.HttpServletRequest;
12-
import javax.servlet.http.HttpServletResponse;
13-
import javax.servlet.http.HttpUpgradeHandler;
14-
import javax.servlet.http.WebConnection;
1513
import java.io.IOException;
1614
import java.nio.charset.StandardCharsets;
1715

@@ -68,13 +66,4 @@ public void setHandler(IHTTPSocketHandler handler) {
6866
this.handler = handler;
6967
}
7068

71-
private static class DummyUpgradeHandler implements HttpUpgradeHandler {
72-
public void init(WebConnection webConnection) {
73-
74-
}
75-
public void destroy() {
76-
77-
}
78-
}
79-
8069
}

0 commit comments

Comments
 (0)