feedback

Author: mhl-b

server/src/main/java/org/elasticsearch/http/HttpBody.java

@@ -27,26 +27,6 @@ static Full empty() {
         return new ByteRefHttpBody(ReleasableBytesReference.empty());
     }
 
-    class NoopStream implements Stream {
-
-        @Override
-        public ChunkHandler handler() {
-            return null;
-        }
-
-        @Override
-        public void addTracingHandler(ChunkHandler chunkHandler) {}
-
-        @Override
-        public void setHandler(ChunkHandler chunkHandler) {}
-
-        @Override
-        public void next() {}
-
-        @Override
-        public void close() {}
-    }
-
     default boolean isFull() {
         return this instanceof Full;
     }

server/src/test/java/org/elasticsearch/rest/action/document/RestBulkActionTests.java

@@ -25,14 +25,14 @@
 import org.elasticsearch.common.settings.ClusterSettings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.core.Releasable;
-import org.elasticsearch.http.HttpBody;
 import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.index.IndexingPressure;
 import org.elasticsearch.rest.RestChannel;
 import org.elasticsearch.rest.RestRequest;
 import org.elasticsearch.telemetry.metric.MeterRegistry;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.test.client.NoOpNodeClient;
+import org.elasticsearch.test.rest.FakeHttpBodyStream;
 import org.elasticsearch.test.rest.FakeRestChannel;
 import org.elasticsearch.test.rest.FakeRestRequest;
 import org.elasticsearch.xcontent.XContentType;
@@ -211,7 +211,10 @@ public void testIncrementalBulkMissingContent() {
                 ClusterSettings.createBuiltInClusterSettings(),
                 new IncrementalBulkService(mock(Client.class), mock(IndexingPressure.class), MeterRegistry.NOOP)
             ).handleRequest(
-                new FakeRestRequest.Builder(xContentRegistry()).withPath("my_index/_bulk").withBody(new HttpBody.NoopStream()).build(),
+                new FakeRestRequest.Builder(xContentRegistry()).withPath("my_index/_bulk")
+                    .withContentLength(0)
+                    .withBody(new FakeHttpBodyStream())
+                    .build(),
                 mock(RestChannel.class),
                 mock(NodeClient.class)
             )
@@ -225,7 +228,7 @@ public void testIncrementalParsing() {
 
         FakeRestRequest request = new FakeRestRequest.Builder(xContentRegistry()).withPath("my_index/_bulk")
             .withMethod(RestRequest.Method.POST)
-            .withBody(new HttpBody.NoopStream() {
+            .withBody(new FakeHttpBodyStream() {
                 @Override
                 public void next() {
                     next.set(true);

test/framework/src/main/java/org/elasticsearch/test/rest/FakeRestRequest.java

@@ -117,14 +117,21 @@ public HttpRequest removeHeader(String header) {
             return new FakeHttpRequest(method, uri, body, filteredHeaders, inboundException);
         }
 
-        @Override
-        public boolean hasContent() {
+        public int contentLength() {
             return switch (body) {
-                case HttpBody.Full full -> full.bytes().length() > 0;
-                case HttpBody.Stream stream -> stream instanceof HttpBody.NoopStream == false;
+                case HttpBody.Full f -> f.bytes().length();
+                case HttpBody.Stream s -> {
+                    var len = header("Content-Length");
+                    yield len == null ? 0 : Integer.parseInt(len);
+                }
             };
         }
 
+        @Override
+        public boolean hasContent() {
+            return contentLength() > 0;
+        }
+
         @Override
         public HttpResponse createResponse(RestStatus status, BytesReference unused) {
             Map<String, String> responseHeaders = new HashMap<>();
@@ -240,6 +247,11 @@ public Builder withBody(HttpBody body) {
             return this;
         }
 
+        public Builder withContentLength(int length) {
+            headers.put("Content-Length", List.of(String.valueOf(length)));
+            return this;
+        }
+
         public Builder withPath(String path) {
             this.path = path;
             return this;