From f295120443af8585956b31fdf7163dc5b7a6b029 Mon Sep 17 00:00:00 2001 From: moiz arafat Date: Mon, 11 Jul 2022 23:04:27 -0400 Subject: [PATCH] Upgrade to Jetty 10.0.10 --- elide-datastore/elide-datastore-jms/pom.xml | 6 ++--- .../jms/JMSDataStoreIntegrationTest.java | 25 +++++++++-------- elide-standalone/pom.xml | 27 ++++++++++++++++--- .../elide/standalone/ElideStandalone.java | 12 +++------ pom.xml | 2 +- 5 files changed, 44 insertions(+), 28 deletions(-) diff --git a/elide-datastore/elide-datastore-jms/pom.xml b/elide-datastore/elide-datastore-jms/pom.xml index 4c8e8632bc..faf1f5cc7d 100644 --- a/elide-datastore/elide-datastore-jms/pom.xml +++ b/elide-datastore/elide-datastore-jms/pom.xml @@ -131,14 +131,14 @@ org.eclipse.jetty.websocket - websocket-server + websocket-jetty-server ${version.jetty} test org.eclipse.jetty.websocket - websocket-client + websocket-jetty-client ${version.jetty} test @@ -152,7 +152,7 @@ org.eclipse.jetty.websocket - javax-websocket-server-impl + websocket-javax-server ${version.jetty} test diff --git a/elide-datastore/elide-datastore-jms/src/test/java/com/yahoo/elide/datastores/jms/JMSDataStoreIntegrationTest.java b/elide-datastore/elide-datastore-jms/src/test/java/com/yahoo/elide/datastores/jms/JMSDataStoreIntegrationTest.java index 6f8747f0b5..fb77ee67e9 100644 --- a/elide-datastore/elide-datastore-jms/src/test/java/com/yahoo/elide/datastores/jms/JMSDataStoreIntegrationTest.java +++ b/elide-datastore/elide-datastore-jms/src/test/java/com/yahoo/elide/datastores/jms/JMSDataStoreIntegrationTest.java @@ -35,7 +35,7 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; -import org.eclipse.jetty.websocket.jsr356.server.deploy.WebSocketServerContainerInitializer; +import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer; import org.glassfish.jersey.servlet.ServletContainer; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -51,7 +51,6 @@ import javax.websocket.ContainerProvider; import javax.websocket.Session; import javax.websocket.WebSocketContainer; -import javax.websocket.server.ServerContainer; import javax.websocket.server.ServerEndpointConfig; @TestInstance(TestInstance.Lifecycle.PER_CLASS) @@ -113,17 +112,17 @@ protected final Server setUpServer() throws Exception { graphqlServlet.setInitParameter("javax.ws.rs.Application", TestResourceConfig.class.getName()); // GraphQL subscription endpoint - ServerContainer container = WebSocketServerContainerInitializer.configureContext(servletContextHandler); - - ServerEndpointConfig subscriptionEndpoint = ServerEndpointConfig.Builder - .create(SubscriptionWebSocket.class, "/subscription") - .configurator(SubscriptionWebSocketConfigurator.builder() - .baseUrl("/subscription") - .connectionFactory(new ActiveMQConnectionFactory(EMBEDDED_JMS_URL)) - .sendPingOnSubscribe(true) - .build()) - .build(); - container.addEndpoint(subscriptionEndpoint); + JavaxWebSocketServletContainerInitializer.configure(servletContextHandler, (servletContext, serverContainer) -> + { + serverContainer.addEndpoint(ServerEndpointConfig.Builder + .create(SubscriptionWebSocket.class, "/subscription") + .configurator(SubscriptionWebSocketConfigurator.builder() + .baseUrl("/subscription") + .connectionFactory(new ActiveMQConnectionFactory(EMBEDDED_JMS_URL)) + .sendPingOnSubscribe(true) + .build()) + .build()); + }); log.debug("...Starting Server..."); server.start(); diff --git a/elide-standalone/pom.xml b/elide-standalone/pom.xml index 505fa012e8..cec8577784 100644 --- a/elide-standalone/pom.xml +++ b/elide-standalone/pom.xml @@ -115,6 +115,13 @@ org.eclipse.jetty jetty-server compile + + + + org.eclipse.jetty.toolchain + jetty-servlet-api + + org.eclipse.jetty @@ -180,8 +187,15 @@ org.eclipse.jetty.websocket - websocket-server + websocket-jetty-server ${version.jetty} + + + + org.eclipse.jetty.toolchain + jetty-servlet-api + + @@ -192,8 +206,15 @@ org.eclipse.jetty.websocket - javax-websocket-server-impl + websocket-javax-server ${version.jetty} + + + + org.eclipse.jetty.toolchain + jetty-javax-websocket-api + + @@ -253,7 +274,7 @@ org.eclipse.jetty.websocket - websocket-client + websocket-jetty-client ${version.jetty} test diff --git a/elide-standalone/src/main/java/com/yahoo/elide/standalone/ElideStandalone.java b/elide-standalone/src/main/java/com/yahoo/elide/standalone/ElideStandalone.java index 3c22e7cea6..82d263ddd0 100644 --- a/elide-standalone/src/main/java/com/yahoo/elide/standalone/ElideStandalone.java +++ b/elide-standalone/src/main/java/com/yahoo/elide/standalone/ElideStandalone.java @@ -21,7 +21,7 @@ import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; -import org.eclipse.jetty.websocket.jsr356.server.deploy.WebSocketServerContainerInitializer; +import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer; import org.glassfish.jersey.servlet.ServletContainer; import lombok.extern.slf4j.Slf4j; @@ -29,8 +29,6 @@ import java.util.Map; import java.util.concurrent.Executors; import javax.servlet.DispatcherType; -import javax.websocket.server.ServerContainer; -import javax.websocket.server.ServerEndpointConfig; /** * Elide Standalone. @@ -115,12 +113,10 @@ public void start(boolean block) throws Exception { ElideStandaloneSubscriptionSettings subscriptionSettings = elideStandaloneSettings.getSubscriptionProperties(); if (elideStandaloneSettings.enableGraphQL() && subscriptionSettings.enabled()) { // GraphQL subscription endpoint - ServerContainer container = WebSocketServerContainerInitializer.configureContext(context); + JavaxWebSocketServletContainerInitializer.configure(context, (servletContext, serverContainer) -> { + serverContainer.addEndpoint(subscriptionSettings.serverEndpointConfig(elideStandaloneSettings)); + }); - ServerEndpointConfig subscriptionEndpoint = - subscriptionSettings.serverEndpointConfig(elideStandaloneSettings); - - container.addEndpoint(subscriptionEndpoint); } if (elideStandaloneSettings.getAsyncProperties().enableExport()) { diff --git a/pom.xml b/pom.xml index d31de86480..2c671f0683 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ 4.9.3 - 9.4.46.v20220331 + 10.0.10 1.2.11 5.1.0 2.13.3