diff options
author | gjoranv <gv@verizonmedia.com> | 2021-03-23 20:22:22 +0100 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2021-03-23 22:58:13 +0100 |
commit | bee5245ef2ed520a449b514750314e36ac39ffec (patch) | |
tree | 568230fc69ff334c846c2e3d9be9a343f121f9bf /config-model/src/main/java/com/yahoo/vespa/model/container/http/JettyHttpServer.java | |
parent | ba7050936f25f26deb247cdbb1defabbf7d9acee (diff) |
Update all component specs to use the container-disc bundle
.. instead of jdisc_http_service.
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa/model/container/http/JettyHttpServer.java')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/http/JettyHttpServer.java | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/JettyHttpServer.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/JettyHttpServer.java index 674d2ce3325..f36a1448d5c 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/JettyHttpServer.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/JettyHttpServer.java @@ -26,15 +26,11 @@ public class JettyHttpServer extends SimpleComponent implements ServerConfig.Pro private volatile boolean isHostedVespa; private final List<ConnectorFactory> connectorFactories = new ArrayList<>(); - public JettyHttpServer(ComponentId id, ContainerCluster<?> cluster, boolean isHostedVespa) { - super(new ComponentModel( - new BundleInstantiationSpecification(id, - fromString("com.yahoo.jdisc.http.server.jetty.JettyHttpServer"), - fromString("jdisc_http_service")) - )); + public JettyHttpServer(String componentId, ContainerCluster<?> cluster, boolean isHostedVespa) { + super(new ComponentModel(componentId, com.yahoo.jdisc.http.server.jetty.JettyHttpServer.class.getName(),null)); this.isHostedVespa = isHostedVespa; this.cluster = cluster; - final FilterBindingsProviderComponent filterBindingsProviderComponent = new FilterBindingsProviderComponent(id); + final FilterBindingsProviderComponent filterBindingsProviderComponent = new FilterBindingsProviderComponent(componentId); addChild(filterBindingsProviderComponent); inject(filterBindingsProviderComponent); } @@ -89,17 +85,17 @@ public class JettyHttpServer extends SimpleComponent implements ServerConfig.Pro } } - static ComponentModel providerComponentModel(final ComponentId parentId, String className) { + static ComponentModel providerComponentModel(String parentId, String className) { final ComponentSpecification classNameSpec = new ComponentSpecification( className); return new ComponentModel(new BundleInstantiationSpecification( - classNameSpec.nestInNamespace(parentId), + classNameSpec.nestInNamespace(new ComponentId(parentId)), classNameSpec, null)); } public static final class FilterBindingsProviderComponent extends SimpleComponent { - public FilterBindingsProviderComponent(final ComponentId parentId) { + public FilterBindingsProviderComponent(String parentId) { super(providerComponentModel(parentId, "com.yahoo.container.jdisc.FilterBindingsProvider")); } |