Remove 'SslContextFactoryProvider'

3 files changed, 0 insertions, 42 deletions

diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java
index 7060a23111b..cb027da821a 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java
@@ -5,7 +5,6 @@ import com.google.inject.Inject;
 import com.yahoo.jdisc.Metric;
 import com.yahoo.jdisc.http.ConnectorConfig;
 import com.yahoo.jdisc.http.SslProvider;
-import com.yahoo.jdisc.http.ssl.SslContextFactoryProvider;
 import com.yahoo.jdisc.http.ssl.impl.DefaultConnectorSsl;
 import com.yahoo.security.tls.MixedMode;
 import com.yahoo.security.tls.TransportSecurityUtils;
@@ -187,7 +186,6 @@ public class ConnectorFactory {
         return connectionFactory;
     }
 
-    @SuppressWarnings("removal")
     private SslContextFactory createSslContextFactory() {
         DefaultConnectorSsl ssl = new DefaultConnectorSsl();
         sslProvider.configureSsl(ssl, connectorConfig.name(), connectorConfig.listenPort());
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/ssl/SslContextFactoryProvider.java b/container-core/src/main/java/com/yahoo/jdisc/http/ssl/SslContextFactoryProvider.java
deleted file mode 100644
index e786074e8d0..00000000000
--- a/container-core/src/main/java/com/yahoo/jdisc/http/ssl/SslContextFactoryProvider.java
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.jdisc.http.ssl;
-
-import com.yahoo.jdisc.http.SslProvider;
-import org.eclipse.jetty.util.ssl.SslContextFactory;
-
-/**
- * A provider that is used to configure SSL connectors in JDisc
- *
- * @deprecated Implement {@link SslProvider} instead
- * @author bjorncs
- */
-@Deprecated(forRemoval = true, since = "7")
-public interface SslContextFactoryProvider extends AutoCloseable, SslProvider {
-
-    /**
-     * This method is called once for each SSL connector.
-     *
-     * @return returns an instance of {@link SslContextFactory} for a given JDisc http server
-     */
-    SslContextFactory getInstance(String containerId, int port);
-
-    @Override default void close() {}
-
-    @Override
-    default void configureSsl(ConnectorSsl ssl, String name, int port) {
-        // Signal that getInstance() should be invoked instead
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/ssl/package-info.java b/container-core/src/main/java/com/yahoo/jdisc/http/ssl/package-info.java
deleted file mode 100644
index 2e0f2d8e19c..00000000000
--- a/container-core/src/main/java/com/yahoo/jdisc/http/ssl/package-info.java
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-/**
- * @author bjorncs
- */
-@PublicApi
-@ExportPackage
-package com.yahoo.jdisc.http.ssl;
-
-import com.yahoo.api.annotations.PublicApi;
-import com.yahoo.osgi.annotation.ExportPackage;