diff options
8 files changed, 27 insertions, 2 deletions
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 1578c702034..e88e58b8681 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 @@ -17,7 +17,7 @@ import java.util.Iterator; import java.util.Map; /** - * <p>A template set which provides a default rendering of results and hits.</p> + * <p>A template set which provides XML rendering of results and hits.</p> * * <p>This can be extended to create custom programmatic templates. * Create a subclass which has static inner classes extending DefaultTemplate for the templates @@ -26,7 +26,10 @@ import java.util.Map; * in place of DefaultTemplate to gain access to these. See TiledTemplateSet for an example.</p> * * @author bratseth + * @deprecated use JsonRenderer instead */ +@SuppressWarnings("deprecation") +@Deprecated // TODO: Remove on Vespa 7 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/GenericTemplateSet.java b/container-search/src/main/java/com/yahoo/prelude/templates/GenericTemplateSet.java index fd43fc83a12..92c7efd2a2f 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 @@ -11,8 +11,10 @@ import java.util.Properties; /** * Superclass of a set of templates for rendering (serializing) results + * + * @deprecated use a renderer instead */ -// TODO: Deprecate everything having to do with Templates - we should only support Renderers to serialize a Result. +@Deprecated // TODO: Remove on Vespa 7 public class GenericTemplateSet { public static final String DEFAULT_MIMETYPE = "text/xml"; 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 49163e8fa90..45d7d411568 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 @@ -11,8 +11,12 @@ import java.util.logging.Logger; /** * Delegates to another UserTemplate, but handles any exceptions(except IOException) by logging them. + * * @author tonytv + * @deprecated use a renderer instead */ +@SuppressWarnings("deprecation") +@Deprecated // TODO: Remove on Vespa 7 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/TemplateSet.java b/container-search/src/main/java/com/yahoo/prelude/templates/TemplateSet.java index 6cf6ee640a7..6d8fa30e1df 100644 --- a/container-search/src/main/java/com/yahoo/prelude/templates/TemplateSet.java +++ b/container-search/src/main/java/com/yahoo/prelude/templates/TemplateSet.java @@ -18,7 +18,10 @@ import java.io.Writer; * like returning different templates for different hit types.</p> * * @author bratseth + * @deprecated use a renderer instead */ +@SuppressWarnings("deprecation") +@Deprecated // TODO: Remove on Vespa 7 public class TemplateSet<T extends Writer> extends UserTemplate<T> { private static final String queryContextTemplateName = "queryContext"; diff --git a/container-search/src/main/java/com/yahoo/prelude/templates/UserTemplate.java b/container-search/src/main/java/com/yahoo/prelude/templates/UserTemplate.java index bcc3b3c6390..8ca35446478 100644 --- a/container-search/src/main/java/com/yahoo/prelude/templates/UserTemplate.java +++ b/container-search/src/main/java/com/yahoo/prelude/templates/UserTemplate.java @@ -20,9 +20,11 @@ import java.util.logging.Logger; * A subclass of UserTemplate must implement header(), footer(), hit(), * hitFooter(), error() and noHits(). * + * @deprecated use a renderer instead * @author Steinar Knutsen */ @SuppressWarnings("deprecation") +@Deprecated // TODO: Remove on Vespa 7 public abstract class UserTemplate<T extends Writer> extends GenericTemplateSet { // & 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 ad1ad71992b..a742a54e866 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 @@ -38,8 +38,10 @@ import java.util.concurrent.Executor; * XML rendering of search results. This is NOT the default (but it once was). * * @author tonytv + * @deprecated use JsonRenderer instead */ @SuppressWarnings({ "rawtypes", "deprecation" }) +@Deprecated // TODO: Remove on Vespa 7 public final class DefaultRenderer extends AsynchronousSectionedRenderer<Result> { public static final String DEFAULT_MIMETYPE = "text/xml"; diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/DocumentFieldTemplate.java b/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/DocumentFieldTemplate.java index d6b71e9383f..def70273b40 100755 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/DocumentFieldTemplate.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/DocumentFieldTemplate.java @@ -18,7 +18,11 @@ import java.io.Writer; * Template used to render a single field for a single Document. Fields * that are either of type CONTENT or RAW are written directly, while * all other fields are wrapped in Vespa XML and escaped. + * + * @deprecated use a renderer instead */ +@Deprecated // TODO: Remove on Vespa 7 +@SuppressWarnings("deprecation") public class DocumentFieldTemplate extends UserTemplate<Writer> { Field field; diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/DocumentXMLTemplate.java b/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/DocumentXMLTemplate.java index 5266a2e1d09..17762c59e15 100755 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/DocumentXMLTemplate.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/DocumentXMLTemplate.java @@ -15,6 +15,11 @@ import java.io.IOException; import java.io.Writer; import java.util.logging.Logger; +/** + * @deprecated use a renderer instead + */ +@Deprecated // TODO: Remove on Vespa 7 +@SuppressWarnings("deprecation") public class DocumentXMLTemplate extends UserTemplate<Writer> { private static final Logger log = Logger.getLogger(DocumentXMLTemplate.class.getName()); |