Skip to content

Commit 86335a8

Browse files
authored
JAMES-4072 -Webadmin Spark - Upgrade org.zoomba-lang:spark-core -> 3.0.2 (#2714)
1 parent 2e1db87 commit 86335a8

File tree

4 files changed

+5
-65
lines changed

4 files changed

+5
-65
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3040,7 +3040,7 @@
30403040
<dependency>
30413041
<groupId>org.zoomba-lang</groupId>
30423042
<artifactId>spark-core</artifactId>
3043-
<version>3.0.1</version>
3043+
<version>3.0.2</version>
30443044
</dependency>
30453045
<dependency>
30463046
<groupId>pl.pragmatists</groupId>

server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/jettyserver/EmbeddedJettyServer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import jakarta.servlet.DispatcherType;
2929

3030
import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
31+
import org.eclipse.jetty.ee10.servlet.SessionHandler;
3132
import org.eclipse.jetty.server.Connector;
3233
import org.eclipse.jetty.server.Server;
3334
import org.eclipse.jetty.server.ServerConnector;
@@ -137,7 +138,7 @@ public int ignite(String host,
137138
final ServletContextHandler servletContextHandler = webSocketServletContextHandler == null ?
138139
new ServletContextHandler() : webSocketServletContextHandler;
139140

140-
final JettyHandler sessionHandler = new JettyHandler(matcherFilter);
141+
final SessionHandler sessionHandler = new SessionHandler();
141142
sessionHandler.getSessionCookieConfig().setHttpOnly(httpOnly);
142143
servletContextHandler.setSessionHandler(sessionHandler);
143144

server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/jettyserver/JettyHandler.java

Lines changed: 0 additions & 63 deletions
This file was deleted.

server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/EventDeadLettersRoutes.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import org.apache.james.webadmin.utils.Responses;
3939
import org.eclipse.jetty.http.HttpStatus;
4040

41+
import reactor.core.publisher.Mono;
4142
import spark.Request;
4243
import spark.Response;
4344
import spark.Route;
@@ -106,6 +107,7 @@ private String getEventDetails(Request request, Response response) {
106107

107108
return eventDeadLettersService.getEvent(group, insertionId)
108109
.map(eventSerializer::toJson)
110+
.switchIfEmpty(Mono.fromRunnable(() -> response.status(HttpStatus.NOT_FOUND_404)))
109111
.block();
110112
}
111113

0 commit comments

Comments
 (0)