Mirror tests from google java client and added more descriptive error messages.

Author: jonathanedey

src/main/java/com/google/firebase/internal/ApacheHttp2AsyncEntityProducer.java

@@ -1,6 +1,23 @@
+/*
+ * Copyright 2024 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.google.firebase.internal;
 
 import com.google.api.client.util.StreamingContent;
+import com.google.common.annotations.VisibleForTesting;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -15,8 +32,9 @@
 
 @SuppressWarnings("deprecation")
 public class ApacheHttp2AsyncEntityProducer implements AsyncEntityProducer {
-  private final ByteBuffer bytebuf;
-  private ByteArrayOutputStream baos = new ByteArrayOutputStream();
+  private ByteBuffer bytebuf;
+  private ByteArrayOutputStream baos;
+  private final StreamingContent content;
   private final ContentType contentType;
   private final long contentLength;
   private final String contentEncoding;
@@ -25,19 +43,14 @@ public class ApacheHttp2AsyncEntityProducer implements AsyncEntityProducer {
 
   public ApacheHttp2AsyncEntityProducer(StreamingContent content, ContentType contentType,
       String contentEncoding, long contentLength, CompletableFuture<Void> writeFuture) {
-    this.writeFuture = writeFuture;
-
-    if (content != null) {
-      try {
-        content.writeTo(baos);
-      } catch (IOException e) {
-        writeFuture.completeExceptionally(e);
-      }
-    }
-    this.bytebuf = ByteBuffer.wrap(baos.toByteArray());
+    this.content = content;
     this.contentType = contentType;
-    this.contentLength = contentLength;
     this.contentEncoding = contentEncoding;
+    this.contentLength = contentLength;
+    this.writeFuture = writeFuture;
+    this.bytebuf = null;
+
+    this.baos = new ByteArrayOutputStream((int) (contentLength < 0 ? 0 : contentLength));
     this.exception = new AtomicReference<>();
   }
 
@@ -53,7 +66,7 @@ public ApacheHttp2AsyncEntityProducer(ApacheHttp2Request request,
 
   @Override
   public boolean isRepeatable() {
-    return false;
+    return true;
   }
 
   @Override
@@ -78,7 +91,7 @@ public String getContentEncoding() {
 
   @Override
   public boolean isChunked() {
-    return false;
+    return contentLength == -1;
   }
 
   @Override
@@ -88,12 +101,27 @@ public Set<String> getTrailerNames() {
 
   @Override
   public void produce(DataStreamChannel channel) throws IOException {
+    if (bytebuf == null) {
+      if (content != null) {
+        try {
+          content.writeTo(baos);
+        } catch (IOException e) {
+          writeFuture.completeExceptionally(e);
+          // failed(e);
+        }
+      }
+
+      this.bytebuf = ByteBuffer.wrap(baos.toByteArray());
+    }
+
     if (bytebuf.hasRemaining()) {
       channel.write(bytebuf);
     }
+
     if (!bytebuf.hasRemaining()) {
       channel.endStream();
       writeFuture.complete(null);
+      releaseResources();
     }
   }
 
@@ -113,4 +141,9 @@ public final Exception getException() {
   public void releaseResources() {
     bytebuf.clear();
   }
+
+  @VisibleForTesting
+  ByteBuffer getBytebuf() {
+    return bytebuf;
+  }
 }

src/main/java/com/google/firebase/internal/ApacheHttp2Request.java

@@ -1,14 +1,34 @@
+/*
+ * Copyright 2024 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.google.firebase.internal;
 
 import com.google.api.client.http.LowLevelHttpRequest;
 import com.google.api.client.http.LowLevelHttpResponse;
+import com.google.common.annotations.VisibleForTesting;
 
 import java.io.IOException;
+import java.util.concurrent.CancellationException;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
+import org.apache.hc.client5.http.ConnectTimeoutException;
 import org.apache.hc.client5.http.async.methods.SimpleHttpRequest;
 import org.apache.hc.client5.http.async.methods.SimpleHttpResponse;
 import org.apache.hc.client5.http.async.methods.SimpleRequestBuilder;
@@ -17,6 +37,7 @@
 import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient;
 import org.apache.hc.core5.concurrent.FutureCallback;
 import org.apache.hc.core5.http.nio.support.BasicRequestProducer;
+import org.apache.hc.core5.http2.H2StreamResetException;
 import org.apache.hc.core5.util.Timeout;
 
 final class ApacheHttp2Request extends LowLevelHttpRequest {
@@ -25,6 +46,7 @@ final class ApacheHttp2Request extends LowLevelHttpRequest {
   private SimpleHttpRequest request;
   private final RequestConfig.Builder requestConfig;
   private int writeTimeout;
+  private ApacheHttp2AsyncEntityProducer entityProducer;
 
   ApacheHttp2Request(
       CloseableHttpAsyncClient httpAsyncClient, SimpleRequestBuilder requestBuilder) {
@@ -33,7 +55,7 @@ final class ApacheHttp2Request extends LowLevelHttpRequest {
     this.writeTimeout = 0;
 
     this.requestConfig = RequestConfig.custom()
-      .setRedirectsEnabled(false);
+        .setRedirectsEnabled(false);
   }
 
   @Override
@@ -42,11 +64,10 @@ public void addHeader(String name, String value) {
   }
 
   @Override
-  @SuppressWarnings("deprecation")
   public void setTimeout(int connectionTimeout, int readTimeout) throws IOException {
     requestConfig
-      .setConnectTimeout(Timeout.ofMilliseconds(connectionTimeout))
-      .setResponseTimeout(Timeout.ofMilliseconds(readTimeout));
+        .setConnectTimeout(Timeout.ofMilliseconds(connectionTimeout))
+        .setResponseTimeout(Timeout.ofMilliseconds(readTimeout));
   }
 
   @Override
@@ -64,44 +85,58 @@ public LowLevelHttpResponse execute() throws IOException {
 
     // Make Producer
     CompletableFuture<Void> writeFuture = new CompletableFuture<>();
-    ApacheHttp2AsyncEntityProducer entityProducer = 
-        new ApacheHttp2AsyncEntityProducer(this, writeFuture);
+    entityProducer = new ApacheHttp2AsyncEntityProducer(this, writeFuture);
 
     // Execute
-    final CompletableFuture<SimpleHttpResponse> responseFuture = new CompletableFuture<>();
+    final Future<SimpleHttpResponse> responseFuture = httpAsyncClient.execute(
+        new BasicRequestProducer(request, entityProducer),
+        SimpleResponseConsumer.create(),
+        new FutureCallback<SimpleHttpResponse>() {
+          @Override
+          public void completed(final SimpleHttpResponse response) {
+          }
+
+          @Override
+          public void failed(final Exception exception) {
+          }
+
+          @Override
+          public void cancelled() {
+          }
+        });
+
+    // Wait for write
     try {
-      httpAsyncClient.execute(
-          new BasicRequestProducer(request, entityProducer),
-          SimpleResponseConsumer.create(),
-          new FutureCallback<SimpleHttpResponse>() {
-            @Override
-            public void completed(final SimpleHttpResponse response) {
-              responseFuture.complete(response);
-            }
-
-            @Override
-            public void failed(final Exception exception) {
-              responseFuture.completeExceptionally(exception);
-            }
-
-            @Override
-            public void cancelled() {
-              responseFuture.cancel(false);
-            }
-          });
-
       if (writeTimeout != 0) {
         writeFuture.get(writeTimeout, TimeUnit.MILLISECONDS);
       }
+    } catch (TimeoutException e) {
+      throw new IOException("Write Timeout", e.getCause());
+    } catch (Exception e) {
+      throw new IOException("Exception in write", e.getCause());
+    }
 
+    // Wait for response
+    try {
       final SimpleHttpResponse response = responseFuture.get();
-      return new ApacheHttp2Response(request, response);
+      return new ApacheHttp2Response(response);
+    } catch (ExecutionException e) {
+      if (e.getCause() instanceof ConnectTimeoutException) {
+        throw new IOException("Connection Timeout", e.getCause());
+      } else if (e.getCause() instanceof H2StreamResetException) {
+        throw new IOException("Stream exception in request", e.getCause());
+      } else {
+        throw new IOException("Exception in request", e);
+      }
     } catch (InterruptedException e) {
       throw new IOException("Request Interrupted", e);
-    } catch (ExecutionException e) {
-      throw new IOException("Exception in request", e);
-    } catch (TimeoutException e) {
-      throw new IOException("Timed out", e);
+    } catch (CancellationException e) {
+      throw new IOException("Request Cancelled", e);
     }
   }
+
+  @VisibleForTesting
+  ApacheHttp2AsyncEntityProducer getEntityProducer() {
+    return entityProducer;
+  }
 }

src/main/java/com/google/firebase/internal/ApacheHttp2Response.java

@@ -1,21 +1,37 @@
+/*
+ * Copyright 2024 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.google.firebase.internal;
 
 import com.google.api.client.http.LowLevelHttpResponse;
+import com.google.common.annotations.VisibleForTesting;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.hc.client5.http.async.methods.SimpleHttpRequest;
 import org.apache.hc.client5.http.async.methods.SimpleHttpResponse;
+import org.apache.hc.core5.http.ContentType;
 import org.apache.hc.core5.http.Header;
 
 public class ApacheHttp2Response extends LowLevelHttpResponse {
-
   private final SimpleHttpResponse response;
   private final Header[] allHeaders;
 
-  ApacheHttp2Response(SimpleHttpRequest request, SimpleHttpResponse response) {
+  ApacheHttp2Response(SimpleHttpResponse response) {
     this.response = response;
     allHeaders = response.getHeaders();
   }
@@ -33,20 +49,19 @@ public InputStream getContent() throws IOException {
   @Override
   public String getContentEncoding() {
     Header contentEncodingHeader = response.getFirstHeader("Content-Encoding");
-    if (contentEncodingHeader == null) {
-      return null;
-    }
-    return contentEncodingHeader.getValue();
+    return contentEncodingHeader == null ? null : contentEncodingHeader.getValue();
   }
 
   @Override
   public long getContentLength() {
-    return response.getBodyText().length();
+    String bodyText = response.getBodyText();
+    return bodyText == null ? 0 : bodyText.length();
   }
 
   @Override
   public String getContentType() {
-    return response.getContentType().toString();
+    ContentType contentType = response.getContentType();
+    return contentType == null ? null : contentType.toString();
   }
 
   @Override
@@ -60,11 +75,7 @@ public String getStatusLine() {
   }
 
   public String getHeaderValue(String name) {
-    Header header = response.getLastHeader(name);
-    if (header == null) {
-      return null;
-    }
-    return header.getValue();
+    return response.getLastHeader(name).getValue();
   }
 
   @Override
@@ -81,4 +92,9 @@ public int getHeaderCount() {
   public String getHeaderName(int index) {
     return allHeaders[index].getName();
   }
+
+  @VisibleForTesting
+  public SimpleHttpResponse getResponse() {
+    return response;
+  }
 }