Add method to feed single JSON document

2 files changed, 56 insertions, 0 deletions

diff --git a/vespa-feed-client/src/main/java/ai/vespa/feed/client/JsonFeeder.java b/vespa-feed-client/src/main/java/ai/vespa/feed/client/JsonFeeder.java
index de32e7abdf5..746c9e0adf7 100644
--- a/vespa-feed-client/src/main/java/ai/vespa/feed/client/JsonFeeder.java
+++ b/vespa-feed-client/src/main/java/ai/vespa/feed/client/JsonFeeder.java
@@ -74,6 +74,31 @@ public class JsonFeeder implements Closeable {
 
     public static Builder builder(FeedClient client) { return new Builder(client); }
 
+    /** Feeds single JSON feed operations on the form
+     *  <pre>
+     *    {
+     *      "id": "id:ns:type::boo",
+     *      "fields": { ... document fields ... }
+     *    }
+     *  </pre>
+     */
+    public CompletableFuture<Result> feedSingle(String json) {
+        CompletableFuture<Result> result = new CompletableFuture<>();
+        try {
+            SingleOperationParserAndExecutor parser = new SingleOperationParserAndExecutor(json.getBytes(UTF_8));
+            parser.next().whenCompleteAsync((operationResult, error) -> {
+                if (error != null) {
+                    result.completeExceptionally(error);
+                } else {
+                    result.complete(operationResult);
+                }
+            }, resultExecutor);
+        } catch (Exception e) {
+            resultExecutor.execute(() -> result.completeExceptionally(e));
+        }
+        return result;
+    }
+
     /** Feeds a stream containing a JSON array of feed operations on the form
      * <pre>
      *     [
@@ -288,6 +313,21 @@ public class JsonFeeder implements Closeable {
         }
     }
 
+    private class SingleOperationParserAndExecutor extends OperationParserAndExecutor {
+
+        private final byte[] json;
+
+        SingleOperationParserAndExecutor(byte[] json) throws IOException {
+            super(factory.createParser(json), false);
+            this.json = json;
+        }
+
+        @Override
+        String getDocumentJson(long start, long end) {
+            return new String(json, (int) start, (int) (end - start), UTF_8);
+        }
+    }
+
     private abstract class OperationParserAndExecutor {
 
         private final JsonParser parser;
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/JsonFeederTest.java
index 17a0d40a370..03194e23d47 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/JsonFeederTest.java
@@ -11,6 +11,7 @@ import java.nio.file.StandardOpenOption;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
@@ -75,6 +76,21 @@ class JsonFeederTest {
         }
     }
 
+    @Test
+    public void singleJsonOperationIsDispatchedToFeedClient() throws IOException, ExecutionException, InterruptedException {
+        try (JsonFeeder feeder = JsonFeeder.builder(new SimpleClient()).build()) {
+            String json = "{\"put\": \"id:ns:type::abc1\",\n" +
+                    "    \"fields\": {\n" +
+                    "      \"lul\":\"lal\"\n" +
+                    "    }\n" +
+                    "  }\n";
+            Result result = feeder.feedSingle(json).get();
+            assertEquals(DocumentId.of("id:ns:type::abc1"), result.documentId());
+            assertEquals(Result.Type.success, result.type());
+            assertEquals("success", result.resultMessage().get());
+        }
+    }
+
     private static class SimpleClient implements FeedClient {
         final Set<String> ids = new HashSet<>();