1 files changed, 0 insertions, 104 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 54338c64c1e..a223ecd340d 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
@@ -10,31 +10,22 @@ import com.yahoo.jdisc.http.ConnectorConfig.Ssl.PemKeyStore;
 import com.yahoo.jdisc.http.SecretStore;
 import com.yahoo.jdisc.http.ssl.pem.PemSslKeyStore;
 import org.eclipse.jetty.http.HttpVersion;
-import org.eclipse.jetty.server.ConnectionFactory;
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.SecureRequestCustomizer;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.ServerConnectionStatistics;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.SslConnectionFactory;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 
-import javax.servlet.ServletRequest;
 import java.io.IOException;
 import java.io.UncheckedIOException;
-import java.lang.reflect.Field;
-import java.net.Socket;
-import java.net.SocketException;
 import java.nio.channels.ServerSocketChannel;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.security.KeyStore;
-import java.util.Map;
 import java.util.Optional;
-import java.util.TreeMap;
 import java.util.function.Supplier;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import static com.yahoo.jdisc.http.ConnectorConfig.Ssl.KeyStoreType.Enum.JKS;
@@ -215,99 +206,4 @@ public class ConnectorFactory {
         }
     }
 
-    public static class JDiscServerConnector extends ServerConnector {
-        public static final String REQUEST_ATTRIBUTE = JDiscServerConnector.class.getName();
-        private final static Logger log = Logger.getLogger(JDiscServerConnector.class.getName());
-        private final Metric.Context metricCtx;
-        private final ServerConnectionStatistics statistics;
-        private final boolean tcpKeepAlive;
-        private final boolean tcpNoDelay;
-        private final ServerSocketChannel channelOpenedByActivator;
-
-        private JDiscServerConnector(ConnectorConfig config, Metric metric, Server server, 
-                                     ServerSocketChannel channelOpenedByActivator, ConnectionFactory... factories) {
-            super(server, factories);
-            this.channelOpenedByActivator = channelOpenedByActivator;
-            this.tcpKeepAlive = config.tcpKeepAliveEnabled();
-            this.tcpNoDelay = config.tcpNoDelay();
-            this.metricCtx = createMetricContext(config, metric);
-
-            this.statistics = new ServerConnectionStatistics();
-            addBean(statistics);
-        }
-
-        private Metric.Context createMetricContext(ConnectorConfig config, Metric metric) {
-            Map<String, Object> props = new TreeMap<>();
-            props.put(JettyHttpServer.Metrics.NAME_DIMENSION, config.name());
-            props.put(JettyHttpServer.Metrics.PORT_DIMENSION, config.listenPort());
-            return metric.createContext(props);
-        }
-
-        @Override
-        protected void configure(final Socket socket) {
-            super.configure(socket);
-            try {
-                socket.setKeepAlive(tcpKeepAlive);
-                socket.setTcpNoDelay(tcpNoDelay);
-            } catch (SocketException ignored) {
-            }
-        }
-
-        @Override
-        public void open() throws IOException {
-            if (channelOpenedByActivator == null) {
-                log.log(Level.INFO, "No channel set by activator, opening channel ourselves.");
-                try {
-                    super.open();
-                } catch (RuntimeException e) {
-                    log.log(Level.SEVERE, "failed org.eclipse.jetty.server.Server open() with port "+getPort());
-                    throw e;
-                }
-                return;
-            }
-            log.log(Level.INFO, "Using channel set by activator: " + channelOpenedByActivator);
-
-            channelOpenedByActivator.socket().setReuseAddress(getReuseAddress());
-            int localPort = channelOpenedByActivator.socket().getLocalPort();
-            try {
-                uglySetLocalPort(localPort);
-            } catch (NoSuchFieldException | IllegalAccessException e) {
-                throw new RuntimeException("Could not set local port.", e);
-            }
-            if (localPort <= 0) {
-                throw new IOException("Server channel not bound");
-            }
-            addBean(channelOpenedByActivator);
-            channelOpenedByActivator.configureBlocking(true);
-            addBean(channelOpenedByActivator);
-
-            try {
-                uglySetChannel(channelOpenedByActivator);
-            } catch (NoSuchFieldException | IllegalAccessException e) {
-                throw new RuntimeException("Could not set server channel.", e);
-            }
-        }
-
-        private void uglySetLocalPort(int localPort) throws NoSuchFieldException, IllegalAccessException {
-            Field localPortField = ServerConnector.class.getDeclaredField("_localPort");
-            localPortField.setAccessible(true);
-            localPortField.set(this, localPort);
-        }
-
-        private void uglySetChannel(ServerSocketChannel channelOpenedByActivator) throws NoSuchFieldException, 
-                                                                                         IllegalAccessException {
-            Field acceptChannelField = ServerConnector.class.getDeclaredField("_acceptChannel");
-            acceptChannelField.setAccessible(true);
-            acceptChannelField.set(this, channelOpenedByActivator);
-        }
-
-        public ServerConnectionStatistics getStatistics() { return statistics; }
-
-        public Metric.Context getMetricContext() { return metricCtx; }
-
-        public static JDiscServerConnector fromRequest(ServletRequest request) {
-            return (JDiscServerConnector)request.getAttribute(REQUEST_ATTRIBUTE);
-        }
-    }
-
 }