diff options
author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2022-10-07 15:06:18 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2022-10-07 15:22:00 +0200 |
commit | dc7cf9d7f792fd4f80bd2c3fd8cbf7b1f70561b4 (patch) | |
tree | ccdbeadf9bb9c4f4e168fac71bd041392ec38eff /container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java | |
parent | ea880e5a8b25e10b3b72e1a4068a92d54d986ca5 (diff) |
Simplify handler
Diffstat (limited to 'container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java')
-rw-r--r-- | container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java index c0b3a336a39..965575f8b30 100644 --- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java +++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java @@ -133,7 +133,6 @@ public class JettyHttpServer extends AbstractServerProvider { private HandlerCollection createRootHandler( ServerConfig serverCfg, List<JDiscServerConnector> connectors, ServletHolder jdiscServlet) { - List<ConnectorConfig> connectorCfgs = connectors.stream().map(JDiscServerConnector::connectorConfig).toList(); List<ContextHandler> perConnectorHandlers = new ArrayList<>(); for (JDiscServerConnector connector : connectors) { ConnectorConfig connectorCfg = connector.connectorConfig(); @@ -142,7 +141,7 @@ public class JettyHttpServer extends AbstractServerProvider { chain.add(newResponseStatisticsHandler(serverCfg)); chain.add(newGzipHandler(serverCfg)); if (connectorCfg.tlsClientAuthEnforcer().enable()) { - chain.add(newTlsClientAuthEnforcerHandler(connectorCfgs)); + chain.add(newTlsClientAuthEnforcerHandler(connectorCfg)); } if (connectorCfg.healthCheckProxy().enable()) { chain.add(newHealthCheckProxyHandler(connectors)); @@ -246,8 +245,8 @@ public class JettyHttpServer extends AbstractServerProvider { return new HealthCheckProxyHandler(connectors); } - private static TlsClientAuthenticationEnforcer newTlsClientAuthEnforcerHandler(List<ConnectorConfig> connectorCfgs) { - return new TlsClientAuthenticationEnforcer(connectorCfgs); + private static TlsClientAuthenticationEnforcer newTlsClientAuthEnforcerHandler(ConnectorConfig cfg) { + return new TlsClientAuthenticationEnforcer(cfg.tlsClientAuthEnforcer()); } private static HttpResponseStatisticsCollector newResponseStatisticsHandler(ServerConfig cfg) { |