diff options
author | Henrik <henrik.hoiness@online.no> | 2018-07-10 13:35:26 +0200 |
---|---|---|
committer | Henrik <henrik.hoiness@online.no> | 2018-07-10 13:35:26 +0200 |
commit | 0d73cf90a7c5b1b3d7dc2fa608220ca33a0f8b2b (patch) | |
tree | a1e80d574f1c9e4961f213d1bfe90a0501e7c301 /config-model | |
parent | 31fe2cf8b57ef07301b931c8df666d20699ef95d (diff) |
Changed pom.xml and adding of handler in ContainerModelBuilder
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java index 90154bed64a..9e129044a7a 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java @@ -23,6 +23,7 @@ import com.yahoo.config.provision.NodeType; import com.yahoo.config.provision.Rotation; import com.yahoo.config.provision.Zone; import com.yahoo.container.jdisc.config.MetricDefaultsConfig; +import com.yahoo.osgi.provider.model.ComponentModel; import com.yahoo.search.rendering.RendererRegistry; import com.yahoo.text.XML; import com.yahoo.vespa.defaults.Defaults; @@ -47,6 +48,7 @@ import com.yahoo.vespa.model.container.IdentityProvider; import com.yahoo.vespa.model.container.SecretStore; import com.yahoo.vespa.model.container.component.Component; import com.yahoo.vespa.model.container.component.FileStatusHandlerComponent; +import com.yahoo.vespa.model.container.component.Handler; import com.yahoo.vespa.model.container.component.chain.ProcessingHandler; import com.yahoo.vespa.model.container.docproc.ContainerDocproc; import com.yahoo.vespa.model.container.docproc.DocprocChains; @@ -378,6 +380,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { cluster.setSearch(buildSearch(cluster, searchElement, queryProfiles, semanticRules)); addSearchHandler(cluster, searchElement); + addGUIHandler(cluster); validateAndAddConfiguredComponents(cluster, searchElement, "renderer", ContainerModelBuilder::validateRendererElement); } } @@ -668,20 +671,16 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { } cluster.addComponent(searchHandler); - addGUIHandler(cluster, searchElement); } - private void addGUIHandler(ContainerCluster cluster, Element searchElement) { - ProcessingHandler<SearchChains> guiHandler = new ProcessingHandler<>( - cluster.getSearch().getChains(), "com.yahoo.search.query.gui.GUIHandler"); + private void addGUIHandler(ContainerCluster cluster) { + Handler<?> guiHandler = Handler.fromClassName("com.yahoo.search.query.gui.GUIHandler"); - String[] defaultBindings = {"http://*/querybuilder/*", "https://*/querybuilder/*"}; - for (String binding: serverBindings(searchElement, defaultBindings)) { - guiHandler.addServerBindings(binding); - } + guiHandler.addServerBindings("http://*/querybuilder/*", "https://*/querybuilder/*"); cluster.addComponent(guiHandler); } + private String[] serverBindings(Element searchElement, String... defaultBindings) { List<Element> bindings = XML.getChildren(searchElement, "binding"); if (bindings.isEmpty()) |