From 62b3629dbcc54e51e00db8aa15e8cb9003a1de8c Mon Sep 17 00:00:00 2001 From: Aleksandr Turchenko Date: Fri, 16 Aug 2024 09:54:20 +0400 Subject: [PATCH] Add http2 support for example server --- gradle/libs.versions.toml | 3 ++- sample/build.gradle.kts | 1 + sample/src/main/kotlin/jetty/JettyServer.kt | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index db167b7..a06e021 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -43,8 +43,9 @@ opentelemetry-instrumentation-api = { group = "io.opentelemetry.instrumentation" opentelemetry-semconv = { group = "io.opentelemetry.semconv", name = "opentelemetry-semconv", version.ref = "opentelemetry-semconv" } # Jetty -jetty-server = { group = "org.eclipse.jetty", name = "jetty-server", version.ref = "jetty" } jetty-ee10-servlet = { group = "org.eclipse.jetty.ee10", name = "jetty-ee10-servlet", version.ref = "jetty" } +jetty-server = { group = "org.eclipse.jetty", name = "jetty-server", version.ref = "jetty" } +jetty-server-http2 = { group = "org.eclipse.jetty.http2", name = "jetty-http2-server", version.ref = "jetty" } # Testing mockk = { group = "io.mockk", name = "mockk", version.ref = "mockk" } diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index 6878773..4825136 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -17,6 +17,7 @@ dependencies { // Jetty implementation(libs.jetty.server) + implementation(libs.jetty.server.http2) implementation(libs.jetty.ee10.servlet) // JWT diff --git a/sample/src/main/kotlin/jetty/JettyServer.kt b/sample/src/main/kotlin/jetty/JettyServer.kt index 2a67444..b9a7f24 100644 --- a/sample/src/main/kotlin/jetty/JettyServer.kt +++ b/sample/src/main/kotlin/jetty/JettyServer.kt @@ -3,6 +3,7 @@ package jetty import jakarta.servlet.http.HttpServlet import org.eclipse.jetty.ee10.servlet.ServletContextHandler import org.eclipse.jetty.ee10.servlet.ServletHolder +import org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory import org.eclipse.jetty.server.HttpConfiguration import org.eclipse.jetty.server.HttpConnectionFactory import org.eclipse.jetty.server.Server @@ -28,6 +29,7 @@ class JettyServer( } val http1 = HttpConnectionFactory(config) + val http2 = HTTP2CServerConnectionFactory() val servletHandler = ServletContextHandler(ServletContextHandler.NO_SECURITY + ServletContextHandler.NO_SESSIONS).apply { @@ -41,7 +43,7 @@ class JettyServer( // HTTP addConnector( - ServerConnector(server, http1).apply { + ServerConnector(server, http1, http2).apply { this.port = port } )