diff options
Diffstat (limited to 'container-search/src/main/java/com/yahoo/prelude')
8 files changed, 16 insertions, 9 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() { |