camelCase

Author: arturobernalg

httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/sync/StandardTestClientBuilder.java

@@ -57,7 +57,7 @@ final class StandardTestClientBuilder implements TestClientBuilder {
 
     private HttpClientConnectionManager connectionManager;
 
-    private boolean nowrap;
+    private boolean noWrap;
 
     public StandardTestClientBuilder() {
         this.clientBuilder = HttpClientBuilder.create();
@@ -75,8 +75,8 @@ public TestClientBuilder setTimeout(final Timeout timeout) {
     }
 
     @Override
-    public TestClientBuilder setnowrap(final boolean nowrap) {
-        this.nowrap = nowrap;
+    public TestClientBuilder setNoWrap(final boolean noWrap) {
+        this.noWrap = noWrap;
         return this;
     }
 
@@ -173,7 +173,7 @@ public TestClient build() throws Exception {
 
         final CloseableHttpClient client = clientBuilder
                 .setConnectionManager(connectionManagerCopy)
-                .setNowrap(nowrap)
+                .setNoWrap(noWrap)
                 .build();
         return new TestClient(client, connectionManagerCopy);
     }

httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/sync/TestClientBuilder.java

@@ -98,7 +98,7 @@ default TestClientBuilder  addExecInterceptorLast(String name, ExecChainHandler
         throw new UnsupportedOperationException("Operation not supported by " + getProtocolLevel());
     }
 
-    default  TestClientBuilder setnowrap(boolean nowrap){
+    default TestClientBuilder setNoWrap(boolean noWrap){
         return this;
     }
 

httpclient5-testing/src/test/java/org/apache/hc/client5/testing/extension/sync/TestClientResources.java

@@ -118,8 +118,8 @@ public TestClient client() throws Exception {
         return client;
     }
 
-    public TestClient client(final boolean nowrap) throws Exception {
-        clientBuilder.setnowrap(nowrap);
+    public TestClient client(final boolean noWrap) throws Exception {
+        clientBuilder.setNoWrap(noWrap);
         return client();
     }
 

httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/AbstractIntegrationTestBase.java

@@ -78,8 +78,8 @@ public TestClient client() throws Exception {
         return testResources.client();
     }
 
-    public TestClient client(final boolean nowrap) throws Exception {
-        return testResources.client(nowrap);
+    public TestClient client(final boolean noWrap) throws Exception {
+        return testResources.client(noWrap);
     }
 
 }

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

@@ -31,32 +31,29 @@
 import java.io.OutputStream;
 
 import org.apache.commons.io.IOUtils;
+import org.apache.hc.core5.annotation.Contract;
+import org.apache.hc.core5.annotation.ThreadingBehavior;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.io.entity.HttpEntityWrapper;
 import org.apache.hc.core5.util.Args;
 
 /**
  * An {@link HttpEntity} wrapper that decompresses the content of the wrapped entity.
- * This class supports various compression types such as "gzip", "deflate", and others.
- * It also handles variations like noWrap, where zlib headers and trailers are omitted.
+ * This class supports different compression types and can handle both standard
+ * compression (e.g., gzip, deflate) and variations that require a custom handling (e.g., noWrap).
  *
- * <p>
- * Decompression is performed lazily through a {@link LazyDecompressInputStream}, which
- * initializes the decompression stream only when the content is requested.
- * </p>
- *
- * <p>
- * <b>Content Length:</b> Since the content is being decompressed, the exact content length is
- * unknown, and as such, this class returns the content length of the wrapped entity.
- * </p>
+ * <p>Decompression is performed using a {@link LazyDecompressInputStream} that
+ * applies decompression lazily when content is requested.</p>
  *
  * <p>
- * Note: This class is <b>not thread-safe</b>. If multiple threads access an instance of this class concurrently,
- * they must synchronize on the instance to ensure correct behavior.
+ * Note: This class uses lazy initialization for certain fields, making it <b>not thread-safe</b>.
+ * If multiple threads access an instance of this class concurrently, they must synchronize on the instance
+ * to ensure correct behavior.
  * </p>
  *
  * @since 5.5
  */
+@Contract(threading = ThreadingBehavior.UNSAFE)
 public class DecompressEntity extends HttpEntityWrapper {
 
     /**

httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ContentCompressionExec.java

@@ -74,12 +74,12 @@ public final class ContentCompressionExec implements ExecChainHandler {
     private final Header acceptEncoding;
     final List<String> normalizedEncodings;
     private final boolean ignoreUnknown;
-    private final boolean nowrap;
+    private final boolean noWrap;
 
     public ContentCompressionExec(
             final List<String> acceptEncoding,
             final boolean ignoreUnknown,
-            final boolean nowrap) {
+            final boolean noWrap) {
 
         if (acceptEncoding != null) {
             this.normalizedEncodings = acceptEncoding.stream()
@@ -95,15 +95,15 @@ public ContentCompressionExec(
 
         this.ignoreUnknown = ignoreUnknown;
 
-        this.nowrap = nowrap;
+        this.noWrap = noWrap;
     }
 
     public ContentCompressionExec(final boolean ignoreUnknown) {
         this(null, ignoreUnknown, false);
     }
 
-    public ContentCompressionExec(final boolean ignoreUnknown, final boolean nowrap) {
-        this(null, ignoreUnknown, nowrap);
+    public ContentCompressionExec(final boolean ignoreUnknown, final boolean noWrap) {
+        this(null, ignoreUnknown, noWrap);
     }
 
 
@@ -151,7 +151,7 @@ public ClassicHttpResponse execute(
                 for (final HeaderElement codec : codecs) {
                     final String codecname = CompressorFactory.INSTANCE.getFormattedName(codec.getName());
                     if (normalizedEncodings.contains(codecname)) {
-                        response.setEntity(new DecompressEntity(response.getEntity(), codecname, nowrap));
+                        response.setEntity(new DecompressEntity(response.getEntity(), codecname, noWrap));
                         response.removeHeaders(HttpHeaders.CONTENT_LENGTH);
                         response.removeHeaders(HttpHeaders.CONTENT_ENCODING);
                         response.removeHeaders(HttpHeaders.CONTENT_MD5);

httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/HttpClientBuilder.java

@@ -234,7 +234,7 @@ private ExecInterceptorEntry(
 
     private List<String> encodings;
 
-    private boolean nowrap;
+    private boolean noWrap;
 
     public static HttpClientBuilder create() {
         return new HttpClientBuilder();
@@ -708,7 +708,6 @@ public final HttpClientBuilder setContentDecoderRegistry(
         return this;
     }
 
-
     /**
      * Sets the list of content encodings to be supported for automatic content compression and decompression.
      * <p>
@@ -737,19 +736,19 @@ public final HttpClientBuilder setEncodings(final List<String> encodings) {
     }
 
     /**
-     * Sets the "nowrap" option for the HTTP client.
+     * Sets the "noWrap" option for the HTTP client.
      * <p>
      * When enabled, this option disables the zlib header and trailer in deflate compression streams.
      * This is useful when working with servers that require or expect raw deflate streams without
      * the standard zlib header and trailer.
      * </p>
      *
-     * @param nowrap if {@code true}, disables the zlib header and trailer in deflate streams.
+     * @param noWrap if {@code true}, disables the zlib header and trailer in deflate streams.
      * @return the updated {@link HttpClientBuilder} instance.
      * @since 5.4
      */
-    public final HttpClientBuilder setNowrap(final boolean nowrap) {
-        this.nowrap = nowrap;
+    public final HttpClientBuilder setNoWrap(final boolean noWrap) {
+        this.noWrap = noWrap;
         return this;
     }
 
@@ -1045,10 +1044,10 @@ public CloseableHttpClient build() {
         if (!contentCompressionDisabled) {
             if (encodings != null && !encodings.isEmpty()) {
                 execChainDefinition.addFirst(
-                        new ContentCompressionExec(encodings, true, nowrap),
+                        new ContentCompressionExec(encodings, true, noWrap),
                         ChainElement.COMPRESS.name());
             } else {
-                execChainDefinition.addFirst(new ContentCompressionExec(true, nowrap), ChainElement.COMPRESS.name());
+                execChainDefinition.addFirst(new ContentCompressionExec(true, noWrap), ChainElement.COMPRESS.name());
             }
         }
 

httpclient5/src/test/java/org/apache/hc/client5/http/entity/TestEntityBuilder.java

@@ -130,21 +130,14 @@ void testBuildGZipped() {
 
     @Test
     public void testCompressionDecompression() throws Exception {
-
         final String originalContent = "some kind of text";
         final StringEntity originalEntity = new StringEntity(originalContent, ContentType.TEXT_PLAIN);
-
         final HttpEntity compressedEntity = CompressorFactory.INSTANCE.compressEntity(originalEntity, "gz");
-
         final ByteArrayOutputStream compressedOut = new ByteArrayOutputStream();
         compressedEntity.writeTo(compressedOut);
-
         final ByteArrayEntity out = new ByteArrayEntity(compressedOut.toByteArray(), ContentType.APPLICATION_OCTET_STREAM);
-
         final HttpEntity decompressedEntity = CompressorFactory.INSTANCE.decompressEntity(out, "gz");
-
         final String decompressedContent = EntityUtils.toString(decompressedEntity, StandardCharsets.UTF_8);
-
         Assertions.assertEquals(originalContent, decompressedContent, "The decompressed content should match the original content.");
     }
 

httpclient5/src/test/java/org/apache/hc/client5/http/entity/TestGZip.java

@@ -76,7 +76,6 @@ void testCompressionDecompression() throws Exception {
         Assertions.assertEquals("some kind of text", EntityUtils.toString(gunzipe, StandardCharsets.US_ASCII));
     }
 
-
     @Test
     void testCompressionIOExceptionLeavesOutputStreamOpen() throws Exception {
         final HttpEntity in = Mockito.mock(HttpEntity.class);