Avoid insuppressable deprecation warning

2 files changed, 12 insertions, 14 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 7a59be49458..4390f70cac0 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
@@ -7,7 +7,6 @@ import com.yahoo.document.Field;
 import com.yahoo.document.datatypes.FieldValue;
 import com.yahoo.document.datatypes.Raw;
 import com.yahoo.io.ByteWriter;
-import com.yahoo.prelude.templates.Context;
 import com.yahoo.text.XML;
 
 import java.io.IOException;
@@ -38,7 +37,7 @@ public class DocumentFieldTemplate extends com.yahoo.prelude.templates.UserTempl
     }
 
     @Override
-    public void error(Context context, Writer writer) throws IOException {
+    public void error(com.yahoo.prelude.templates.Context context, Writer writer) throws IOException {
         // Error shouldn't be handled by this template, but rather
         // delegated to the searcher
     }
@@ -55,7 +54,7 @@ public class DocumentFieldTemplate extends com.yahoo.prelude.templates.UserTempl
     }
 
     @Override
-    public void header(Context context, Writer writer) throws IOException {
+    public void header(com.yahoo.prelude.templates.Context context, Writer writer) throws IOException {
         if (wrapXml) {
             // XML wrapping should only be used for default field rendering
             writer.write("<?xml version=\"1.0\" encoding=\"" + encoding + "\"?>\n");
@@ -64,14 +63,14 @@ public class DocumentFieldTemplate extends com.yahoo.prelude.templates.UserTempl
     }
 
     @Override
-    public void footer(Context context, Writer writer) throws IOException {
+    public void footer(com.yahoo.prelude.templates.Context context, Writer writer) throws IOException {
         if (wrapXml) {
             writer.write("</result>\n");
         }
     }
 
     @Override
-    public void hit(Context context, Writer writer) throws IOException {
+    public void hit(com.yahoo.prelude.templates.Context context, Writer writer) throws IOException {
         DocumentHit hit = (DocumentHit)context.get("hit");
         Document doc = hit.getDocument();
         // Assume field existence has been checked before we ever get here.
@@ -88,11 +87,11 @@ public class DocumentFieldTemplate extends com.yahoo.prelude.templates.UserTempl
     }
 
     @Override
-    public void hitFooter(Context context, Writer writer) throws IOException {
+    public void hitFooter(com.yahoo.prelude.templates.Context context, Writer writer) throws IOException {
     }
 
     @Override
-    public void noHits(Context context, Writer writer) throws IOException {
+    public void noHits(com.yahoo.prelude.templates.Context context, Writer writer) throws IOException {
     }
 
 }
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 25ee0ff5d03..b16f39800ef 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
@@ -6,7 +6,6 @@ import com.yahoo.search.Result;
 import com.yahoo.search.result.ErrorHit;
 import com.yahoo.search.result.ErrorMessage;
 import com.yahoo.search.result.HitGroup;
-import com.yahoo.prelude.templates.Context;
 import com.yahoo.search.result.Hit;
 import com.yahoo.text.XML;
 
@@ -55,7 +54,7 @@ public class DocumentXMLTemplate extends com.yahoo.prelude.templates.UserTemplat
     }
 
     @Override
-    public void error(Context context, Writer writer) throws IOException {
+    public void error(com.yahoo.prelude.templates.Context context, Writer writer) throws IOException {
         writer.write("<errors>\n");
         // If the error contains no error hits, use a single error with the main
         // code and description. Otherwise, use the error hits explicitly
@@ -72,7 +71,7 @@ public class DocumentXMLTemplate extends com.yahoo.prelude.templates.UserTemplat
     }
 
     @Override
-    public void header(Context context, Writer writer) throws IOException {
+    public void header(com.yahoo.prelude.templates.Context context, Writer writer) throws IOException {
         writer.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
         writer.write("<result>\n");
         HitGroup rootGroup = ((Result) context.get("result")).hits();
@@ -82,12 +81,12 @@ public class DocumentXMLTemplate extends com.yahoo.prelude.templates.UserTemplat
     }
 
     @Override
-    public void footer(Context context, Writer writer) throws IOException {
+    public void footer(com.yahoo.prelude.templates.Context context, Writer writer) throws IOException {
         writer.write("</result>\n");
     }
 
     @Override
-    public void hit(Context context, Writer writer) throws IOException {
+    public void hit(com.yahoo.prelude.templates.Context context, Writer writer) throws IOException {
         Hit hit = (Hit)context.get("hit");
         if (hit instanceof DocumentHit) {
             DocumentHit docHit = (DocumentHit) hit;
@@ -110,11 +109,11 @@ public class DocumentXMLTemplate extends com.yahoo.prelude.templates.UserTemplat
     }
 
     @Override
-    public void hitFooter(Context context, Writer writer) throws IOException {
+    public void hitFooter(com.yahoo.prelude.templates.Context context, Writer writer) throws IOException {
     }
 
     @Override
-    public void noHits(Context context, Writer writer) throws IOException {
+    public void noHits(com.yahoo.prelude.templates.Context context, Writer writer) throws IOException {
     }
 
 }