Replace the old InputStreamFactory registries with the new Decoder / Encoder pipeline (#660)

* Replace the old InputStreamFactory registries with the new Decoder / Encoder pipeline. Adds ContentCodecRegistry, rewrites DecompressingEntity, updates HttpClient internals and tests, deprecates legacy helpers, and keeps backward compatibility.

* Unify content-coding support: replace InputStreamFactory with symmetric Encoder/Decoder API, introduce IOFunction and ContentCodecRegistry, update DecompressingEntity and all tests accordingly.

* Use UnaryOperator instead

Author: arturobernalg

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

@@ -31,10 +31,12 @@
 /**
  * {@link org.apache.hc.core5.http.io.entity.HttpEntityWrapper} responsible for
  * handling br Content Coded responses.
+ * @deprecated See {@link org.apache.hc.client5.http.entity.compress.ContentCodecRegistry#decoder(org.apache.hc.client5.http.entity.compress.ContentCoding)}
  *
  * @see GzipDecompressingEntity
  * @since 5.2
  */
+@Deprecated
 public class BrotliDecompressingEntity extends DecompressingEntity {
     /**
      * Creates a new {@link DecompressingEntity}.

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

@@ -35,10 +35,11 @@
 
 /**
  * {@link InputStreamFactory} for handling Brotli Content Coded responses.
- *
+ * @deprecated See {@link org.apache.hc.client5.http.entity.compress.ContentCodecRegistry#decoder(org.apache.hc.client5.http.entity.compress.ContentCoding)}
  * @since 5.2
  */
 @Contract(threading = ThreadingBehavior.STATELESS)
+@Deprecated
 public class BrotliInputStreamFactory implements InputStreamFactory {
 
     /**

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

@@ -36,9 +36,9 @@
 
 /**
  * Common base class for decompressing {@link HttpEntity} implementations.
- *
- * @since 4.4
+ * @deprecated See {@link org.apache.hc.client5.http.entity.compress.ContentCodecRegistry#decoder(org.apache.hc.client5.http.entity.compress.ContentCoding)}
  */
+@Deprecated
 public class DecompressingEntity extends HttpEntityWrapper {
 
     /**

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

@@ -39,11 +39,13 @@
  * rather than {@code deflate} streams. We handle both types in here,
  * since that's what is seen on the internet. Moral - prefer
  * {@code gzip}!
+ * @deprecated See {@link org.apache.hc.client5.http.entity.compress.ContentCodecRegistry#decoder(org.apache.hc.client5.http.entity.compress.ContentCoding)}
  *
  * @see GzipDecompressingEntity
  *
  * @since 4.1
  */
+@Deprecated
 public class DeflateDecompressingEntity extends DecompressingEntity {
 
     /**

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

@@ -35,9 +35,10 @@
 
 /**
  * {@link InputStreamFactory} for handling Deflate Content Coded responses.
- *
+ * @deprecated Use {@link org.apache.hc.client5.http.entity.compress.ContentCodecRegistry#decoder(org.apache.hc.client5.http.entity.compress.ContentCoding)}
  * @since 5.0
  */
+@Deprecated
 @Contract(threading = ThreadingBehavior.STATELESS)
 public class DeflateInputStreamFactory implements InputStreamFactory {
 

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

@@ -33,8 +33,8 @@
 import java.util.Arrays;
 import java.util.List;
 
+import org.apache.hc.client5.http.entity.compress.ContentCodecRegistry;
 import org.apache.hc.client5.http.entity.compress.ContentCoding;
-import org.apache.hc.client5.http.entity.compress.ContentEncoderRegistry;
 import org.apache.hc.core5.http.ContentType;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.NameValuePair;
@@ -439,12 +439,12 @@ public HttpEntity build() {
             throw new IllegalStateException("No entity set");
         }
         if (compressWith != null) {
-            final ContentEncoderRegistry.EncoderFactory f = ContentEncoderRegistry.lookup(compressWith);
-            if (f == null) {
+            final HttpEntity compressed = ContentCodecRegistry.wrap(compressWith, e);
+            if (compressed == null) {
                 throw new UnsupportedOperationException(
                         "No encoder available for content-coding '" + compressWith.token() + '\'');
             }
-            return f.wrap(e);
+            return compressed;
         }
         return e;
     }

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

@@ -36,9 +36,14 @@
 
 /**
  * {@link InputStreamFactory} for handling GZIPContent Coded responses.
- *
+ * @deprecated – the public extension point has moved to
+ *             {@link org.apache.hc.client5.http.entity.compress.Decoder}.
+ *             For built-in gzip support use
+ *             {@code ContentCodecRegistry.decoder(ContentCoding.GZIP)} or
+ *             wrap a stream directly with
  * @since 5.0
  */
+@Deprecated
 @Contract(threading = ThreadingBehavior.STATELESS)
 public class GZIPInputStreamFactory implements InputStreamFactory {
 

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

@@ -32,8 +32,11 @@
  * {@link org.apache.hc.core5.http.io.entity.HttpEntityWrapper} for handling
  * gzip Content Coded responses.
  *
+ * @deprecated See {@link org.apache.hc.client5.http.entity.compress.ContentCodecRegistry#decoder(org.apache.hc.client5.http.entity.compress.ContentCoding)}
+ *
  * @since 4.1
  */
+@Deprecated
 public class GzipDecompressingEntity extends DecompressingEntity {
 
     /**

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

@@ -31,9 +31,10 @@
 
 /**
  * Factory for decorated {@link InputStream}s.
- *
+ * @deprecated Replaced by {@link org.apache.hc.client5.http.entity.compress.Decoder}.
  * @since 4.4
  */
+@Deprecated
 public interface InputStreamFactory {
 
     InputStream create(InputStream inputStream) throws IOException;

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

@@ -35,7 +35,9 @@
 
 /**
  * Lazy initializes from an {@link InputStream} wrapper.
+ * @deprecated Superseded by {@link org.apache.hc.client5.http.entity.compress.DecompressingEntity}.
  */
+@Deprecated
 class LazyDecompressingInputStream extends FilterInputStream {
 
     private final InputStreamFactory inputStreamFactory;