Use java functions.

Author: arturobernalg

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

@@ -29,10 +29,12 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.UncheckedIOException;
 import java.util.Collections;
 import java.util.EnumMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.function.Function;
 
 import org.apache.commons.compress.compressors.CompressorException;
 import org.apache.commons.compress.compressors.CompressorStreamFactory;
@@ -74,14 +76,15 @@ final class CommonsCompressDecoderFactory {
     /**
      * @return lazy decoder for the given IANA token (lower-case).
      */
-    static IOFunction<InputStream, InputStream> decoder(final String token) {
+    static Function<InputStream, InputStream> decoder(final String token) {
         final String enc = token.toLowerCase(Locale.ROOT);
         final CompressorStreamFactory factory = new CompressorStreamFactory();
         return in -> {
             try {
                 return factory.createCompressorInputStream(enc, in);
             } catch (final CompressorException | LinkageError ex) {
-                throw new IOException("Unable to decode Content-Encoding '" + enc + '\'', ex);
+                throw new UncheckedIOException(new IOException(
+                        "Unable to decode Content-Encoding '" + enc + '\'', ex));
             }
         };
     }

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

@@ -28,6 +28,8 @@
 package org.apache.hc.client5.http.entity.compress;
 
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.UncheckedIOException;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.EnumMap;
@@ -39,7 +41,6 @@
 import org.apache.hc.core5.annotation.Internal;
 import org.apache.hc.core5.annotation.ThreadingBehavior;
 import org.apache.hc.core5.http.HttpEntity;
-import org.brotli.dec.BrotliInputStream;
 
 
 /**
@@ -62,13 +63,27 @@ private static Map<ContentCoding, Codec> build() {
 
         m.put(ContentCoding.GZIP,
                 new Codec(
-                        // encoder
                         org.apache.hc.client5.http.entity.GzipCompressingEntity::new,
-                        ent -> new DecompressingEntity(ent, GZIPInputStream::new)));
+                        ent -> new DecompressingEntity(ent,
+                                in -> {
+                                    try {
+                                        return new GZIPInputStream(in);
+                                    } catch (final IOException ex) {
+                                        throw new UncheckedIOException(ex);
+                                    }
+                                })));
+
         m.put(ContentCoding.DEFLATE,
                 new Codec(
                         org.apache.hc.client5.http.entity.DeflateCompressingEntity::new,
-                        ent -> new DecompressingEntity(ent, DeflateInputStream::new)));
+                        ent -> new DecompressingEntity(ent,
+                                in -> {
+                                    try {
+                                        return new DeflateInputStream(in);
+                                    } catch (final IOException ex) {
+                                        throw new UncheckedIOException(ex);
+                                    }
+                                })));
 
         /* 2. Commons-Compress extras ---------------------------------- */
         if (CommonsCompressSupport.isPresent()) {
@@ -96,10 +111,20 @@ private static Map<ContentCoding, Codec> build() {
         if (!m.containsKey(ContentCoding.BROTLI)
                 && CommonsCompressDecoderFactory.runtimeAvailable(ContentCoding.BROTLI.token())) {
             m.put(ContentCoding.BROTLI,
-                    Codec.decodeOnly(ent ->
-                            new DecompressingEntity(ent, BrotliInputStream::new)));
+                    Codec.decodeOnly(ent -> new DecompressingEntity(ent, in -> {
+                        try {
+                            return (InputStream) Class
+                                    .forName("org.brotli.dec.BrotliInputStream")
+                                    .getConstructor(InputStream.class)
+                                    .newInstance(in);
+                        } catch (final ReflectiveOperationException | LinkageError e) {
+                            throw new UncheckedIOException(
+                                    new IOException("Brotli runtime not available", e));
+                        }
+                    })));
         }
 
+
         return Collections.unmodifiableMap(m);
     }
 

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

@@ -52,9 +52,7 @@ public interface Decoder {
      *            encoded payload (never {@code null})
      * @return a new, undecoded {@code HttpEntity}; the caller is responsible
      *         for consuming / closing its content stream
-     * @throws IOException if the decoding entity cannot be created or an
-     *                     underlying I/O error occurs
      */
-    HttpEntity wrap(HttpEntity src) throws IOException;
+    HttpEntity wrap(HttpEntity src);
 }
 

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

@@ -31,6 +31,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.concurrent.locks.ReentrantLock;
+import java.util.function.Function;
 
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.io.entity.HttpEntityWrapper;
@@ -39,13 +40,13 @@
 public class DecompressingEntity extends HttpEntityWrapper {
 
     private static final int BUF_SIZE = 8 * 1024;   // 8 KiB buffer
-    private final IOFunction<InputStream, InputStream> decoder;
+    private final Function<InputStream, InputStream> decoder;
     private final ReentrantLock lock = new ReentrantLock();
     private volatile InputStream cached;
 
     public DecompressingEntity(
             final HttpEntity src,
-            final IOFunction<InputStream, InputStream> decoder) {
+            final Function<InputStream, InputStream> decoder) {
         super(src);
         this.decoder = Args.notNull(decoder, "Stream decoder");
     }