Revert "Remove the IndexCombinatorSearcher"

1 files changed, 7 insertions, 8 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/model/VespaSearchers.java b/container-search/src/main/java/com/yahoo/search/searchchain/model/VespaSearchers.java
index 65bfcbe577c..fe3d48ccded 100644
--- a/container-search/src/main/java/com/yahoo/search/searchchain/model/VespaSearchers.java
+++ b/container-search/src/main/java/com/yahoo/search/searchchain/model/VespaSearchers.java
@@ -9,13 +9,10 @@ import com.yahoo.component.chain.model.ChainedComponentModel;
 import com.yahoo.search.Searcher;
 import com.yahoo.search.searchchain.model.federation.FederationSearcherModel;
 import com.yahoo.search.searchchain.model.federation.FederationSearcherModel.TargetSpec;
+import org.apache.commons.collections.CollectionUtils;
+
+import java.util.*;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
 
 /**
  * Defines the searcher models used in the vespa and native search chains, except for federation.
@@ -26,6 +23,8 @@ import java.util.Set;
 public class VespaSearchers {
     public static final Collection<ChainedComponentModel> vespaSearcherModels =
             toSearcherModels(
+                    com.yahoo.prelude.querytransform.IndexCombinatorSearcher.class,
+                    //com.yahoo.prelude.querytransform.LocalitySearcher.class,
                     com.yahoo.prelude.querytransform.PhrasingSearcher.class,
                     com.yahoo.prelude.searcher.FieldCollapsingSearcher.class,
                     com.yahoo.search.yql.MinimalQueryInserter.class,
@@ -60,8 +59,8 @@ public class VespaSearchers {
 
     private static FederationSearcherModel federationSearcherModel() {
         return new FederationSearcherModel(new ComponentSpecification("federation"),
-                                           Dependencies.emptyDependencies(),
-                                           Collections.<TargetSpec>emptyList(), true);
+                Dependencies.emptyDependencies(),
+                Collections.<TargetSpec>emptyList(), true);
     }
 
     private static boolean allAdded(Collection<ChainedComponentModel> searcherModels, Set<ComponentId> componentIds) {