Revert "Revert "Bratseth/phrase segmenting feature flag""

This reverts commit c72315a338a02858c8371d3d70fe091c43b672dd.

1 files changed, 5 insertions, 9 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/testutil/DocumentSourceSearcher.java b/container-search/src/main/java/com/yahoo/search/searchchain/testutil/DocumentSourceSearcher.java
index d39a488626b..e346a766738 100644
--- a/container-search/src/main/java/com/yahoo/search/searchchain/testutil/DocumentSourceSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/searchchain/testutil/DocumentSourceSearcher.java
@@ -97,11 +97,10 @@ public class DocumentSourceSearcher extends Searcher {
     public Result search(Query query, Execution execution)  {
         queryCount++;
         Result r = unFilledResults.get(getQueryKeyClone(query));
-        if (r == null) {
+        if (r == null)
             r = defaultFilledResult.clone();
-        } else {
+        else
             r = r.clone();
-        }
 
         r.setQuery(query);
         r.hits().trim(query.getOffset(), query.getHits());
@@ -182,11 +181,8 @@ public class DocumentSourceSearcher extends Searcher {
      * reset. For testing - not reliable if multiple threads makes
      * queries simultaneously
      */
-    public int getQueryCount() {
-        return queryCount;
-    }
+    public int getQueryCount() { return queryCount; }
+
+    public void resetQueryCount() { queryCount = 0; }
 
-    public void resetQueryCount() {
-        queryCount=0;
-    }
 }