diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-03-04 17:04:28 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-03-05 13:27:27 +0100 |
commit | edaf4365b0736c4fb57c359f8cd12c149a76e343 (patch) | |
tree | b196c75f1cb784c2fd536f3d5eaec4c4af9a6111 /jdisc_http_service | |
parent | 77ec4f2f04c3757de746e981e34e0f2b02cb5bd0 (diff) |
Replace deprecated OptionalSslConnectionFactory with DetectorConnectionFactory
Diffstat (limited to 'jdisc_http_service')
-rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java | 9 |
1 files 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()); - } - } |