Prepare for removal

8 files changed, 25 insertions, 16 deletions

diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/ContinuationHit.java b/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/ContinuationHit.java
index 6f3caf24471..c66af4f02ba 100755
--- a/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/ContinuationHit.java
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/ContinuationHit.java
@@ -6,28 +6,22 @@ import com.yahoo.search.result.Hit;
 import java.io.IOException;
 import java.util.Base64;
 
+/**
+ * @deprecated
+ */
+@Deprecated // OK
+// TODO: Remove on Vespa 7
 public class ContinuationHit extends Hit {
 
     private final String value;
 
     public ContinuationHit(ProgressToken token) {
         super("continuation");
-
-        final byte[] serialized = token.serialize();
-        value = Base64.getUrlEncoder().encodeToString(serialized);
+        value = token.serializeToString();
     }
 
-    public static ProgressToken getToken(String continuation) throws IOException {
-        byte[] serialized;
-        try {
-            serialized = Base64.getUrlDecoder().decode(continuation);
-        } catch (IllegalArgumentException e) {
-            // Legacy visitor tokens were encoded with MIME Base64 which may fail decoding as URL-safe.
-            // Try again with MIME decoder to avoid breaking upgrade scenarios.
-            // TODO(vekterli): remove once this is no longer a risk.
-            serialized = Base64.getMimeDecoder().decode(continuation);
-        }
-        return new ProgressToken(serialized);
+    public static ProgressToken getToken(String continuation) {
+        return ProgressToken.fromSerializedString(continuation);
     }
 
     public String getValue() {
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 4390f70cac0..cf35c789f65 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
@@ -19,7 +19,8 @@ import java.io.Writer;
  *
  * @deprecated use a renderer instead
  */
-@Deprecated // TODO: Remove on Vespa 7
+@Deprecated // OK
+// TODO: Remove on Vespa 7
 @SuppressWarnings("deprecation")
 public class DocumentFieldTemplate extends com.yahoo.prelude.templates.UserTemplate<Writer> {
 
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/DocumentHit.java b/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/DocumentHit.java
index 55f3163c55a..514cf055e84 100755
--- a/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/DocumentHit.java
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/DocumentHit.java
@@ -9,6 +9,8 @@ import com.yahoo.search.result.Hit;
 import java.util.Iterator;
 import java.util.Map;
 
+@Deprecated // OK
+// TODO: Remove on Vespa 7
 public class DocumentHit extends Hit {
 
     private Document document;
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/DocumentRemoveHit.java b/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/DocumentRemoveHit.java
index d468df4fb81..73363e68e2b 100644
--- a/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/DocumentRemoveHit.java
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/DocumentRemoveHit.java
@@ -4,6 +4,8 @@ package com.yahoo.storage.searcher;
 import com.yahoo.document.DocumentId;
 import com.yahoo.search.result.Hit;
 
+@Deprecated // OK
+// TODO: Remove on Vespa 7
 public class DocumentRemoveHit extends Hit {
 
     private final DocumentId idOfRemovedDoc;
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 b16f39800ef..2366e7059bd 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
@@ -16,7 +16,8 @@ import java.util.logging.Logger;
 /**
  * @deprecated use a renderer instead
  */
-@Deprecated // TODO: Remove on Vespa 7
+@Deprecated // OK
+// TODO: Remove on Vespa 7
 @SuppressWarnings("deprecation")
 public class DocumentXMLTemplate extends com.yahoo.prelude.templates.UserTemplate<Writer> {
 
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/GetSearcher.java b/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/GetSearcher.java
index 3a5bda776b1..869a2f9317a 100755
--- a/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/GetSearcher.java
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/GetSearcher.java
@@ -57,8 +57,11 @@ import java.util.zip.GZIPInputStream;
  *   contenttype=string (default: no content type specified)
  *   For specifiying the returned HTTP header content type for a returned
  *   document field's content. field must also be specified.
+ * @deprecated do not use
  */
 @SuppressWarnings("deprecation")
+// TODO: Remove on Vespa 7
+@Deprecated // OK
 public class GetSearcher extends Searcher {
 
     private static final Logger log = Logger.getLogger(GetSearcher.class.getName());
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/MessageBusErrorMessage.java b/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/MessageBusErrorMessage.java
index 3eec821ad4c..ad93645e55e 100755
--- a/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/MessageBusErrorMessage.java
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/MessageBusErrorMessage.java
@@ -7,6 +7,8 @@ import com.yahoo.search.result.ErrorMessage;
  * Simple ErrorMessage extension that includes a message bus error code, not
  * just the searcher error code (which isn't very useful for a Vespa XML consumer)
  */
+@Deprecated // OK
+// TODO: Remove on Vespa 7
 public class MessageBusErrorMessage extends ErrorMessage {
 
     private int mbusCode;
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/VisitSearcher.java b/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/VisitSearcher.java
index a3ac64e78a4..e330b76fa4b 100644
--- a/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/VisitSearcher.java
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/VisitSearcher.java
@@ -27,7 +27,11 @@ import com.yahoo.vespaclient.config.FeederConfig;
 
 /**
  * A searcher that allows you to iterate through a storage cluster using visiting.
+ *
+ * @deprecated do not use
  */
+// TODO: Remove on Vespa 7
+@Deprecated // OK
 public class VisitSearcher extends Searcher {
 
     public static final String VISITOR_CONTINUATION_TOKEN_FIELDNAME = "visitorContinuationToken";