Deliver search chains config to ExecutionFactory

4 files changed, 7 insertions, 6 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
index 23083bc6176..47adac637ee 100755
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
@@ -504,7 +504,7 @@ public abstract class ContainerCluster<CONTAINER extends Container>
 
     @Override
     public void getConfig(QrSearchersConfig.Builder builder) {
-        if (containerSearch!=null) containerSearch.getConfig(builder);
+        if (containerSearch != null) containerSearch.getConfig(builder);
     }
 
     @Override
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/chain/Chains.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/chain/Chains.java
index 0fc5c38c3b3..e6c73773840 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/chain/Chains.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/chain/Chains.java
@@ -13,6 +13,7 @@ import java.util.Set;
 
 /**
  * Root config producer the whole chains model(contains chains and components).
+ *
  * @author Tony Vaagenes
  * @author gjoranv
  */
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/chain/ProcessingHandler.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/chain/ProcessingHandler.java
index 52bb7b91781..da87d48b13e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/chain/ProcessingHandler.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/chain/ProcessingHandler.java
@@ -12,7 +12,6 @@ import com.yahoo.vespa.model.container.component.Handler;
  * Represents a handler for processing chains.
  *
  * @author gjoranv
- * @since 5.1.7
  */
 public class ProcessingHandler<CHAINS extends Chains<?>>
         extends Handler<AbstractConfigProducer<?>>
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 56edec066da..b7c96d63755 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
@@ -724,11 +724,12 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
     }
 
     private void addSearchHandler(ApplicationContainerCluster cluster, Element searchElement) {
-        cluster.addSimpleComponent("com.yahoo.search.searchchain.ExecutionFactory", null, null);
-
-        ProcessingHandler<SearchChains> searchHandler = new ProcessingHandler<>(
-                cluster.getSearch().getChains(), "com.yahoo.search.handler.SearchHandler");
+        // Magic spell is needed to receive the chains config :-|
+        cluster.addComponent(new ProcessingHandler<>(cluster.getSearch().getChains(),
+                                                     "com.yahoo.search.searchchain.ExecutionFactory"));
 
+        ProcessingHandler<SearchChains> searchHandler = new ProcessingHandler<>(cluster.getSearch().getChains(),
+                                                                                "com.yahoo.search.handler.SearchHandler");
         String[] defaultBindings = {"http://*/search/*"};
         for (String binding: serverBindings(searchElement, defaultBindings)) {
             searchHandler.addServerBindings(binding);