content length override changes

Author: Local Merge

sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobsDownloadHeaders.java

@@ -301,11 +301,6 @@ public final class BlobsDownloadHeaders {
     @Generated
     private byte[] xMsContentCrc64;
 
-    /*
-     * The x-ms-original-content-length property.
-     */
-    private Long xMsOriginalContentLength;
-
     private static final HttpHeaderName X_MS_CREATION_TIME = HttpHeaderName.fromString("x-ms-creation-time");
 
     private static final HttpHeaderName X_MS_OR_POLICY_ID = HttpHeaderName.fromString("x-ms-or-policy-id");
@@ -374,9 +369,6 @@ public final class BlobsDownloadHeaders {
 
     private static final HttpHeaderName X_MS_CONTENT_CRC64 = HttpHeaderName.fromString("x-ms-content-crc64");
 
-    private static final HttpHeaderName X_MS_ORIGINAL_CONTENT_LENGTH
-        = HttpHeaderName.fromString("x-ms-original-content-length");
-
     // HttpHeaders containing the raw property values.
     /**
      * Creates an instance of BlobsDownloadHeaders class.
@@ -543,12 +535,6 @@ public BlobsDownloadHeaders(HttpHeaders rawHeaders) {
         } else {
             this.xMsContentCrc64 = null;
         }
-        String xMsOriginalContentLength = rawHeaders.getValue(X_MS_ORIGINAL_CONTENT_LENGTH);
-        if (xMsOriginalContentLength != null) {
-            this.xMsOriginalContentLength = Long.parseLong(xMsOriginalContentLength);
-        } else {
-            this.xMsOriginalContentLength = null;
-        }
         Map<String, String> xMsMetaHeaderCollection = new LinkedHashMap<>();
         Map<String, String> xMsOrHeaderCollection = new LinkedHashMap<>();
 
@@ -1619,24 +1605,4 @@ public BlobsDownloadHeaders setXMsContentCrc64(byte[] xMsContentCrc64) {
         this.xMsContentCrc64 = CoreUtils.clone(xMsContentCrc64);
         return this;
     }
-
-    /**
-     * Get the xMsOriginalContentLength property: The wire size of the encoded structured message body before decoding.
-     *
-     * @return the xMsOriginalContentLength value.
-     */
-    public Long getXMsOriginalContentLength() {
-        return this.xMsOriginalContentLength;
-    }
-
-    /**
-     * Set the xMsOriginalContentLength property: The wire size of the encoded structured message body before decoding.
-     *
-     * @param xMsOriginalContentLength the xMsOriginalContentLength value to set.
-     * @return the BlobsDownloadHeaders object itself.
-     */
-    public BlobsDownloadHeaders setXMsOriginalContentLength(Long xMsOriginalContentLength) {
-        this.xMsOriginalContentLength = xMsOriginalContentLength;
-        return this;
-    }
 }

sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/BlobDownloadHeaders.java

@@ -1045,24 +1045,4 @@ public BlobDownloadHeaders setCreationTime(OffsetDateTime creationTime) {
         return this;
     }
 
-    /**
-     * Get the originalContentLength property: The wire size of the encoded structured message body before decoding.
-     * Only present when content validation is active and the response was decoded transparently.
-     *
-     * @return the originalContentLength value.
-     */
-    public Long getOriginalContentLength() {
-        return internalHeaders.getXMsOriginalContentLength();
-    }
-
-    /**
-     * Set the originalContentLength property: The wire size of the encoded structured message body before decoding.
-     *
-     * @param originalContentLength the originalContentLength value to set.
-     * @return the BlobDownloadHeaders object itself.
-     */
-    public BlobDownloadHeaders setOriginalContentLength(Long originalContentLength) {
-        internalHeaders.setXMsOriginalContentLength(originalContentLength);
-        return this;
-    }
 }

sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/implementation/Constants.java

