From cdeb661adda84714f83ce071286ac24be27ae1cb Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@verizonmedia.com>
Date: Mon, 2 Mar 2020 11:57:12 +0100
Subject: Revert "Merge pull request #12385 from
 vespa-engine/revert-12365-bratseth/phrase-segmenting-off"

This reverts commit 6c52f21816ce79909feac4908d594204ad2fd4e7, reversing
changes made to 9ac4f3d18e1dbb11678b8d61fa50c9ad1cdf61d2.
---
 .../searchchain/testutil/DocumentSourceSearcher.java       | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'container-search/src/main/java/com/yahoo/search/searchchain/testutil/DocumentSourceSearcher.java')

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;
-    }
 }
-- 
cgit v1.2.3