Avoid deprecated method

19 files changed, 64 insertions, 46 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/templates/PageTemplateSet.java b/container-search/src/main/java/com/yahoo/prelude/templates/PageTemplateSet.java
index 6051b6708c9..d5de6fa597e 100644
--- a/container-search/src/main/java/com/yahoo/prelude/templates/PageTemplateSet.java
+++ b/container-search/src/main/java/com/yahoo/prelude/templates/PageTemplateSet.java
@@ -18,7 +18,7 @@ import java.io.Writer;
  */
 @SuppressWarnings("deprecation")
 // TODO: Remove on Vespa 7
-@Deprecated // OK (But wait for deprecated handlers in vespaclient-container-plugin to be removed)
+@Deprecated
 public class PageTemplateSet extends TiledTemplateSet {
 
     public PageTemplateSet() {
diff --git a/container-search/src/main/java/com/yahoo/search/Query.java b/container-search/src/main/java/com/yahoo/search/Query.java
index 53435941e26..1fd81e506bd 100644
--- a/container-search/src/main/java/com/yahoo/search/Query.java
+++ b/container-search/src/main/java/com/yahoo/search/Query.java
@@ -530,7 +530,8 @@ public class Query extends com.yahoo.processing.Request implements Cloneable {
     /**
      * @deprecated do not use
      */
-    @Deprecated // TODO: Remove on Vespa 7
+    // TODO: Remove on Vespa 7
+    @Deprecated // OK
     public boolean requestHasProperty(String name) {
         return httpRequest.hasProperty(name);
     }
@@ -644,7 +645,8 @@ public class Query extends com.yahoo.processing.Request implements Cloneable {
      *
      * @deprecated this is ignored
      */
-    @Deprecated // TODO: Remove on Vespa 7
+    // TODO: Remove on Vespa 7
+    @Deprecated // OK
     public void setCompress(boolean ignored) { }
 
     /**
@@ -652,7 +654,8 @@ public class Query extends com.yahoo.processing.Request implements Cloneable {
      *
      * @deprecated this always returns false
      */
-    @Deprecated // TODO: Remove on Vespa 7
+    // TODO: Remove on Vespa 7
+    @Deprecated // OK
     public boolean getCompress() { return false; }
 
     /** Returns a string describing this query */
diff --git a/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java b/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java
index 3896e817429..4878691742c 100644
--- a/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java
+++ b/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java
@@ -38,7 +38,8 @@ public class ClusterMonitor<T> {
     private final Map<T, BaseNodeMonitor<T>> nodeMonitors = Collections.synchronizedMap(new java.util.LinkedHashMap<>());
 
     /** @deprecated use the constructor with just the first argument instead */
-    @Deprecated // TODO: Remove on Vespa 7
+    // TODO: Remove on Vespa 7
+    @Deprecated // OK
     public ClusterMonitor(NodeManager<T> manager, String ignored) {
         this(manager);
     }
diff --git a/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredHTTPClientSearcher.java b/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredHTTPClientSearcher.java
index 8abd6deb5f9..1607d108722 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredHTTPClientSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredHTTPClientSearcher.java
@@ -15,8 +15,10 @@ import com.yahoo.statistics.Statistics;
  * the provider and cache configurations to parameters which are passed upwards.
  *
  * @author bratseth
+ * @deprecated
  */
-@Deprecated
+// TODO: Remove on Vespa 7
+@Deprecated // OK
 public abstract class ConfiguredHTTPClientSearcher extends HTTPClientSearcher {
 
     /** Create this from a configuraton */
diff --git a/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredHTTPProviderSearcher.java b/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredHTTPProviderSearcher.java
index 22c2802c9e8..9f99a790df0 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredHTTPProviderSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredHTTPProviderSearcher.java
@@ -19,7 +19,8 @@ import java.util.Collections;
  * @author  <a href="mailto:arnebef@yahoo-inc.com">Arne Bergene Fossaa</a>
  * @author  bratseth
  */
-@Deprecated
+// TODO: Remove on Vespa 7
+@Deprecated // OK
 public abstract class ConfiguredHTTPProviderSearcher extends HTTPProviderSearcher {
 
     /** Create this from a configuraton */
diff --git a/container-search/src/main/java/com/yahoo/search/federation/http/HTTPClientSearcher.java b/container-search/src/main/java/com/yahoo/search/federation/http/HTTPClientSearcher.java
index dc0b5981e63..ee093adc6fc 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/http/HTTPClientSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/http/HTTPClientSearcher.java
@@ -90,8 +90,10 @@ import java.util.logging.Logger;
 
  * @author <a href="mailto:arnebef@yahoo-inc.com">Arne Bergene Fossaa</a>
  * @author bratseth
+ * @deprecated
  */
-@Deprecated
+// TODO: Remove on Vespa 7
+@Deprecated // OK
 public abstract class HTTPClientSearcher extends HTTPSearcher {
 
     static final CompoundName REQUEST_META_CARRIER = new CompoundName("com.yahoo.search.federation.http.HTTPClientSearcher_requestMeta");
diff --git a/container-search/src/main/java/com/yahoo/search/federation/http/HTTPProviderSearcher.java b/container-search/src/main/java/com/yahoo/search/federation/http/HTTPProviderSearcher.java
index d0f76b815dc..429c3dfff17 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/http/HTTPProviderSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/http/HTTPProviderSearcher.java
@@ -38,7 +38,9 @@ import java.util.logging.Logger;
  *
  * @author Arne Bergene Fossaa
  * @author bratseth
+ * @deprecated
  */
+// TODO: Remove on Vespa 7
 @Deprecated
 public abstract class HTTPProviderSearcher extends HTTPSearcher {
 
diff --git a/container-search/src/main/java/com/yahoo/search/federation/http/HTTPSearcher.java b/container-search/src/main/java/com/yahoo/search/federation/http/HTTPSearcher.java
index 80e785f0175..71bdaf76be8 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/http/HTTPSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/http/HTTPSearcher.java
@@ -135,7 +135,9 @@ import java.util.logging.Logger;
  * </dl>
  *
  * @author Arne Bergene Fossaa
+ * @deprecated
  */
+// TODO: Remove on Vespa 7
 @Deprecated
 public abstract class HTTPSearcher extends ClusterSearcher<Connection> {
 
diff --git a/container-search/src/main/java/com/yahoo/search/federation/vespa/VespaSearcher.java b/container-search/src/main/java/com/yahoo/search/federation/vespa/VespaSearcher.java
index fdbee9c8f11..246732d0970 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/vespa/VespaSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/vespa/VespaSearcher.java
@@ -45,7 +45,9 @@ import edu.umd.cs.findbugs.annotations.Nullable;
  *
  * @author Arne Bergene Fossaa
  * @author Steinar Knutsen
+ * @deprecated
  */
+// TODO: Remove on Vespa 7
 @Deprecated
 @Provides("Vespa")
 @After("*")
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/GroupingRequest.java b/container-search/src/main/java/com/yahoo/search/grouping/GroupingRequest.java
index f1f1e2e3b55..83eca89dffa 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/GroupingRequest.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/GroupingRequest.java
@@ -128,7 +128,8 @@ public class GroupingRequest {
      * @return this, to allow chaining.
      * @deprecated this is a noop
      */
-    @Deprecated // TODO: Remove on Vespa 7
+    // TODO: Remove on Vespa 7
+    @Deprecated // OK
     public GroupingRequest setResultGroup(RootGroup group) {
         return this;
     }
@@ -164,7 +165,8 @@ public class GroupingRequest {
      * @deprecated use query.getSelect().getGrouping()
      */
     @SuppressWarnings({ "unchecked" })
-    @Deprecated
+    // TODO: Remove on Vespa 7
+    @Deprecated // OK
     public static List<GroupingRequest> getRequests(Query query) {
         return query.getSelect().getGrouping();
     }
diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
index c6d877c006a..853f31a72e3 100644
--- a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
+++ b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
@@ -127,20 +127,19 @@ public class SearchHandler extends LoggingRequestHandler {
     }
 
     @Inject
-    public SearchHandler(
-            final ChainsConfig chainsConfig,
-            final IndexInfoConfig indexInfo,
-            final QrSearchersConfig clusters,
-            final SpecialtokensConfig specialtokens,
-            final Statistics statistics,
-            final Linguistics linguistics,
-            final Metric metric,
-            final ComponentRegistry<Renderer> renderers,
-            final Executor executor,
-            final AccessLog accessLog,
-            final QueryProfilesConfig queryProfileConfig,
-            final ComponentRegistry<Searcher> searchers,
-            final ContainerHttpConfig containerHttpConfig) {
+    public SearchHandler(ChainsConfig chainsConfig,
+                         IndexInfoConfig indexInfo,
+                         QrSearchersConfig clusters,
+                         SpecialtokensConfig specialtokens,
+                         Statistics statistics,
+                         Linguistics linguistics,
+                         Metric metric,
+                         ComponentRegistry<Renderer> renderers,
+                         Executor executor,
+                         AccessLog accessLog,
+                         QueryProfilesConfig queryProfileConfig,
+                         ComponentRegistry<Searcher> searchers,
+                         ContainerHttpConfig containerHttpConfig) {
         super(executor, accessLog, metric, true);
         log.log(LogLevel.DEBUG, "SearchHandler.init " + System.identityHashCode(this));
         searchChainRegistry = new SearchChainRegistry(searchers);
@@ -167,7 +166,7 @@ public class SearchHandler extends LoggingRequestHandler {
 
     /** @deprecated use the constructor with ContainerHttpConfig */
     // TODO: Remove on Vespa 7
-    @Deprecated
+    @Deprecated // OK
     public SearchHandler(
             final ChainsConfig chainsConfig,
             final IndexInfoConfig indexInfo,
@@ -187,7 +186,7 @@ public class SearchHandler extends LoggingRequestHandler {
 
     /** @deprecated use the constructor without deprecated parameters */
     // TODO: Remove on Vespa 7
-    @Deprecated
+    @Deprecated // OK
     public SearchHandler(
             final ChainsConfig chainsConfig,
             final IndexInfoConfig indexInfo,
@@ -415,8 +414,9 @@ public class SearchHandler extends LoggingRequestHandler {
      * 
      * @deprecated remove on Vespa 7
      */
+    // TODO: Remove on Vespa 7
     @Deprecated
-    public Renderer<Result> getRendererCopy(ComponentSpecification spec) { // TODO: Deprecate this
+    public Renderer<Result> getRendererCopy(ComponentSpecification spec) {
         Renderer<Result> renderer = rendererRegistry.getRenderer(spec);
         return perRenderingCopy(renderer);
     }
diff --git a/container-search/src/main/java/com/yahoo/search/query/Model.java b/container-search/src/main/java/com/yahoo/search/query/Model.java
index 95cd3849cf6..4baa651fa01 100644
--- a/container-search/src/main/java/com/yahoo/search/query/Model.java
+++ b/container-search/src/main/java/com/yahoo/search/query/Model.java
@@ -99,7 +99,8 @@ public class Model implements Cloneable {
      * 
      * @deprecated do not use; language can now be assigned later and for parts of the query tree, making this quite useless
      */
-    @Deprecated
+    // TODO: Remove on Vespa 7
+    @Deprecated // OK
     public void traceLanguage() {
         if (getParent().getTraceLevel() < 2) return;
         if (language != null) {
@@ -536,7 +537,8 @@ public class Model implements Cloneable {
      * @param next string representation of header value
      * @deprecated not used, ytrace has been discontinued
      */
-    @Deprecated
+    // TODO: Remove on Vespa 7
+    @Deprecated // OK
     public void setYTraceHeaderToNext(String next) { }
 
     /**
@@ -546,7 +548,8 @@ public class Model implements Cloneable {
      * 
      * @deprecated not used, ytrace has been discontinued
      */
-    @Deprecated
+    // TODO: Remove on Vespa 7
+    @Deprecated // OK
     public String getYTraceHeaderToNext() {
         return null;
     }
diff --git a/container-search/src/main/java/com/yahoo/search/query/Presentation.java b/container-search/src/main/java/com/yahoo/search/query/Presentation.java
index d9b554e3270..ae179a2ba07 100644
--- a/container-search/src/main/java/com/yahoo/search/query/Presentation.java
+++ b/container-search/src/main/java/com/yahoo/search/query/Presentation.java
@@ -97,12 +97,12 @@ public class Presentation implements Cloneable {
     public void setBolding(boolean bolding) { this.bolding = bolding; }
 
     /** @deprecated coverage information is always returned */
-    @Deprecated
+    @Deprecated // OK
     // TODO: Remove on Vespa 7
     public boolean getReportCoverage() { return true; }
 
     /** @deprecated coverage information is always returned */
-    @Deprecated
+    @Deprecated // OK
     // TODO: Remove on Vespa 7
     public void setReportCoverage(boolean ignored) { }
 
diff --git a/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java b/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java
index 559a7279f83..55855624691 100644
--- a/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java
+++ b/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java
@@ -29,11 +29,9 @@ import java.util.Map;
  */
 public class QueryProperties extends Properties {
 
-    /**
-     * TODO: Remove on Vespa 7
-     * @deprecated use Query.nativeProperties
-     */
-    @Deprecated
+    /** @deprecated use Query.nativeProperties */
+    // TODO: Remove on Vespa 7
+    @Deprecated // OK
     public static final CompoundName[] PER_SOURCE_QUERY_PROPERTIES =
             Query.nativeProperties.toArray(new CompoundName[] {});
 
diff --git a/container-search/src/main/java/com/yahoo/search/querytransform/QueryCombinator.java b/container-search/src/main/java/com/yahoo/search/querytransform/QueryCombinator.java
index 62560d2e00a..67cb291a760 100644
--- a/container-search/src/main/java/com/yahoo/search/querytransform/QueryCombinator.java
+++ b/container-search/src/main/java/com/yahoo/search/querytransform/QueryCombinator.java
@@ -38,7 +38,7 @@ import java.util.Set;
  * @deprecated use YQL
  */
 // TODO: Remove on Vespa 7
-@Deprecated
+@Deprecated // OK
 public class QueryCombinator extends Searcher {
 
     private static final String QUERYPREFIX = "query.";
diff --git a/container-search/src/main/java/com/yahoo/search/rendering/DefaultRenderer.java b/container-search/src/main/java/com/yahoo/search/rendering/DefaultRenderer.java
index aa825149bb7..a5a0cbdd57c 100644
--- a/container-search/src/main/java/com/yahoo/search/rendering/DefaultRenderer.java
+++ b/container-search/src/main/java/com/yahoo/search/rendering/DefaultRenderer.java
@@ -1,16 +1,13 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.rendering;
 
-import com.fasterxml.jackson.core.JsonFactory;
 import com.yahoo.concurrent.CopyOnWriteHashMap;
 import com.yahoo.io.ByteWriter;
 import com.yahoo.net.URI;
-import com.yahoo.prelude.fastsearch.FastHit;
 import com.yahoo.prelude.fastsearch.GroupingListHit;
 import com.yahoo.prelude.hitfield.HitField;
 import com.yahoo.prelude.hitfield.JSONString;
 import com.yahoo.prelude.hitfield.XMLString;
-import com.yahoo.prelude.templates.UserTemplate;
 import com.yahoo.processing.rendering.AsynchronousSectionedRenderer;
 import com.yahoo.processing.response.Data;
 import com.yahoo.processing.response.DataList;
@@ -33,12 +30,9 @@ import java.io.Writer;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetEncoder;
 import java.util.Iterator;
-import java.util.Map;
 import java.util.concurrent.Executor;
 import java.util.stream.Collectors;
 
-// TODO: Rename to XmlRenderer and make this a deprecated empty subclass.
-
 /**
  * XML rendering of search results. This is NOT the default (but it once was).
  *
@@ -46,7 +40,8 @@ import java.util.stream.Collectors;
  * @deprecated use JsonRenderer instead
  */
 @SuppressWarnings({ "rawtypes", "deprecation" })
-@Deprecated // TODO: Remove on Vespa 7
+@Deprecated // OK
+// TODO: Rename to XmlRenderer on Vespa 7
 public final class DefaultRenderer extends AsynchronousSectionedRenderer<Result> {
 
     public static final String  DEFAULT_MIMETYPE    = "text/xml";
diff --git a/container-search/src/main/java/com/yahoo/search/result/Coverage.java b/container-search/src/main/java/com/yahoo/search/result/Coverage.java
index e340132a507..1a323831a0f 100644
--- a/container-search/src/main/java/com/yahoo/search/result/Coverage.java
+++ b/container-search/src/main/java/com/yahoo/search/result/Coverage.java
@@ -6,7 +6,7 @@ import com.google.common.annotations.Beta;
 /**
  * The coverage report for a result set.
  *
- * @author  <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  * @author baldersheim
  */
 public class Coverage extends com.yahoo.container.handler.Coverage {
diff --git a/container-search/src/main/java/com/yahoo/search/result/Templating.java b/container-search/src/main/java/com/yahoo/search/result/Templating.java
index 9e191a1219c..beb132f820e 100644
--- a/container-search/src/main/java/com/yahoo/search/result/Templating.java
+++ b/container-search/src/main/java/com/yahoo/search/result/Templating.java
@@ -155,8 +155,12 @@ public class Templating {
      * Returns the templates which will render the result. This is never null.
      * If default rendering is used, it is a TemplateSet containing no
      * templates.
+     *
+     * @deprecated use a renderer instead
      */
     @SuppressWarnings("rawtypes")
+    // TODO: Remove on Vespa 7
+    @Deprecated // OK
     public UserTemplate getTemplates() {
         if (renderer == null) {
             return TemplateSet.getDefault();
diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/HttpProviderSpec.java b/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/HttpProviderSpec.java
index 4103514c103..4f5efd306f9 100644
--- a/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/HttpProviderSpec.java
+++ b/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/HttpProviderSpec.java
@@ -17,6 +17,7 @@ import java.util.List;
  */
 @Immutable
 public class HttpProviderSpec {
+
     public enum Type {
         vespa(com.yahoo.search.federation.vespa.VespaSearcher.class);