diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-11-18 15:03:08 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-18 15:03:08 +0100 |
commit | aeb88acf49bd24bc186aad00d546f7846fc3d116 (patch) | |
tree | 277034bab3496a69e31cde2451bb94b8430d707d /container-search | |
parent | 5c1f72305a159f45b3cc8f4ba814ac5b7ef28e12 (diff) |
Revert "Deprecate XML result format and 'templates'"
Diffstat (limited to 'container-search')
6 files changed, 2 insertions, 18 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 e88e58b8681..1578c702034 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 XML rendering of results and hits.</p> + * <p>A template set which provides a default 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,10 +26,7 @@ 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 92c7efd2a2f..fd43fc83a12 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,10 +11,8 @@ import java.util.Properties; /** * Superclass of a set of templates for rendering (serializing) results - * - * @deprecated use a renderer instead */ -@Deprecated // TODO: Remove on Vespa 7 +// TODO: Deprecate everything having to do with Templates - we should only support Renderers to serialize a Result. 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 45d7d411568..49163e8fa90 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,12 +11,8 @@ 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 6d8fa30e1df..6cf6ee640a7 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,10 +18,7 @@ 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 8ca35446478..bcc3b3c6390 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,11 +20,9 @@ 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 a742a54e866..ad1ad71992b 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,10 +38,8 @@ 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"; |