Make QueryTree.and public

- Make QueryTree.and public as it handles more cases than most alternatives
- Implement QueryTreeUtils methodas by calling QueryTree.and
- Deprecate QueryTreeUtils

2 files changed, 5 insertions, 5 deletions

diff --git a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/FieldMatchMetrics.java b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/FieldMatchMetrics.java
index d880294660e..200e4fbe856 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/FieldMatchMetrics.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/FieldMatchMetrics.java
@@ -19,9 +19,9 @@ public final class FieldMatchMetrics implements Cloneable {
     private FieldMatchMetricsComputer source;
 
     /** The trace accumulated during execution - empty if no tracing */
-    private final Trace trace=new Trace();
+    private final Trace trace = new Trace();
 
-    private boolean complete=false;
+    private boolean complete;
 
     // Metrics
     private int outOfOrder;
@@ -352,7 +352,7 @@ public final class FieldMatchMetrics implements Cloneable {
      * </p>
      *
      *
-     * <p>Weight and significance are not taken into account because this is mean to capture tha quality of the
+     * <p>Weight and significance are not taken into account because this is meant to capture tha quality of the
      * match in this field, while those measures relate this match to matches in other fields. This number
      * can be multiplied with those values when combining with other field match scores.</p>
      */
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/FieldMatchMetricsComputer.java b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/FieldMatchMetricsComputer.java
index 79886449d0a..f981ad464ec 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/FieldMatchMetricsComputer.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/FieldMatchMetricsComputer.java
@@ -136,7 +136,7 @@ public final class FieldMatchMetricsComputer {
 
         // Explore segmentations
         while (segmentStartPoint!=null) {
-            metrics =segmentStartPoint.getMetrics().clone();
+            metrics = segmentStartPoint.getMetrics().clone();
             if (collectTrace)
                 metrics.trace().add("\nLooking for segment from " + segmentStartPoint + "..." + "\n");
             boolean found=findAlternativeSegmentFrom(segmentStartPoint);
@@ -148,7 +148,7 @@ public final class FieldMatchMetricsComputer {
             segmentStartPoint=findOpenSegment(segmentStartPoint.getI());
         }
 
-        metrics=findLastStartPoint().getMetrics(); // these metrics are the final set
+        metrics = findLastStartPoint().getMetrics(); // these metrics are the final set
         setOccurrenceCounts(metrics);
         metrics.onComplete();
         metrics.setComplete(true);