Avoid deprecated method

12 files changed, 19 insertions, 19 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/templates/Context.java b/container-search/src/main/java/com/yahoo/prelude/templates/Context.java
index 7989f35e77b..7662ca832f9 100644
--- a/container-search/src/main/java/com/yahoo/prelude/templates/Context.java
+++ b/container-search/src/main/java/com/yahoo/prelude/templates/Context.java
@@ -12,7 +12,8 @@ import com.yahoo.text.XML;
  * @deprecated use a Renderer instead
  */
 @SuppressWarnings("deprecation")
-@Deprecated // TODO: Remove on Vespa 7
+// TODO: Remove on Vespa 7
+@Deprecated // OK (But wait for deprecated handlers in vespaclient-container-plugin to be removed)
 public abstract class Context {
 
     private boolean xmlEscape = true;
diff --git a/container-search/src/main/java/com/yahoo/prelude/templates/DefaultTemplateSet.java b/container-search/src/main/java/com/yahoo/prelude/templates/DefaultTemplateSet.java
index e8e7f6f2f93..7fc82ba4622 100644
--- a/container-search/src/main/java/com/yahoo/prelude/templates/DefaultTemplateSet.java
+++ b/container-search/src/main/java/com/yahoo/prelude/templates/DefaultTemplateSet.java
@@ -34,7 +34,8 @@ import java.util.stream.Collectors;
  * @deprecated use JsonRenderer instead
  */
 @SuppressWarnings("deprecation")
-@Deprecated // TODO: Remove on Vespa 7
+// TODO: Remove on Vespa 7
+@Deprecated // OK (But wait for deprecated handlers in vespaclient-container-plugin to be removed)
 public class DefaultTemplateSet extends UserTemplate<XMLWriter> {
 
     private static final Utf8String RESULT = new Utf8String("result");
diff --git a/container-search/src/main/java/com/yahoo/prelude/templates/FormattingOptions.java b/container-search/src/main/java/com/yahoo/prelude/templates/FormattingOptions.java
index dab80580f61..1f724aba112 100644
--- a/container-search/src/main/java/com/yahoo/prelude/templates/FormattingOptions.java
+++ b/container-search/src/main/java/com/yahoo/prelude/templates/FormattingOptions.java
@@ -16,7 +16,8 @@ import java.util.Set;
  * @deprecated use a Renderer instead
  */
 @SuppressWarnings("deprecation")
-@Deprecated // TODO: Remove on Vespa 7
+// TODO: Remove on Vespa 7
+@Deprecated // OK (But wait for deprecated handlers in vespaclient-container-plugin to be removed)
 public class FormattingOptions {
 
 	public static final String DEFAULT_TYPE_ATTRIBUTE_NAME = "type";
diff --git a/container-search/src/main/java/com/yahoo/prelude/templates/GenericTemplateSet.java b/container-search/src/main/java/com/yahoo/prelude/templates/GenericTemplateSet.java
index 8103f4fa58c..95875d0dd1f 100644
--- a/container-search/src/main/java/com/yahoo/prelude/templates/GenericTemplateSet.java
+++ b/container-search/src/main/java/com/yahoo/prelude/templates/GenericTemplateSet.java
@@ -14,7 +14,8 @@ import java.util.Properties;
  * 
  * @deprecated use a renderer instead
  */
-@Deprecated // TODO: Remove on Vespa 7
+// TODO: Remove on Vespa 7
+@Deprecated // OK (But wait for deprecated handlers in vespaclient-container-plugin to be removed)
 public class GenericTemplateSet {
 
     public static final String  DEFAULT_MIMETYPE    = "text/xml";
diff --git a/container-search/src/main/java/com/yahoo/prelude/templates/HitContext.java b/container-search/src/main/java/com/yahoo/prelude/templates/HitContext.java
index 14b05f5e2a6..5ef28d6f6c6 100644
--- a/container-search/src/main/java/com/yahoo/prelude/templates/HitContext.java
+++ b/container-search/src/main/java/com/yahoo/prelude/templates/HitContext.java
@@ -6,7 +6,6 @@ import com.yahoo.prelude.hitfield.JSONString;
 import com.yahoo.prelude.hitfield.XMLString;
 import com.yahoo.search.result.Hit;
 import com.yahoo.search.result.StructuredData;
-import com.yahoo.search.result.FeatureData;
 import com.yahoo.text.XML;
 
 import java.util.Collection;
@@ -20,7 +19,8 @@ import java.util.Set;
  * @deprecated use a Renderer instead
  */
 @SuppressWarnings("deprecation")
-@Deprecated // TODO: Remove on Vespa 7
+// TODO: Remove on Vespa 7
+@Deprecated // OK (But wait for deprecated handlers in vespaclient-container-plugin to be removed)
 public class HitContext extends Context {
 
     private final Hit hit;
diff --git a/container-search/src/main/java/com/yahoo/prelude/templates/LogExceptionUserTemplateDelegator.java b/container-search/src/main/java/com/yahoo/prelude/templates/LogExceptionUserTemplateDelegator.java
index f9ad3ebf86e..7696790897e 100644
--- a/container-search/src/main/java/com/yahoo/prelude/templates/LogExceptionUserTemplateDelegator.java
+++ b/container-search/src/main/java/com/yahoo/prelude/templates/LogExceptionUserTemplateDelegator.java
@@ -16,7 +16,8 @@ import java.util.logging.Logger;
  * @deprecated use a renderer instead
  */
 @SuppressWarnings("deprecation")
-@Deprecated // TODO: Remove on Vespa 7
+// TODO: Remove on Vespa 7
+@Deprecated // OK (But wait for deprecated handlers in vespaclient-container-plugin to be removed)
 public class LogExceptionUserTemplateDelegator<T extends Writer> extends UserTemplate<T> {
 
     private static Logger log = Logger.getLogger(LogExceptionUserTemplateDelegator.class.getName());
diff --git a/container-search/src/main/java/com/yahoo/prelude/templates/MapContext.java b/container-search/src/main/java/com/yahoo/prelude/templates/MapContext.java
index 84d97b71f60..c08c9701741 100644
--- a/container-search/src/main/java/com/yahoo/prelude/templates/MapContext.java
+++ b/container-search/src/main/java/com/yahoo/prelude/templates/MapContext.java
@@ -11,7 +11,8 @@ import java.util.Map;
  * @deprecated use a Renderer instead
  */
 @SuppressWarnings("deprecation")
-@Deprecated // TODO: Remove on Vespa 7
+// TODO: Remove on Vespa 7
+@Deprecated // OK (But wait for deprecated handlers in vespaclient-container-plugin to be removed)
 public class MapContext extends Context {
 
     private Map<String, Object> map = new LinkedHashMap<>();
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 83118ec66ad..6051b6708c9 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
@@ -17,7 +17,8 @@ import java.io.Writer;
  * @deprecated use a Renderer instead
  */
 @SuppressWarnings("deprecation")
-@Deprecated // TODO: Remove on Vespa 7
+// TODO: Remove on Vespa 7
+@Deprecated // OK (But wait for deprecated handlers in vespaclient-container-plugin to be removed)
 public class PageTemplateSet extends TiledTemplateSet {
 
     public PageTemplateSet() {
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/PageTemplate.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/PageTemplate.java
index 077c4507ad8..dc390c773d8 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/PageTemplate.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/PageTemplate.java
@@ -12,7 +12,7 @@ import java.util.Collections;
 import java.util.Set;
 
 /**
- * A page template represents a particular way to organize a return page. It is a recursive structure of
+ * A page template represents a particular way to organize a result page. It is a recursive structure of
  * page template elements.
  *
  * @author bratseth
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/PageTemplateSearcher.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/PageTemplateSearcher.java
index 22fd78d6faa..0ec04bf99de 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/PageTemplateSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/PageTemplateSearcher.java
@@ -46,7 +46,7 @@ import java.util.*;
  * </ul>
  *
  * <p>
- * The set of page templates chosen for the query specifies a list of sources to be queries (the page template sources).
+ * The set of page templates chosen for the query specifies a list of sources to be queried (the page template sources).
  * In addition, the query may contain
  * <ul>
  *   <li>a set of sources set explicitly in the Request, a query property or a searcher (the query model sources)
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/PageElement.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/PageElement.java
index 7b93fddef33..90239fdeb8d 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/PageElement.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/PageElement.java
@@ -11,6 +11,6 @@ import com.yahoo.component.provider.Freezable;
 public interface PageElement extends Freezable {
 
     /** Accepts a visitor to this structure */
-    public void accept(PageTemplateVisitor visitor);
+    void accept(PageTemplateVisitor visitor);
 
 }
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 53260aeb910..9a716e4b18b 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
@@ -2,18 +2,12 @@
 package com.yahoo.search.rendering;
 
 import com.yahoo.concurrent.CopyOnWriteHashMap;
-import com.yahoo.io.ByteWriter;
 import com.yahoo.log.LogLevel;
 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.Context;
-import com.yahoo.prelude.templates.DefaultTemplateSet;
-import com.yahoo.prelude.templates.MapContext;
-import com.yahoo.prelude.templates.UserTemplate;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
 import com.yahoo.search.grouping.result.HitRenderer;
@@ -30,7 +24,6 @@ import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.io.Writer;
 import java.util.Iterator;
-import java.util.Map;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;