@@ -264,11 +264,6 @@ public static final class HeaderConstants {
         public static final HttpHeaderName STRUCTURED_CONTENT_LENGTH_HEADER_NAME
             = HttpHeaderName.fromString(STRUCTURED_CONTENT_LENGTH);
 
-        public static final String ORIGINAL_CONTENT_LENGTH = "x-ms-original-content-length";
-
-        public static final HttpHeaderName ORIGINAL_CONTENT_LENGTH_HEADER_NAME
-            = HttpHeaderName.fromString(ORIGINAL_CONTENT_LENGTH);
-
         /**
          * Metadata key ("hdi_isfolder") used to mark virtual directories in Azure Blob Storage.
          *

sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/policy/DecodedResponse.java

@@ -8,7 +8,6 @@
 import com.azure.core.http.HttpResponse;
 import com.azure.core.util.CoreUtils;
 import com.azure.core.util.FluxUtil;
-import com.azure.storage.common.implementation.Constants;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -33,23 +32,19 @@ class DecodedResponse extends HttpResponse {
      * Wraps {@code httpResponse} with a body backed by {@code decodedBody}.
      *
      * <p>{@code Content-Length} is overridden to {@code decodedContentLength} so callers see the size of the bytes
-     * they will actually read. The original wire size is preserved in {@code x-ms-original-content-length}.</p>
+     * they will actually read from the decoded payload, not the larger wire size of the structured message.</p>
      *
      * @param httpResponse The original response from the storage service.
      * @param decodedBody The Flux of CRC-validated, framing-stripped payload bytes produced by the decoder pipeline.
-     * @param originalContentLength The wire size of the encoded structured message body.
      * @param decodedContentLength The size of the decoded payload that callers will consume.
      */
-    DecodedResponse(HttpResponse httpResponse, Flux<ByteBuffer> decodedBody, long originalContentLength,
-        long decodedContentLength) {
+    DecodedResponse(HttpResponse httpResponse, Flux<ByteBuffer> decodedBody, long decodedContentLength) {
         super(httpResponse.getRequest());
         this.originalResponse = httpResponse;
         this.decodedBody = decodedBody;
         HttpHeaders headers = new HttpHeaders();
         httpResponse.getHeaders().stream().forEach(h -> headers.set(h.getName(), h.getValue()));
         headers.set(HttpHeaderName.CONTENT_LENGTH, String.valueOf(decodedContentLength));
-        headers.set(Constants.HeaderConstants.ORIGINAL_CONTENT_LENGTH_HEADER_NAME,
-            String.valueOf(originalContentLength));
         this.adjustedHeaders = headers;
     }
 

sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/policy/StorageContentValidationDecoderPolicy.java

@@ -74,13 +74,16 @@ public Mono<HttpResponse> process(HttpPipelineCallContext context, HttpPipelineN
             validateStructuredMessageHeaders(httpResponse);
 
             Long decodedContentLength = getStructuredContentLength(httpResponse.getHeaders());
+            if (decodedContentLength == null) {
+                throw LOGGER.logExceptionAsError(new IllegalStateException(
+                    "x-ms-structured-content-length header is present but could not be parsed as a long."));
+            }
 
             // Fresh decoder per response so retries each get a clean state machine.
             StructuredMessageDecoder decoder = new StructuredMessageDecoder(contentLength);
 
             Flux<ByteBuffer> decodedStream = decodeStream(httpResponse.getBody(), decoder);
-            // decodedContentLength is guaranteed non-null here: validateStructuredMessageHeaders confirmed its presence.
-            return new DecodedResponse(httpResponse, decodedStream, contentLength, decodedContentLength);
+            return new DecodedResponse(httpResponse, decodedStream, decodedContentLength);
         });
     }
 

sdk/storage/azure-storage-common/src/test/java/com/azure/storage/common/policy/DecodedResponseTests.java

@@ -10,7 +10,6 @@
 import com.azure.core.http.HttpResponse;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.core.util.BinaryData;
