Remove duplicate tracing of dependencies

4 files changed, 12 insertions, 16 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/query/InItem.java b/container-search/src/main/java/com/yahoo/prelude/query/InItem.java
index 27213000e3a..25abf465199 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/InItem.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/InItem.java
@@ -5,13 +5,15 @@ import java.util.Objects;
 
 import static java.util.Objects.requireNonNullElse;
 
-/*
+/**
  * Abstract class representing an IN operator.
  *
  * @author toregge
  */
 public abstract class InItem extends Item {
+
     private String indexName;
+
     public InItem(String indexName) {
         this.indexName = requireNonNullElse(indexName, "");
     }
@@ -20,6 +22,7 @@ public abstract class InItem extends Item {
     public void setIndexName(String index) {
         this.indexName = requireNonNullElse(index, "");
     }
+
     public String getIndexName() {
         return indexName;
     }
@@ -43,4 +46,4 @@ public abstract class InItem extends Item {
         return Objects.hash(super.hashCode(), indexName);
     }
 
-};
+}
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/NumericInItem.java b/container-search/src/main/java/com/yahoo/prelude/query/NumericInItem.java
index 9333173d898..f6c7010b725 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/NumericInItem.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/NumericInItem.java
@@ -2,6 +2,7 @@
 package com.yahoo.prelude.query;
 
 import com.yahoo.compress.IntegerCompressor;
+import com.yahoo.prelude.query.textualrepresentation.Discloser;
 
 import java.nio.ByteBuffer;
 import java.util.Collection;
@@ -9,14 +10,15 @@ import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 
-/*
+/**
  * Class representing an IN operator with a set of 64-bit
  * integer values.
  *
  * @author toregge
  */
 public class NumericInItem extends InItem {
-    private Set<Long> tokens;
+
+    private final Set<Long> tokens;
 
     public NumericInItem(String indexName) {
         super(indexName);
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/StringInItem.java b/container-search/src/main/java/com/yahoo/prelude/query/StringInItem.java
index 4473010082e..6f41a6a44ee 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/StringInItem.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/StringInItem.java
@@ -9,13 +9,14 @@ import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 
-/*
+/**
  * Class representing an IN operator with a set of string values.
  *
  * @author toregge
  */
 public class StringInItem extends InItem {
-    private Set<String> tokens;
+
+    private final Set<String> tokens;
 
     public StringInItem(String indexName) {
         super(indexName);
diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java b/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java
index 6eb69c76afd..08526ecbaef 100644
--- a/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java
+++ b/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java
@@ -499,16 +499,6 @@ public class Execution extends com.yahoo.processing.execution.Execution {
         return (Result)super.process(query);
     }
 
-    @Override
-    protected void onInvoking(Request request, Processor processor) {
-        super.onInvoking(request,processor);
-        final int traceDependencies = 6;
-        Query query = (Query) request;
-        if (query.getTrace().getLevel() >= traceDependencies) {
-            query.trace(processor.getId() + " " + processor.getDependencies(), traceDependencies);
-        }
-    }
-
     /**
      * The default response returned from this kind of execution when there are not further processors
      * - an empty Result