Deprecation cleanup

7 files changed, 8 insertions, 9 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/IndexModel.java b/container-search/src/main/java/com/yahoo/prelude/IndexModel.java
index ab244444d01..db37922f6fb 100644
--- a/container-search/src/main/java/com/yahoo/prelude/IndexModel.java
+++ b/container-search/src/main/java/com/yahoo/prelude/IndexModel.java
@@ -42,8 +42,7 @@ public final class IndexModel {
      *
      * @deprecated use the constructor without the third parameter
      */
-    // TODO: Remove Vespa 8
-    @Deprecated
+    @Deprecated // TODO: Remove Vespa 8
     public IndexModel(Map<String, List<String>> masterClusters,
                       Map<String, SearchDefinition> searchDefinitions,
                       SearchDefinition unionSearchDefinition) {
diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java
index 21f8c182eea..5cba0e94323 100644
--- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java
+++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java
@@ -80,7 +80,7 @@ import static com.yahoo.text.Utf8.calculateStringPositions;
  * @deprecated Please use {@link com.yahoo.document.serialization.VespaDocumentDeserializerHead} instead for new code.
  * @author baldersheim
  */
-@Deprecated // Remove on Vespa 8
+@Deprecated // TODO: Remove on Vespa 8
 // When removing: Move content of this class into VespaDocumentDeserializerHead
 public class VespaDocumentDeserializer42 extends VespaDocumentSerializer42 implements DocumentDeserializer {
 
diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer42.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer42.java
index 9976c3ff6b4..553f05051d5 100644
--- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer42.java
+++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer42.java
@@ -67,7 +67,7 @@ import static com.yahoo.text.Utf8.calculateBytePositions;
  * @deprecated use {@link com.yahoo.document.serialization.VespaDocumentSerializerHead} instead for new code
  * @author baldersheim
  */
-@Deprecated // Remove before Vespa 8
+@Deprecated // TODO: Remove on Vespa 8
 // When removing: Move content into VespaDocumentSerializerHead
 public class VespaDocumentSerializer42 extends BufferSerializer implements DocumentSerializer {
 
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/AsyncSession.java b/documentapi/src/main/java/com/yahoo/documentapi/AsyncSession.java
index 6aa62a0ba8b..ae1f80d8b06 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/AsyncSession.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/AsyncSession.java
@@ -73,7 +73,7 @@ public interface AsyncSession extends Session {
      * @throws UnsupportedOperationException if this access implementation does not support retrieving
      * @deprecated the 'headersonly' flag has no effect
      */
-    @Deprecated
+    @Deprecated // TODO: Remove on Vespa 8
     Result get(DocumentId id, boolean headersOnly, DocumentProtocol.Priority priority);
 
     /**
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java b/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java
index 45a2046157d..64854373e05 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java
@@ -231,8 +231,8 @@ public class VisitorParameters extends Parameters {
 
     public void setVisitRemoves(boolean visitRemoves) { this.visitRemoves = visitRemoves; }
 
-    /** The 'headersonly' option is removed in Vespa 7 */
-    @Deprecated
+    /** @deprecated this option is ignored */
+    @Deprecated // TODO: Remove on Vespa 8
     public void setVisitHeadersOnly(boolean headersOnly) { }
 
     /** Set field set to use. */
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/local/LocalAsyncSession.java b/documentapi/src/main/java/com/yahoo/documentapi/local/LocalAsyncSession.java
index cb02617d5e1..00d6bb5ae33 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/local/LocalAsyncSession.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/local/LocalAsyncSession.java
@@ -74,7 +74,7 @@ public class LocalAsyncSession implements AsyncSession {
     }
 
     @Override
-    @Deprecated
+    @Deprecated // TODO: Remove on Vespa 8
     public Result get(DocumentId id, boolean headersOnly, DocumentProtocol.Priority pri) {
         return get(id, pri);
     }
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java
index 08a66cbac96..67b9444e73f 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java
@@ -86,7 +86,7 @@ public class MessageBusAsyncSession implements MessageBusSession, AsyncSession {
     }
 
     @Override
-    @Deprecated
+    @Deprecated // TODO: Remove on Vespa 8
     public Result get(DocumentId id, boolean headersOnly, DocumentProtocol.Priority pri) {
         return get(id, pri);
     }