minimalist test and remove the write data level check for http

Author: azkrishpy

src/main/java/software/amazon/awssdk/crt/http/HttpClientConnection.java

@@ -88,9 +88,7 @@ public HttpStream makeRequest(HttpRequest request, HttpStreamResponseHandler str
                 new HttpStreamResponseHandlerNativeAdapter(streamHandler),
                 useManualDataWrites);
 
-        HttpStream h1Stream = (HttpStream)stream;
-        h1Stream.setHasBodyStream(request.getBodyStream() != null);
-        return h1Stream;
+        return (HttpStream)stream;
     }
 
     /**

src/main/java/software/amazon/awssdk/crt/http/HttpStream.java

@@ -16,16 +16,6 @@
  */
 public class HttpStream extends HttpStreamBase {
 
-    /**
-     * Tracks whether this stream was created with a body stream on the request.
-     * Used to guard against calling {@link #writeData} on a stream that already
-     * has a body stream — HTTP/1.1 requires exactly one body framing mechanism
-     * per message, so a body stream and manual writes cannot coexist. See
-     * {@link HttpClientConnection#makeRequest(HttpRequest, HttpStreamResponseHandler, boolean)}
-     * for details.
-     */
-    private boolean hasBodyStream = false;
-
     /*
      * Native code will call this constructor during
      * HttpClientConnection.makeRequest()
@@ -34,34 +24,6 @@ protected HttpStream(long ptr) {
         super(ptr);
     }
 
-    /**
-     * Package-private. Called by HttpClientConnection.makeRequest() to record
-     * whether the originating request had a body stream attached.
-     */
-    void setHasBodyStream(boolean hasBodyStream) {
-        this.hasBodyStream = hasBodyStream;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>This method supersedes the deprecated {@link #writeChunk} methods.
-     * Calls the base {@code writeData} method after verifying that the stream
-     * was not created with a body stream.
-     */
-    @Override
-    public void writeData(final byte[] data, boolean endStream,
-            final HttpStreamWriteDataCompletionCallback completionCallback) {
-        if (hasBodyStream) {
-            throw new IllegalStateException(
-                "Cannot call writeData() on an HTTP/1.1 stream that was created with a body stream. "
-                + "HTTP/1.1 requires exactly one body framing mechanism per message (RFC 9112, Section 6). "
-                + "A body stream and manual writeData() calls cannot coexist. "
-                + "Create the stream with useManualDataWrites=true and no body stream to use writeData().");
-        }
-        super.writeData(data, endStream, completionCallback);
-    }
-
     /**
      * Completion interface for writing chunks to an http stream
      */

src/test/java/software/amazon/awssdk/crt/test/WriteDataTest.java

@@ -284,7 +284,7 @@ public void onResponseComplete(HttpStreamBase stream, int errorCode) {
      * Tests that makeRequest throws IllegalStateException when called with both
      * a body stream and useManualDataWrites=true on an HTTP/1.1 connection.
      */
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void testHttp1MakeRequestWithBodyStreamAndManualWrites() throws Exception {
         skipIfAndroid();
         skipIfLocalhostUnavailable();
@@ -304,46 +304,26 @@ public boolean sendRequestBody(ByteBuffer bodyBytesOut) {
         // Create request WITH body stream AND useManualDataWrites=true
         HttpRequest request = new HttpRequest("PUT", "/echo", headers, bodyStream);
 
-        CompletableFuture<Void> reqCompleted = new CompletableFuture<>();
-        TestHttpResponse response = new TestHttpResponse();
-
-        CompletableFuture<Void> shutdownComplete;
         try (HttpClientConnectionManager connPool = createConnectionPoolManager(uri, HttpVersion.HTTP_1_1)) {
-            shutdownComplete = connPool.getShutdownCompleteFuture();
             try (HttpClientConnection conn = connPool.acquireConnection().get(60, TimeUnit.SECONDS)) {
 
                 HttpStreamResponseHandler streamHandler = new HttpStreamResponseHandler() {
                     @Override
                     public void onResponseHeaders(HttpStream stream, int responseStatusCode, int blockType,
-                            HttpHeader[] nextHeaders) {
-                        response.statusCode = responseStatusCode;
-                        response.headers.addAll(Arrays.asList(nextHeaders));
-                    }
-
+                            HttpHeader[] nextHeaders) {}
                     @Override
-                    public int onResponseBody(HttpStream stream, byte[] bodyBytesIn) {
-                        response.bodyBuffer.put(bodyBytesIn);
-                        return bodyBytesIn.length;
-                    }
-
+                    public int onResponseBody(HttpStream stream, byte[] bodyBytesIn) { return bodyBytesIn.length; }
                     @Override
-                    public void onResponseComplete(HttpStream stream, int errorCode) {
-                        response.onCompleteErrorCode = errorCode;
-                        reqCompleted.complete(null);
-                    }
+                    public void onResponseComplete(HttpStream stream, int errorCode) {}
                 };
 
-                HttpStream stream = conn.makeRequest(request, streamHandler, true);
-                stream.activate();
-
-                stream.writeData("hello".getBytes(StandardCharsets.UTF_8), true, null);
-
-                reqCompleted.get(60, TimeUnit.SECONDS);
-                stream.close();
+                try {
+                    conn.makeRequest(request, streamHandler, true);
+                    Assert.fail("Expected IllegalStateException from makeRequest");
+                } catch (IllegalStateException e) {
+                    Assert.assertTrue(e.getMessage().contains("manual data writes"));
+                }
             }
         }
-
-        shutdownComplete.get(60, TimeUnit.SECONDS);
-        CrtResource.waitForNoResources();
     }
 }