Revert "Revert "Deprecate XML result format and 'templates'""

2 files changed, 9 insertions, 0 deletions

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());