replace HTTP request content in place

Author: mhl-b

modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpRequest.java

@@ -40,7 +40,7 @@ public class Netty4HttpRequest implements HttpRequest {
 
     private final int sequence;
     private final io.netty.handler.codec.http.HttpRequest nettyRequest;
-    private final HttpBody content;
+    private HttpBody content;
     private final Map<String, List<String>> headers;
     private final AtomicBoolean released;
     private final Exception inboundException;
@@ -92,18 +92,12 @@ public HttpBody body() {
     }
 
     @Override
-    public HttpRequest setBody(HttpBody body) {
-        var nettyRequestCopy = new DefaultHttpRequest(
-            nettyRequest.protocolVersion(),
-            nettyRequest.method(),
-            nettyRequest.uri(),
-            nettyRequest.headers()
-        );
+    public void setBody(HttpBody body) {
         if (body.isFull()) {
             var contentLength = body.asFull().bytes().length();
-            HttpUtil.setContentLength(nettyRequestCopy, contentLength);
+            HttpUtil.setContentLength(nettyRequest, contentLength);
         }
-        return new Netty4HttpRequest(sequence, nettyRequestCopy, body);
+        this.content = body;
     }
 
     @Override

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

@@ -30,7 +30,7 @@ enum HttpVersion {
 
     HttpBody body();
 
-    default HttpRequest setBody(HttpBody body) {
+    default void setBody(HttpBody body) {
         throw new UnsupportedOperationException("not implemented");
     }
 

server/src/main/java/org/elasticsearch/rest/RestRequest.java

@@ -118,12 +118,6 @@ protected RestRequest(
         this(parserConfig, params, rawPath, headers, httpRequest, httpChannel, requestIdGenerator.incrementAndGet());
     }
 
-    static RestRequest withHttpRequest(RestRequest restRequest, HttpRequest httpRequest) {
-        var requestCopy = new RestRequest(restRequest);
-        requestCopy.httpRequest = httpRequest;
-        return requestCopy;
-    }
-
     @SuppressWarnings("this-escape")
     private RestRequest(
         XContentParserConfiguration parserConfig,

server/src/main/java/org/elasticsearch/rest/RestRequestAggregator.java

@@ -26,17 +26,17 @@ public RestRequestAggregator(CircuitBreakerService circuitBreakerService) {
         this.circuitBreakerService = circuitBreakerService;
     }
 
-    private static RestRequest replaceBody(RestRequest restRequest, ReleasableBytesReference aggregate) {
-        var aggregatedHttpRequest = restRequest.getHttpRequest().setBody(new HttpBody.ByteRefHttpBody(aggregate));
-        return RestRequest.withHttpRequest(restRequest, aggregatedHttpRequest);
+    private static void replaceBody(RestRequest restRequest, ReleasableBytesReference aggregate) {
+        restRequest.getHttpRequest().setBody(new HttpBody.ByteRefHttpBody(aggregate));
     }
 
     public void aggregate(RestRequest restRequest, RestChannel restChannel, Consumer<RestRequest> result) {
         if (restRequest.isFullContent()) {
             result.accept(restRequest);
         } else if (restRequest.contentLength() == 0) {
             restRequest.getHttpRequest().body().asStream().close();
-            result.accept(replaceBody(restRequest, ReleasableBytesReference.empty()));
+            replaceBody(restRequest, ReleasableBytesReference.empty());
+            result.accept(restRequest);
         } else {
             final var stream = restRequest.getHttpRequest().body().asStream();
             final var aggregationHandler = new AggregationChunkHandler(restRequest, result);
@@ -72,11 +72,13 @@ public void onNext(ReleasableBytesReference chunk, boolean isLast) {
                 stream.next();
             } else {
                 if (chunks == null) {
-                    result.accept(replaceBody(restRequest, chunk));
+                    replaceBody(restRequest, chunk);
+                    result.accept(restRequest);
                 } else {
                     var comp = CompositeBytesReference.of(chunks.toArray(new ReleasableBytesReference[0]));
                     var relComp = new ReleasableBytesReference(comp, Releasables.wrap(chunks));
-                    result.accept(replaceBody(restRequest, relComp));
+                    replaceBody(restRequest, relComp);
+                    result.accept(restRequest);
                 }
             }
         }