-import com.azure.storage.common.implementation.Constants;
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
@@ -65,7 +64,7 @@ public void preservesRequestStatusCodeAndHeaders() {
         HttpHeaders h = new HttpHeaders().set(HttpHeaderName.CONTENT_LENGTH, "100").set(CUSTOM_HEADER, "value");
         MockHttpResponse original = mockResponse(206, h, bytes("encoded"));
 
-        DecodedResponse wrapper = new DecodedResponse(original, fluxOf(bytes("decoded")), 100L, 80L);
+        DecodedResponse wrapper = new DecodedResponse(original, fluxOf(bytes("decoded")), 80L);
 
         assertSame(original.getRequest(), wrapper.getRequest());
         assertEquals(206, wrapper.getStatusCode());
@@ -77,7 +76,7 @@ public void preservesRequestStatusCodeAndHeaders() {
     @Test
     public void getHeaderValueByStringReturnsHeaderValue() {
         HttpHeaders h = headers(CUSTOM_HEADER, "value");
-        DecodedResponse wrapper = new DecodedResponse(mockResponse(200, h, new byte[0]), fluxOf(new byte[0]), 0L, 0L);
+        DecodedResponse wrapper = new DecodedResponse(mockResponse(200, h, new byte[0]), fluxOf(new byte[0]), 0L);
 
         assertEquals("value", wrapper.getHeaderValue(CUSTOM_HEADER.getCaseInsensitiveName()));
         assertNull(wrapper.getHeaderValue("nonexistent"));
@@ -87,7 +86,7 @@ public void getHeaderValueByStringReturnsHeaderValue() {
     public void getBodyReturnsDecodedFlux() {
         byte[] decoded = bytes("decoded body");
         DecodedResponse wrapper
-            = new DecodedResponse(mockResponse(200, new HttpHeaders(), bytes("encoded")), fluxOf(decoded), 0L, 0L);
+            = new DecodedResponse(mockResponse(200, new HttpHeaders(), bytes("encoded")), fluxOf(decoded), 0L);
 
         StepVerifier.create(wrapper.getBody().reduce(new ByteArrayOutputStream(), (sink, buf) -> {
             byte[] copy = new byte[buf.remaining()];
@@ -101,7 +100,7 @@ public void getBodyReturnsDecodedFlux() {
     public void getBodyAsByteArrayReturnsDecodedBytes() {
         byte[] decoded = bytes("decoded body");
         DecodedResponse wrapper
-            = new DecodedResponse(mockResponse(200, new HttpHeaders(), bytes("encoded")), fluxOf(decoded), 0L, 0L);
+            = new DecodedResponse(mockResponse(200, new HttpHeaders(), bytes("encoded")), fluxOf(decoded), 0L);
 
         StepVerifier.create(wrapper.getBodyAsByteArray())
             .expectNextMatches(b -> Arrays.equals(decoded, b))
@@ -114,7 +113,7 @@ public void getBodyAsStringDefaultsToUtf8WhenNoCharsetSpecified() {
         // BOM nor a Content-Type charset parameter is present. This test pins the "no headers, no BOM" path.
         String text = "héllo wörld – ✓";
         DecodedResponse wrapper = new DecodedResponse(mockResponse(200, new HttpHeaders(), new byte[0]),
-            fluxOf(text.getBytes(StandardCharsets.UTF_8)), 0L, 0L);
+            fluxOf(text.getBytes(StandardCharsets.UTF_8)), 0L);
 
         StepVerifier.create(wrapper.getBodyAsString()).expectNext(text).verifyComplete();
     }
@@ -127,7 +126,7 @@ public void getBodyAsStringHonorsCharsetFromContentTypeHeader() {
         String text = "ümlaut";
         byte[] iso = text.getBytes(StandardCharsets.ISO_8859_1);
         HttpHeaders h = new HttpHeaders().set(HttpHeaderName.CONTENT_TYPE, "text/plain; charset=ISO-8859-1");
-        DecodedResponse wrapper = new DecodedResponse(mockResponse(200, h, new byte[0]), fluxOf(iso), 0L, 0L);
+        DecodedResponse wrapper = new DecodedResponse(mockResponse(200, h, new byte[0]), fluxOf(iso), 0L);
 
         StepVerifier.create(wrapper.getBodyAsString()).expectNext(text).verifyComplete();
     }
@@ -143,7 +142,7 @@ public void getBodyAsStringDetectsUtf8BomAndStripsIt() {
         System.arraycopy(bom, 0, withBom, 0, bom.length);
         System.arraycopy(payload, 0, withBom, bom.length, payload.length);
         DecodedResponse wrapper
-            = new DecodedResponse(mockResponse(200, new HttpHeaders(), new byte[0]), fluxOf(withBom), 0L, 0L);
+            = new DecodedResponse(mockResponse(200, new HttpHeaders(), new byte[0]), fluxOf(withBom), 0L);
 
         StepVerifier.create(wrapper.getBodyAsString()).expectNext(text).verifyComplete();
     }
@@ -153,7 +152,7 @@ public void getBodyAsStringDecodesUsingProvidedCharset() {
         String text = "ümlaut";
         byte[] latin1 = text.getBytes(StandardCharsets.ISO_8859_1);
         DecodedResponse wrapper
-            = new DecodedResponse(mockResponse(200, new HttpHeaders(), new byte[0]), fluxOf(latin1), 0L, 0L);
+            = new DecodedResponse(mockResponse(200, new HttpHeaders(), new byte[0]), fluxOf(latin1), 0L);
 
         StepVerifier.create(wrapper.getBodyAsString(StandardCharsets.ISO_8859_1)).expectNext(text).verifyComplete();
     }
@@ -163,7 +162,7 @@ public void inheritedGetBodyAsInputStreamUsesDecodedBytes() throws IOException {
         // Base getBodyAsInputStream() routes through getBodyAsByteArray(), so the override is exercised end-to-end.
         byte[] decoded = bytes("decoded stream");
         DecodedResponse wrapper
-            = new DecodedResponse(mockResponse(200, new HttpHeaders(), bytes("encoded")), fluxOf(decoded), 0L, 0L);
+            = new DecodedResponse(mockResponse(200, new HttpHeaders(), bytes("encoded")), fluxOf(decoded), 0L);
 
         try (InputStream stream = wrapper.getBodyAsInputStream().block()) {
             assertNotNull(stream);
@@ -175,7 +174,7 @@ public void inheritedGetBodyAsInputStreamUsesDecodedBytes() throws IOException {
     public void inheritedWriteBodyToWritesDecodedBytes() throws IOException {
         byte[] decoded = bytes("write me");
         DecodedResponse wrapper
-            = new DecodedResponse(mockResponse(200, new HttpHeaders(), bytes("encoded")), fluxOf(decoded), 0L, 0L);
+            = new DecodedResponse(mockResponse(200, new HttpHeaders(), bytes("encoded")), fluxOf(decoded), 0L);
 
         ByteArrayOutputStream sink = new ByteArrayOutputStream();
         try (WritableByteChannel channel = Channels.newChannel(sink)) {
@@ -189,7 +188,7 @@ public void inheritedWriteBodyToWritesDecodedBytes() throws IOException {
     public void inheritedBufferReturnsResponseBackedByDecodedBytes() {
         byte[] decoded = bytes("buffered");
         DecodedResponse wrapper
-            = new DecodedResponse(mockResponse(200, new HttpHeaders(), bytes("encoded")), fluxOf(decoded), 0L, 0L);
+            = new DecodedResponse(mockResponse(200, new HttpHeaders(), bytes("encoded")), fluxOf(decoded), 0L);
 
         HttpResponse buffered = wrapper.buffer();
         assertNotNull(buffered);
@@ -204,30 +203,29 @@ public void inheritedGetBodyAsBinaryDataReturnsDecodedBytes() {
         // must contain the decoded payload, not the original wire body. A divergent Content-Length header is set
         // to make the wire vs decoded distinction explicit and guard against regressions in header forwarding.
         byte[] decoded = bytes("decoded payload");
-        long originalSize = decoded.length + 32;
-        HttpHeaders h = new HttpHeaders().set(HttpHeaderName.CONTENT_LENGTH, String.valueOf(originalSize));
-        DecodedResponse wrapper = new DecodedResponse(mockResponse(200, h, bytes("encoded wire body")), fluxOf(decoded),
-            originalSize, decoded.length);
+        long decodedSize = decoded.length;
+        HttpHeaders h = new HttpHeaders().set(HttpHeaderName.CONTENT_LENGTH, String.valueOf(decodedSize + 32));
+        DecodedResponse wrapper
+            = new DecodedResponse(mockResponse(200, h, bytes("encoded wire body")), fluxOf(decoded), decodedSize);
 
         BinaryData data = wrapper.getBodyAsBinaryData();
         assertNotNull(data);
         assertArrayEquals(decoded, data.toBytes());
     }
 
     @Test
-    public void contentLengthIsOverriddenToDecodedSizeAndOriginalIsPreserved() {
-        long originalSize = 500L;
+    public void contentLengthIsOverriddenToDecodedSize() {
+        long wireSize = 500L;
         long decodedSize = 300L;
-        HttpHeaders h = new HttpHeaders().set(HttpHeaderName.CONTENT_LENGTH, String.valueOf(originalSize))
+        HttpHeaders h = new HttpHeaders()
+            .set(HttpHeaderName.CONTENT_LENGTH, String.valueOf(wireSize))
             .set(CUSTOM_HEADER, "preserve-me");
-        DecodedResponse wrapper
-            = new DecodedResponse(mockResponse(200, h, new byte[0]), fluxOf(new byte[0]), originalSize, decodedSize);
+        DecodedResponse wrapper = new DecodedResponse(mockResponse(200, h, new byte[0]), fluxOf(new byte[0]),
+            decodedSize);
 
         assertEquals(String.valueOf(decodedSize), wrapper.getHeaders().getValue(HttpHeaderName.CONTENT_LENGTH));
-        assertEquals(String.valueOf(originalSize),
-            wrapper.getHeaders().getValue(Constants.HeaderConstants.ORIGINAL_CONTENT_LENGTH_HEADER_NAME));
         assertEquals("preserve-me", wrapper.getHeaders().getValue(CUSTOM_HEADER));
-        // Deprecated getHeaderValue must reflect the same overrides.
+        // Deprecated getHeaderValue must reflect the same override.
         assertEquals(String.valueOf(decodedSize),
             wrapper.getHeaderValue(HttpHeaderName.CONTENT_LENGTH.getCaseInsensitiveName()));
     }