Reapply "Remove Servlet integration from container-core [run-systemtest]""

1 files changed, 2 insertions, 29 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 3f2a91c60b5..fca34f3bbd7 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
@@ -2,14 +2,12 @@
 package com.yahoo.jdisc.http.server.jetty;
 
 import com.google.inject.Inject;
-import com.yahoo.component.ComponentId;
 import com.yahoo.component.provider.ComponentRegistry;
 import com.yahoo.container.logging.ConnectionLog;
 import com.yahoo.container.logging.RequestLog;
 import com.yahoo.jdisc.Metric;
 import com.yahoo.jdisc.http.ConnectorConfig;
 import com.yahoo.jdisc.http.ServerConfig;
-import com.yahoo.jdisc.http.ServletPathsConfig;
 import com.yahoo.jdisc.service.AbstractServerProvider;
 import com.yahoo.jdisc.service.CurrentContainer;
 import org.eclipse.jetty.http.HttpField;
@@ -24,7 +22,6 @@ import org.eclipse.jetty.server.handler.HandlerCollection;
 import org.eclipse.jetty.server.handler.StatisticsHandler;
 import org.eclipse.jetty.server.handler.gzip.GzipHandler;
 import org.eclipse.jetty.server.handler.gzip.GzipHttpOutputInterceptor;
-import org.eclipse.jetty.servlet.FilterHolder;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jetty.util.log.JavaUtilLog;
@@ -32,14 +29,12 @@ import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
 
 import javax.management.remote.JMXServiceURL;
-import javax.servlet.DispatcherType;
 import java.io.IOException;
 import java.lang.management.ManagementFactory;
 import java.net.BindException;
 import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.EnumSet;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -63,12 +58,9 @@ public class JettyHttpServer extends AbstractServerProvider {
     public JettyHttpServer(CurrentContainer container,
                            Metric metric,
                            ServerConfig serverConfig,
-                           ServletPathsConfig servletPathsConfig,
                            FilterBindings filterBindings,
                            Janitor janitor,
                            ComponentRegistry<ConnectorFactory> connectorFactories,
-                           ComponentRegistry<ServletHolder> servletHolders,
-                           FilterInvoker filterInvoker,
                            RequestLog requestLog,
                            ConnectionLog connectionLog) {
         super(container);
@@ -98,18 +90,13 @@ public class JettyHttpServer extends AbstractServerProvider {
                                                      serverConfig);
 
         ServletHolder jdiscServlet = new ServletHolder(new JDiscHttpServlet(jDiscContext));
-        FilterHolder jDiscFilterInvokerFilter = new FilterHolder(new JDiscFilterInvokerFilter(jDiscContext, filterInvoker));
-
         List<JDiscServerConnector> connectors = Arrays.stream(server.getConnectors())
                                                       .map(JDiscServerConnector.class::cast)
                                                       .collect(toList());
 
         server.setHandler(getHandlerCollection(serverConfig,
-                                               servletPathsConfig,
                                                connectors,
-                                               jdiscServlet,
-                                               servletHolders,
-                                               jDiscFilterInvokerFilter));
+                                               jdiscServlet));
         this.metricsReporter = new ServerMetricReporter(metric, server);
     }
 
@@ -150,19 +137,9 @@ public class JettyHttpServer extends AbstractServerProvider {
     }
 
     private HandlerCollection getHandlerCollection(ServerConfig serverConfig,
-                                                   ServletPathsConfig servletPathsConfig,
                                                    List<JDiscServerConnector> connectors,
-                                                   ServletHolder jdiscServlet,
-                                                   ComponentRegistry<ServletHolder> servletHolders,
-                                                   FilterHolder jDiscFilterInvokerFilter) {
+                                                   ServletHolder jdiscServlet) {
         ServletContextHandler servletContextHandler = createServletContextHandler();
-
-        servletHolders.allComponentsById().forEach((id, servlet) -> {
-            String path = getServletPath(servletPathsConfig, id);
-            servletContextHandler.addServlet(servlet, path);
-            servletContextHandler.addFilter(jDiscFilterInvokerFilter, path, EnumSet.allOf(DispatcherType.class));
-        });
-
         servletContextHandler.addServlet(jdiscServlet, "/*");
 
         List<ConnectorConfig> connectorConfigs = connectors.stream().map(JDiscServerConnector::connectorConfig).collect(toList());
@@ -191,10 +168,6 @@ public class JettyHttpServer extends AbstractServerProvider {
         return handlerCollection;
     }
 
-    private static String getServletPath(ServletPathsConfig servletPathsConfig, ComponentId id) {
-        return "/" + servletPathsConfig.servlets(id.stringValue()).path();
-    }
-
     private ServletContextHandler createServletContextHandler() {
         ServletContextHandler servletContextHandler = new ServletContextHandler(ServletContextHandler.NO_SECURITY | ServletContextHandler.NO_SESSIONS);
         servletContextHandler.setContextPath("/");