From edaf4365b0736c4fb57c359f8cd12c149a76e343 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Wed, 4 Mar 2020 17:04:28 +0100 Subject: Replace deprecated OptionalSslConnectionFactory with DetectorConnectionFactory --- .../java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java index 628a5dc4cb8..3b4475dd11a 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java @@ -8,9 +8,9 @@ import com.yahoo.jdisc.http.ssl.SslContextFactoryProvider; import com.yahoo.security.tls.TransportSecurityUtils; import org.eclipse.jetty.http.HttpVersion; import org.eclipse.jetty.server.ConnectionFactory; +import org.eclipse.jetty.server.DetectorConnectionFactory; import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpConnectionFactory; -import org.eclipse.jetty.server.OptionalSslConnectionFactory; import org.eclipse.jetty.server.SecureRequestCustomizer; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; @@ -62,7 +62,7 @@ public class ConnectorFactory { switch (TransportSecurityUtils.getInsecureMixedMode()) { case TLS_CLIENT_MIXED_SERVER: case PLAINTEXT_CLIENT_MIXED_SERVER: - return List.of(newOptionalSslConnectionFactory(sslConnectionsFactory), sslConnectionsFactory, httpConnectionFactory); + return List.of(new DetectorConnectionFactory(sslConnectionsFactory), httpConnectionFactory); case DISABLED: return List.of(sslConnectionsFactory, httpConnectionFactory); default: @@ -95,9 +95,4 @@ public class ConnectorFactory { return connectionFactory; } - @SuppressWarnings("deprecation") - private OptionalSslConnectionFactory newOptionalSslConnectionFactory(SslConnectionFactory sslConnectionsFactory) { - return new OptionalSslConnectionFactory(sslConnectionsFactory, HttpVersion.HTTP_1_1.asString()); - } - } -- cgit v1.2.3