1 files changed, 10 insertions, 12 deletions
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/SyncSession.java b/documentapi/src/main/java/com/yahoo/documentapi/SyncSession.java
index 0ce0ccc2377..c254df3ba02 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/SyncSession.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/SyncSession.java
@@ -34,7 +34,9 @@ public interface SyncSession extends Session {
      * @param documentPut The DocumentPut operation
      * @param priority The priority with which to perform this operation.
      */
-    void put(DocumentPut documentPut, DocumentProtocol.Priority priority);
+    default void put(DocumentPut documentPut, DocumentProtocol.Priority priority) {
+        put(documentPut);
+    }
 
     /**
      * <p>Gets a document.</p>
@@ -45,10 +47,10 @@ public interface SyncSession extends Session {
      * @throws UnsupportedOperationException Thrown if this access does not
      *                                       support retrieving.
      */
-    Document get(DocumentId id);
+    default Document get(DocumentId id) { return get(id, null); }
 
     /**
-     * <p>Gets a document.</p>
+     * Gets a document with an unspecified timeout
      *
      * @param id       The id of the document to get.
      * @param fieldSet A comma-separated list of fields to retrieve
@@ -58,7 +60,9 @@ public interface SyncSession extends Session {
      * @throws UnsupportedOperationException Thrown if this access does not
      *                                       support retrieving.
      */
-    Document get(DocumentId id, String fieldSet, DocumentProtocol.Priority priority);
+    default Document get(DocumentId id, String fieldSet, DocumentProtocol.Priority priority) {
+        return get(id, fieldSet, priority, null);
+    }
 
     /**
      * <p>Gets a document with timeout.</p>
@@ -70,10 +74,7 @@ public interface SyncSession extends Session {
      * @throws UnsupportedOperationException Thrown if this access does not support retrieving.
      * @throws DocumentAccessException on any messagebus error, including timeout ({@link com.yahoo.messagebus.ErrorCode#TIMEOUT}).
      */
-    // TODO Vespa 7: Remove default implementation. Consider removing get() overloads without timeout.
-    default Document get(DocumentId id, Duration timeout) {
-        return get(id);
-    }
+    Document get(DocumentId id, Duration timeout);
 
     /**
      * <p>Gets a document with timeout. </p>
@@ -87,10 +88,7 @@ public interface SyncSession extends Session {
      * @throws UnsupportedOperationException Thrown if this access does not support retrieving.
      * @throws DocumentAccessException on any messagebus error, including timeout ({@link com.yahoo.messagebus.ErrorCode#TIMEOUT}).
      */
-    // TODO Vespa 7: Remove default implementation. Consider removing get() overloads without timeout.
-    default Document get(DocumentId id, String fieldSet, DocumentProtocol.Priority priority, Duration timeout) {
-        return get(id, fieldSet, priority);
-    }
+    Document get(DocumentId id, String fieldSet, DocumentProtocol.Priority priority, Duration timeout);
 
     /**
      * <p>Removes a document if it is present and condition is fulfilled.</p>