rebase fixes

projectnessie · May 6, 2023 · cbdcedb · cbdcedb
1 parent 7a0cbb7
commit cbdcedb
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/versioned/spi/src/main/java/org/projectnessie/versioned/EventsVersionStore.java b/versioned/spi/src/main/java/org/projectnessie/versioned/EventsVersionStore.java
@@ -22,6 +22,7 @@
 import java.util.concurrent.Callable;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
+import java.util.function.Predicate;
 import java.util.stream.Stream;
 import javax.annotation.Nonnull;
 import org.projectnessie.model.CommitMeta;
@@ -192,9 +193,10 @@ public PaginationIterator<Commit> getCommits(Ref ref, boolean fetchAdditionalInf
   }
 
   @Override
-  public PaginationIterator<KeyEntry> getKeys(Ref ref, String pagingToken, boolean withContent)
+  public PaginationIterator<KeyEntry> getKeys(
+      Ref ref, String pagingToken, boolean withContent, ContentKey minKey, ContentKey maxKey)
       throws ReferenceNotFoundException {
-    return delegate.getKeys(ref, pagingToken, withContent);
+    return delegate.getKeys(ref, pagingToken, withContent, minKey, maxKey);
   }
 
   @Override
@@ -209,9 +211,15 @@ public Map<ContentKey, Content> getValues(Ref ref, Collection<ContentKey> keys)
   }
 
   @Override
-  public PaginationIterator<Diff> getDiffs(Ref from, Ref to, String pagingToken)
+  public PaginationIterator<Diff> getDiffs(
+      Ref from,
+      Ref to,
+      String pagingToken,
+      ContentKey minKey,
+      ContentKey maxKey,
+      Predicate<ContentKey> contentKeyPredicate)
       throws ReferenceNotFoundException {
-    return delegate.getDiffs(from, to, pagingToken);
+    return delegate.getDiffs(from, to, pagingToken, minKey, maxKey, contentKeyPredicate);
   }
 
   @Override

diff --git a/versioned/spi/src/test/java/org/projectnessie/versioned/TestEventsVersionStore.java b/versioned/spi/src/test/java/org/projectnessie/versioned/TestEventsVersionStore.java
@@ -586,9 +586,10 @@ void testGetCommits() throws Exception {
 
   @Test
   void testGetKeys() throws Exception {
-    when(delegate.getKeys(branch1, "token1", false)).thenReturn(iteratorKeyEntries);
+    when(delegate.getKeys(branch1, "token1", false, null, null)).thenReturn(iteratorKeyEntries);
     EventsVersionStore versionStore = new EventsVersionStore(delegate, sink);
-    PaginationIterator<KeyEntry> result = versionStore.getKeys(branch1, "token1", false);
+    PaginationIterator<KeyEntry> result =
+        versionStore.getKeys(branch1, "token1", false, null, null);
     assertThat(result).isSameAs(iteratorKeyEntries);
     verifyNoMoreInteractions(delegate);
     verifyNoInteractions(sink);
@@ -617,9 +618,10 @@ void testGetValues() throws Exception {
 
   @Test
   void testGetDiffs() throws Exception {
-    when(delegate.getDiffs(hash1, hash2, "token1")).thenReturn(iteratorDiffs);
+    when(delegate.getDiffs(hash1, hash2, "token1", null, null, null)).thenReturn(iteratorDiffs);
     EventsVersionStore versionStore = new EventsVersionStore(delegate, sink);
-    PaginationIterator<Diff> result = versionStore.getDiffs(hash1, hash2, "token1");
+    PaginationIterator<Diff> result =
+        versionStore.getDiffs(hash1, hash2, "token1", null, null, null);
     assertThat(result).isSameAs(iteratorDiffs);
     verifyNoMoreInteractions(delegate);
     verifyNoInteractions(sink);