Revert "Bjorncs/json feeder"

1 files changed, 8 insertions, 27 deletions

diff --git a/vespa-feed-client/src/test/java/ai/vespa/feed/client/JsonFeederTest.java b/vespa-feed-client/src/test/java/ai/vespa/feed/client/JsonStreamFeederTest.java
index 0f14f9ab4be..28a50b88396 100644
--- a/vespa-feed-client/src/test/java/ai/vespa/feed/client/JsonFeederTest.java
+++ b/vespa-feed-client/src/test/java/ai/vespa/feed/client/JsonStreamFeederTest.java
@@ -5,21 +5,16 @@ import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentSkipListSet;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.IntStream;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.stream.Collectors.joining;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
-class JsonFeederTest {
+class JsonStreamFeederTest {
 
     @Test
     void test() throws IOException {
@@ -43,46 +38,32 @@ class JsonFeederTest {
                       "  }\n" +
                       "]";
         ByteArrayInputStream in = new ByteArrayInputStream(json.getBytes(UTF_8));
-        Set<String> ids = new ConcurrentSkipListSet<>();
-        AtomicInteger resultsReceived = new AtomicInteger();
-        AtomicBoolean completedSuccessfully = new AtomicBoolean();
-        AtomicReference<Throwable> exceptionThrow = new AtomicReference<>();
+        Set<String> ids = new HashSet<>();
         long startNanos = System.nanoTime();
-        JsonFeeder.builder(new FeedClient() {
+        JsonStreamFeeder.builder(new FeedClient() {
 
             @Override
             public CompletableFuture<Result> put(DocumentId documentId, String documentJson, OperationParameters params) {
                 ids.add(documentId.userSpecific());
-                return createSuccessResult(documentId);
+                return new CompletableFuture<>();
             }
 
             @Override
             public CompletableFuture<Result> update(DocumentId documentId, String updateJson, OperationParameters params) {
-                return createSuccessResult(documentId);
+                return new CompletableFuture<>();
             }
 
             @Override
             public CompletableFuture<Result> remove(DocumentId documentId, OperationParameters params) {
-                return createSuccessResult(documentId);
+                return new CompletableFuture<>();
             }
 
             @Override
             public void close(boolean graceful) { }
 
-            private CompletableFuture<Result> createSuccessResult(DocumentId documentId) {
-                return CompletableFuture.completedFuture(new Result(Result.Type.success, documentId, "success", null));
-            }
-
-        }).build().feedMany(in, 1 << 7, new JsonFeeder.ResultCallback() {
-            @Override public void onNextResult(Result result, Throwable error) { resultsReceived.incrementAndGet(); }
-            @Override public void onError(Throwable error) { exceptionThrow.set(error); }
-            @Override public void onComplete() { completedSuccessfully.set(true); }
-        }).join(); // TODO: hangs when buffer is smaller than largest document
+        }).build().feed(in, 1 << 7, false); // TODO: hangs when buffer is smaller than largest document
         System.err.println((json.length() / 1048576.0) + " MB in " + (System.nanoTime() - startNanos) * 1e-9 + " seconds");
         assertEquals(docs + 1, ids.size());
-        assertEquals(docs + 1, resultsReceived.get());
-        assertTrue(completedSuccessfully.get());
-        assertNull(exceptionThrow.get());
     }
 
 }