From aeb88acf49bd24bc186aad00d546f7846fc3d116 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Fri, 18 Nov 2016 15:03:08 +0100 Subject: Revert "Deprecate XML result format and 'templates'" --- .../main/java/com/yahoo/storage/searcher/DocumentFieldTemplate.java | 4 ---- .../main/java/com/yahoo/storage/searcher/DocumentXMLTemplate.java | 5 ----- 2 files changed, 9 deletions(-) (limited to 'vespaclient-container-plugin') 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 def70273b40..d6b71e9383f 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,11 +18,7 @@ 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 { 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 17762c59e15..5266a2e1d09 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,11 +15,6 @@ 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 { private static final Logger log = Logger.getLogger(DocumentXMLTemplate.class.getName()); -- cgit v1.2.3