Made complete reflections

Author: arturobernalg

httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/DeflatingBrotliEntityProducer.java

@@ -144,6 +144,11 @@ public int available() {
         if (pendingOut != null && pendingOut.hasRemaining() || pendingTrailers != null) {
             return 1;
         }
+        try {
+            if (AsyncBrotli.encHasMoreOutput(encoder)) {
+                return 1;
+            }
+        } catch (final Exception ignore) { }
         final int up = upstream.available();
         return (state != State.STREAMING || up > 0) ? 1 : 0;
     }
@@ -161,7 +166,7 @@ public void produce(final DataStreamChannel channel) throws IOException {
                     return;
                 }
                 if (pendingTrailers == null) {
-                    pendingTrailers = Collections.<Header>emptyList();
+                    pendingTrailers = Collections.emptyList();
                 }
                 channel.endStream(pendingTrailers);
                 pendingTrailers = null;
@@ -208,7 +213,7 @@ public int write(final ByteBuffer src) throws IOException {
 
                 @Override
                 public void endStream() throws IOException {
-                    endStream(Collections.<Header>emptyList());
+                    endStream(Collections.emptyList());
                 }
 
                 @Override

httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/InflatingBrotliDataConsumer.java

@@ -34,7 +34,6 @@
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.nio.AsyncDataConsumer;
 import org.apache.hc.core5.http.nio.CapacityChannel;
-import org.apache.hc.core5.util.Asserts;
 
 /**
  * {@code AsyncDataConsumer} that inflates a Brotli-compressed byte stream and forwards
@@ -119,16 +118,29 @@ public void consume(final ByteBuffer src) throws IOException {
     @Override
     public void streamEnd(final List<? extends Header> trailers) throws IOException, HttpException {
         try {
-            pump();
-            final String st = AsyncBrotli.decStatusName(decoder);
-            Asserts.check("DONE".equals(st) || !AsyncBrotli.decHasOutput(decoder),
-                    "Truncated brotli stream");
+            for (; ; ) {
+                final String st = AsyncBrotli.decStatusName(decoder);
+                if ("DONE".equals(st)) {
+                    break;
+                }
+                if ("NEEDS_MORE_INPUT".equals(st) || "OK".equals(st)) {
+                    AsyncBrotli.decPush(decoder, 0);
+                    pump();
+                    continue;
+                }
+                if ("NEEDS_MORE_OUTPUT".equals(st)) {
+                    pump();
+                    continue;
+                }
+                throw new IOException("Brotli stream corrupted");
+            }
             downstream.streamEnd(trailers);
         } catch (final Exception ex) {
             throw new IOException("Brotli stream end failed", ex);
         }
     }
 
+
     @Override
     public void releaseResources() {
         AsyncBrotli.decDestroy(decoder);

httpclient5/src/main/java/org/apache/hc/client5/http/entity/BrotliDecompressingEntity.java

@@ -49,7 +49,7 @@ public BrotliDecompressingEntity(final HttpEntity entity) {
 
     public static boolean isAvailable() {
         try {
-            Class.forName("org.brotli.dec.BrotliInputStream");
+            Class.forName("com.aayushatharva.brotli4j.decoder.BrotliInputStream");
             return true;
         } catch (final ClassNotFoundException | NoClassDefFoundError e) {
             return false;

httpclient5/src/main/java/org/apache/hc/client5/http/entity/BrotliInputStreamFactory.java

@@ -28,8 +28,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-
-import com.aayushatharva.brotli4j.decoder.BrotliInputStream;
+import java.lang.reflect.Constructor;
 
 import org.apache.hc.core5.annotation.Contract;
 import org.apache.hc.core5.annotation.ThreadingBehavior;
@@ -60,6 +59,13 @@ public static BrotliInputStreamFactory getInstance() {
 
     @Override
     public InputStream create(final InputStream inputStream) throws IOException {
-        return new BrotliInputStream(inputStream);
+        try {
+            // Prefer brotli4j if present
+            final Class<?> cls = Class.forName("com.aayushatharva.brotli4j.decoder.BrotliInputStream");
+            final Constructor<?> c = cls.getConstructor(InputStream.class);
+            return (InputStream) c.newInstance(inputStream);
+        } catch (final ReflectiveOperationException | NoClassDefFoundError e) {
+            throw new IOException("Brotli decoder not available", e);
+        }
     }
 }

httpclient5/src/main/java/org/apache/hc/client5/http/entity/compress/CommonsCompressCodecFactory.java

@@ -73,7 +73,6 @@ final class CommonsCompressCodecFactory {
     private static final String CC_DEFLATE64 = "org.apache.commons.compress.compressors.deflate64.Deflate64CompressorInputStream";
 
     // Helper libs
-    private static final String H_BROTLI = "org.brotli.dec.BrotliInputStream";
     private static final String H_ZSTD = "com.github.luben.zstd.ZstdInputStream";
     private static final String H_XZ = "org.tukaani.xz.XZInputStream";
 
@@ -153,7 +152,7 @@ static boolean runtimeAvailable(final ContentCoding coding) {
         }
         switch (coding) {
             case BROTLI:
-                return isPresent(CC_BROTLI) && isPresent(H_BROTLI);
+                return isPresent(CC_BROTLI);
             case ZSTD:
                 return isPresent(CC_ZSTD) && isPresent(H_ZSTD);
             case XZ:

httpclient5/src/main/java/org/apache/hc/client5/http/entity/compress/ContentCodecRegistry.java

@@ -80,7 +80,6 @@ private static Map<ContentCoding, Codec> build() {
         // 2) Commons-Compress (optional) — reflectively wired
         if (CommonsCompressSupport.isPresent()) {
             for (final ContentCoding c : Arrays.asList(
-                    ContentCoding.BROTLI,
                     ContentCoding.ZSTD,
                     ContentCoding.XZ,
                     ContentCoding.LZMA,

pom.xml

@@ -64,7 +64,6 @@
     <maven.compiler.target>1.8</maven.compiler.target>
     <httpcore.version>5.4-alpha1</httpcore.version>
     <log4j.version>2.25.0</log4j.version>
-    <brotli.version>0.1.2</brotli.version>
     <brotli4j.version>1.20.0</brotli4j.version>
     <conscrypt.version>2.5.2</conscrypt.version>
     <ehcache.version>3.10.8</ehcache.version>