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 /vespaclient-container-plugin | |
| parent | 5c1f72305a159f45b3cc8f4ba814ac5b7ef28e12 (diff) | |
Revert "Deprecate XML result format and 'templates'"
Diffstat (limited to 'vespaclient-container-plugin')
2 files changed, 0 insertions, 9 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 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<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 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<Writer> { private static final Logger log = Logger.getLogger(DocumentXMLTemplate.class.getName()); |