1 files changed, 85 insertions, 0 deletions
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/StreamReaderV3.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/StreamReaderV3.java
new file mode 100644
index 00000000000..4ddc430b35f
--- /dev/null
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/StreamReaderV3.java
@@ -0,0 +1,85 @@
+// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vespa.http.server;
+
+import com.yahoo.container.jdisc.HttpRequest;
+import com.yahoo.document.DocumentTypeManager;
+import com.yahoo.vespa.http.client.core.Encoder;
+import com.yahoo.vespa.http.server.util.ByteLimitedInputStream;
+import com.yahoo.vespaxmlparser.FeedOperation;
+import com.yahoo.vespaxmlparser.FeedReader;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Optional;
+import java.util.logging.Logger;
+import java.util.zip.GZIPInputStream;
+
+/**
+ * This code is based on v2 code, but restructured so stream reading code is in one dedicated class.
+ * @author dybis
+ */
+public class StreamReaderV3 {
+
+    protected static final Logger log = Logger.getLogger(StreamReaderV3.class.getName());
+
+    private final FeedReaderFactory feedReaderFactory;
+    private final DocumentTypeManager docTypeManager;
+
+    public StreamReaderV3(FeedReaderFactory feedReaderFactory, DocumentTypeManager docTypeManager) {
+        this.feedReaderFactory = feedReaderFactory;
+        this.docTypeManager = docTypeManager;
+    }
+
+    public FeedOperation getNextOperation(InputStream requestInputStream, FeederSettings settings) throws Exception {
+        FeedOperation op = null;
+
+        int length = readByteLength(requestInputStream);
+
+        try (InputStream limitedInputStream = new ByteLimitedInputStream(requestInputStream, length)){
+            FeedReader reader = feedReaderFactory.createReader(limitedInputStream, docTypeManager, settings.dataFormat);
+            op = reader.read();
+        }
+        return op;
+    }
+
+    public Optional<String> getNextOperationId(InputStream requestInputStream) throws IOException {
+        StringBuilder idBuf = new StringBuilder(100);
+        int c;
+        while ((c = requestInputStream.read()) != -1) {
+            if (c == 32) {
+                break;
+            }
+            idBuf.append((char) c);  //it's ASCII
+        }
+        if (idBuf.length() == 0) {
+            return Optional.empty();
+        }
+        return Optional.of(Encoder.decode(idBuf.toString(), new StringBuilder(idBuf.length())).toString());
+    }
+
+    private int readByteLength(InputStream requestInputStream) throws IOException {
+        StringBuilder lenBuf = new StringBuilder(8);
+        int c;
+        while ((c = requestInputStream.read()) != -1) {
+            if (c == 10) {
+                break;
+            }
+            lenBuf.append((char) c);  //it's ASCII
+        }
+        if (lenBuf.length() == 0) {
+            throw new IllegalStateException("Operation length missing.");
+        }
+        return Integer.valueOf(lenBuf.toString(), 16);
+    }
+
+    public static InputStream unzipStreamIfNeeded(final HttpRequest httpRequest)
+            throws IOException {
+        final String contentEncodingHeader = httpRequest.getHeader("content-encoding");
+        if ("gzip".equals(contentEncodingHeader)) {
+            return new GZIPInputStream(httpRequest.getData());
+        } else {
+            return httpRequest.getData();
+        }
+    }
+
+}