cleanup

Author: mhl-b

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

@@ -332,6 +332,8 @@ public HttpBody.Stream contentStream() {
     public void ensureContent() {
         if (hasContent() == false) {
             throw new ElasticsearchParseException("request body is required");
+        } else if (xContentType.get() == null) {
+            throwValidationException("unknown content type");
         }
     }
 
@@ -341,9 +343,6 @@ public void ensureContent() {
      */
     public ReleasableBytesReference requiredContent() {
         ensureContent();
-        if (xContentType.get() == null) {
-            throwValidationException("unknown content type");
-        }
         return content();
     }
 

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

@@ -117,26 +117,12 @@ public HttpRequest removeHeader(String header) {
             return new FakeHttpRequest(method, uri, body, filteredHeaders, inboundException);
         }
 
-        public int contentLength() {
-            return Integer.parseInt(headers.getOrDefault("Content-Length", List.of("0")).getFirst());
-        }
-
-        public void setContentLength(int contentLength) {
-            headers.put("Content-Length", List.of(String.valueOf(contentLength)));
-        }
-
-        public void setContentLength(HttpBody body) {
-            if (body.isFull()) {
-                var len = body.asFull().bytes().length();
-                if (len > 0) {
-                    setContentLength(body.asFull().bytes().length());
-                }
-            }
-        }
-
         @Override
         public boolean hasContent() {
-            return contentLength() > 0;
+            return switch (body) {
+                case HttpBody.Full full -> full.bytes().length() > 0;
+                case HttpBody.Stream stream -> stream instanceof HttpBody.NoopStream == false;
+            };
         }
 
         @Override
@@ -232,7 +218,7 @@ public Builder(NamedXContentRegistry registry) {
         }
 
         public Builder withHeaders(Map<String, List<String>> headers) {
-            this.headers = new HashMap<>(headers);
+            this.headers = headers;
             return this;
         }
 
@@ -276,7 +262,6 @@ public Builder withInboundException(Exception exception) {
 
         public FakeRestRequest build() {
             FakeHttpRequest fakeHttpRequest = new FakeHttpRequest(method, path, content, headers, inboundException);
-            fakeHttpRequest.setContentLength(content);
             return new FakeRestRequest(parserConfig, fakeHttpRequest, params, new FakeHttpChannel(address));
         }
     }