moved code handling encoding to compressed entity class

Author: chernser

client-v2/src/main/java/com/clickhouse/client/api/internal/CompressedEntity.java

@@ -17,13 +17,13 @@ public class CompressedEntity implements HttpEntity {
     private HttpEntity httpEntity;
     private final boolean isResponse;
     private final CompressorStreamFactory compressorStreamFactory;
-    private final String contentEncoding;
+    private final String compressionAlgo;
 
-    CompressedEntity(HttpEntity httpEntity, boolean isResponse, CompressorStreamFactory compressorStreamFactory, String contentEncoding) {
+    CompressedEntity(HttpEntity httpEntity, boolean isResponse, CompressorStreamFactory compressorStreamFactory) {
         this.httpEntity = httpEntity;
         this.isResponse = isResponse;
         this.compressorStreamFactory = compressorStreamFactory;
-        this.contentEncoding = contentEncoding;
+        this.compressionAlgo = getCompressionAlgoName(httpEntity.getContentEncoding());
     }
 
     @Override
@@ -38,7 +38,7 @@ public InputStream getContent() throws IOException, UnsupportedOperationExceptio
         }
 
         try {
-            return compressorStreamFactory.createCompressorInputStream(contentEncoding, httpEntity.getContent());
+            return compressorStreamFactory.createCompressorInputStream(compressionAlgo, httpEntity.getContent());
         } catch (CompressorException e) {
             throw new IOException("Failed to create decompressing input stream", e);
         }
@@ -52,7 +52,7 @@ public void writeTo(OutputStream outStream) throws IOException {
         }
 
         try {
-            httpEntity.writeTo(compressorStreamFactory.createCompressorOutputStream(contentEncoding, outStream));
+            httpEntity.writeTo(compressorStreamFactory.createCompressorOutputStream(compressionAlgo, outStream));
         } catch (CompressorException e) {
             throw new IOException("Failed to create compressing output stream", e);
         }
@@ -97,4 +97,14 @@ public boolean isChunked() {
     public Set<String> getTrailerNames() {
         return httpEntity.getTrailerNames();
     }
+
+    private String getCompressionAlgoName(String contentEncoding) {
+        String algo = contentEncoding;
+        if (algo.equalsIgnoreCase("gzip")) {
+            algo = CompressorStreamFactory.GZIP;
+        } else if (algo.equalsIgnoreCase("lz4")) {
+            algo = CompressorStreamFactory.LZ4_FRAMED;
+        }
+        return algo;
+    }
 }

client-v2/src/main/java/com/clickhouse/client/api/internal/HttpAPIClientHelper.java

@@ -644,8 +644,7 @@ private HttpEntity wrapRequestEntity(HttpEntity httpEntity, LZ4Factory lz4Factor
 
         if (httpEntity.getContentEncoding() != null && !appCompressedData) {
             // http header is set and data is not compressed
-            String algo = getCompressionAlgoName(httpEntity.getContentEncoding());
-            return new CompressedEntity(httpEntity, false, CompressorStreamFactory.getSingleton(), algo);
+            return new CompressedEntity(httpEntity, false, CompressorStreamFactory.getSingleton());
         } else if (clientCompression && !appCompressedData) {
             int buffSize = ClientConfigProperties.COMPRESSION_LZ4_UNCOMPRESSED_BUF_SIZE.getOrDefault(requestConfig);
             return new LZ4Entity(httpEntity, useHttpCompression, false, true,
@@ -664,8 +663,7 @@ private HttpEntity wrapResponseEntity(HttpEntity httpEntity, int httpStatus, LZ4
 
         if (httpEntity.getContentEncoding() != null) {
             // http compressed response
-            String algo = getCompressionAlgoName(httpEntity.getContentEncoding());
-            return new CompressedEntity(httpEntity, true, CompressorStreamFactory.getSingleton(), algo);
+            return new CompressedEntity(httpEntity, true, CompressorStreamFactory.getSingleton());
         }
 
         // data compression
@@ -677,16 +675,6 @@ private HttpEntity wrapResponseEntity(HttpEntity httpEntity, int httpStatus, LZ4
         return httpEntity;
     }
 
-    private String getCompressionAlgoName(String contentEncoding) {
-        String algo = contentEncoding;
-        if (algo.equalsIgnoreCase("gzip")) {
-            algo = CompressorStreamFactory.GZIP;
-        } else if (algo.equalsIgnoreCase("lz4")) {
-            algo = CompressorStreamFactory.LZ4_FRAMED;
-        }
-        return algo;
-    }
-
     public static int getHeaderInt(Header header, int defaultValue) {
         return getHeaderVal(header, defaultValue, Integer::parseInt);
     }

client-v2/src/test/java/com/clickhouse/client/insert/InsertClientHttpCompressionTests.java

@@ -64,7 +64,7 @@ public Object[][] insertRawDataCompressedProvider() {
             { "lz4" },
             { "zstd" },
             { "deflate" },
-            { "gz" },
+            { "gzip" },
         };
     }
 }