Remove dead code

8 files changed, 12 insertions, 18 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java
index 8f1e100a3a4..28d426cec06 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java
@@ -359,7 +359,7 @@ public class FastHit extends Hit {
 
     /** @deprecated do not use */
     // TODO: Make private on Vespa 7
-    @Deprecated
+    @Deprecated // OK
     public static String asHexString(GlobalId gid) {
         return asHexString(new StringBuilder(), gid).toString();
     }
diff --git a/container-search/src/main/java/com/yahoo/prelude/logging/AccessLogEntry.java b/container-search/src/main/java/com/yahoo/prelude/logging/AccessLogEntry.java
index 9d852c8822d..f9faf242350 100644
--- a/container-search/src/main/java/com/yahoo/prelude/logging/AccessLogEntry.java
+++ b/container-search/src/main/java/com/yahoo/prelude/logging/AccessLogEntry.java
@@ -7,7 +7,8 @@ package com.yahoo.prelude.logging;
  * @author Steinar Knutsen
  * @deprecated do not use
  */
-@Deprecated // TODO: Remove on Vespa 7
+// TODO: Remove on Vespa 7
+@Deprecated // OK
 public class AccessLogEntry extends com.yahoo.container.logging.AccessLogEntry {
 
     public AccessLogEntry() {
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/AdvancedParser.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/AdvancedParser.java
index 41100dd0b3e..f6f96ae215c 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/parser/AdvancedParser.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/AdvancedParser.java
@@ -10,7 +10,7 @@ import static com.yahoo.prelude.query.parser.Token.Kind.NUMBER;
 /**
  * Parser for queries of type advanced.
  *
- * @author  <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  * @deprecated since 5.11, YQL+ should be used for formal queries
  */
 @Deprecated // OK DO NOT REMOVE (we'll keep this around longer)
diff --git a/container-search/src/main/java/com/yahoo/prelude/querytransform/IndexCombinatorSearcher.java b/container-search/src/main/java/com/yahoo/prelude/querytransform/IndexCombinatorSearcher.java
index 96e9fb30c24..ff603a64725 100644
--- a/container-search/src/main/java/com/yahoo/prelude/querytransform/IndexCombinatorSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/querytransform/IndexCombinatorSearcher.java
@@ -26,10 +26,11 @@ import java.util.*;
  * @author Steinar Knutsen
  * @deprecated do not use
  */
+// TODO: Remove on Vespa 7 (not necessary any more)
 @After({PhaseNames.RAW_QUERY, PHRASE_REPLACEMENT})
 @Before(PhaseNames.TRANSFORMED_QUERY)
 @Provides(IndexCombinatorSearcher.MIXED_RECALL_REWRITE)
-@Deprecated // TODO: Remove on Vespa 7 (not necessary any more)
+@Deprecated // OK
 public class IndexCombinatorSearcher extends Searcher {
 
     public static final String MIXED_RECALL_REWRITE = "MixedRecallRewrite";
diff --git a/container-search/src/main/java/com/yahoo/prelude/searcher/DocumentSourceSearcher.java b/container-search/src/main/java/com/yahoo/prelude/searcher/DocumentSourceSearcher.java
index 2f9e81c1607..bc3c6665ae2 100644
--- a/container-search/src/main/java/com/yahoo/prelude/searcher/DocumentSourceSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/searcher/DocumentSourceSearcher.java
@@ -30,7 +30,8 @@ import java.util.Set;
  * @deprecated use {@link com.yahoo.search.searchchain.testutil.DocumentSourceSearcher}
  */
 @SuppressWarnings({"rawtypes"})
-@Deprecated // TODO: Remove on Vespa 7
+// TODO: Remove on Vespa 7
+@Deprecated // OK
 public class DocumentSourceSearcher extends Searcher {
 
     // as for the SuppressWarnings annotation above, we are inside
diff --git a/container-search/src/main/java/com/yahoo/prelude/searcher/QuerySnapshotSearcher.java b/container-search/src/main/java/com/yahoo/prelude/searcher/QuerySnapshotSearcher.java
index 32efcde6feb..4edb907d337 100644
--- a/container-search/src/main/java/com/yahoo/prelude/searcher/QuerySnapshotSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/searcher/QuerySnapshotSearcher.java
@@ -14,7 +14,8 @@ import com.yahoo.search.searchchain.Execution;
  * @author Steinar Knutsen
  * @deprecated do not use
  */
-@Deprecated // TODO: Remove on Vespa 7
+// TODO: Remove on Vespa 7
+@Deprecated // OK
 public class QuerySnapshotSearcher extends Searcher {
 
     public Result search(Query query, Execution execution) {
diff --git a/container-search/src/main/java/com/yahoo/prelude/searcher/QueryValidatingSearcher.java b/container-search/src/main/java/com/yahoo/prelude/searcher/QueryValidatingSearcher.java
index 558521a7a8d..fd155354d1c 100644
--- a/container-search/src/main/java/com/yahoo/prelude/searcher/QueryValidatingSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/searcher/QueryValidatingSearcher.java
@@ -13,7 +13,8 @@ import com.yahoo.search.searchchain.Execution;
  * @author Steinar Knutsen
  * @deprecated do not use
  */
-@Deprecated // TODO: Remove on Vespa 7
+// TODO: Remove on Vespa 7
+@Deprecated // OK
 public class QueryValidatingSearcher extends Searcher {
 
     public Result search(Query query, Execution execution) {
diff --git a/container-search/src/main/java/com/yahoo/search/rendering/SyncDefaultRenderer.java b/container-search/src/main/java/com/yahoo/search/rendering/SyncDefaultRenderer.java
index 6919f6bd3f8..53260aeb910 100644
--- a/container-search/src/main/java/com/yahoo/search/rendering/SyncDefaultRenderer.java
+++ b/container-search/src/main/java/com/yahoo/search/rendering/SyncDefaultRenderer.java
@@ -70,16 +70,12 @@ public final class SyncDefaultRenderer extends Renderer {
 
 
     //Per instance members, must be created at rendering time, not construction time due to cloning.
-    private Context context;
-
-    private final DefaultTemplateSet defaultTemplate = new DefaultTemplateSet();
 
     private final CopyOnWriteHashMap<String, Utf8String> fieldNameMap = new CopyOnWriteHashMap<>();
 
     @Override
     public void init() {
         super.init();
-        context = new MapContext();
     }
 
     @Override
@@ -107,12 +103,6 @@ public final class SyncDefaultRenderer extends Renderer {
     public void render(Writer writer, Result result) throws IOException {
         XMLWriter xmlWriter = wrapWriter(writer);
 
-        context.put("context", context);
-        context.put("result", result);
-        context.setBoldOpenTag(defaultTemplate.getBoldOpenTag());
-        context.setBoldCloseTag(defaultTemplate.getBoldCloseTag());
-        context.setSeparatorTag(defaultTemplate.getSeparatorTag());
-
         try {
             header(xmlWriter, result);
         } catch (Exception e) {
@@ -138,7 +128,6 @@ public final class SyncDefaultRenderer extends Renderer {
 
     private void header(XMLWriter writer, Result result) throws IOException {
         // TODO: move setting this to Result
-        context.setUtf8Output("utf-8".equalsIgnoreCase(getRequestedEncoding(result.getQuery())));
         writer.xmlHeader(getRequestedEncoding(result.getQuery()));
         writer.openTag(RESULT).attribute(TOTAL_HIT_COUNT,String.valueOf(result.getTotalHitCount()));
         renderCoverageAttributes(result.getCoverage(false), writer);