diff options
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/http/ConnectorFactory.java | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/LegacySslProvider.java (renamed from config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/DummySslProvider.java) | 16 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyConnectorBuilder.java | 5 |
3 files changed, 13 insertions, 12 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/ConnectorFactory.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/ConnectorFactory.java index 1365eb43a30..73ea61021f1 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/ConnectorFactory.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/ConnectorFactory.java @@ -7,7 +7,7 @@ import com.yahoo.jdisc.http.ConnectorConfig; import com.yahoo.osgi.provider.model.ComponentModel; import com.yahoo.text.XML; import com.yahoo.vespa.model.container.component.SimpleComponent; -import com.yahoo.vespa.model.container.http.ssl.DummySslProvider; +import com.yahoo.vespa.model.container.http.ssl.LegacySslProvider; import org.w3c.dom.Element; import static com.yahoo.component.ComponentSpecification.fromString; @@ -25,7 +25,7 @@ public class ConnectorFactory extends SimpleComponent implements ConnectorConfig private final Element legacyConfig; public ConnectorFactory(String name, int listenPort) { - this(name, listenPort, null, new DummySslProvider(name)); + this(name, listenPort, null, new LegacySslProvider(name)); } public ConnectorFactory(String name, diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/DummySslProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/LegacySslProvider.java index c87467ed4c5..fedc8c4a843 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/DummySslProvider.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/LegacySslProvider.java @@ -5,24 +5,24 @@ import com.yahoo.component.ComponentId; import com.yahoo.container.bundle.BundleInstantiationSpecification; import com.yahoo.jdisc.http.ConnectorConfig; import com.yahoo.jdisc.http.ssl.SslContextFactoryProvider; -import com.yahoo.jdisc.http.ssl.ThrowingSslContextFactoryProvider; +import com.yahoo.jdisc.http.ssl.LegacySslContextFactoryProvider; import com.yahoo.osgi.provider.model.ComponentModel; import com.yahoo.vespa.model.container.component.SimpleComponent; import static com.yahoo.component.ComponentSpecification.fromString; /** - * Provides a dummy implementation of {@link SslContextFactoryProvider} to be injected into non-ssl connectors + * Provides a legacy implementation of {@link SslContextFactoryProvider} to be injected into non-ssl connectors and connectors using legacy ssl config override * * @author bjorncs */ -public class DummySslProvider extends SimpleComponent implements ConnectorConfig.Producer { +public class LegacySslProvider extends SimpleComponent implements ConnectorConfig.Producer { - public static final String COMPONENT_ID_PREFIX = "dummy-ssl-provider@"; - public static final String COMPONENT_CLASS = ThrowingSslContextFactoryProvider.class.getName(); + public static final String COMPONENT_ID_PREFIX = "legacy-ssl-provider@"; + public static final String COMPONENT_CLASS = LegacySslContextFactoryProvider.class.getName(); public static final String COMPONENT_BUNDLE = "jdisc_http_service"; - public DummySslProvider(String serverName) { + public LegacySslProvider(String serverName) { super(new ComponentModel( new BundleInstantiationSpecification(new ComponentId(COMPONENT_ID_PREFIX + serverName), fromString(COMPONENT_CLASS), @@ -30,5 +30,7 @@ public class DummySslProvider extends SimpleComponent implements ConnectorConfig } @Override - public void getConfig(ConnectorConfig.Builder builder) {} + public void getConfig(ConnectorConfig.Builder builder) { + + } } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyConnectorBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyConnectorBuilder.java index 91cf25002e6..36736d66195 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyConnectorBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/JettyConnectorBuilder.java @@ -9,7 +9,7 @@ import com.yahoo.vespa.model.container.component.SimpleComponent; import com.yahoo.vespa.model.container.http.ConnectorFactory; import com.yahoo.vespa.model.container.http.ssl.CustomSslProvider; import com.yahoo.vespa.model.container.http.ssl.DefaultSslProvider; -import com.yahoo.vespa.model.container.http.ssl.DummySslProvider; +import com.yahoo.vespa.model.container.http.ssl.LegacySslProvider; import org.w3c.dom.Element; import java.util.Optional; @@ -62,8 +62,7 @@ public class JettyConnectorBuilder extends VespaDomBuilder.DomConfigProducerBuil String bundle = sslProviderConfigurator.getAttribute("bundle"); return new CustomSslProvider(serverName, className, bundle); } else { - // No ssl config.. - return new DummySslProvider(serverName); + return new LegacySslProvider(serverName); } } } |