From 033e3316865239640e4951ce757e9b27a3fe7897 Mon Sep 17 00:00:00 2001 From: "Gerlach, Winfried" Date: Tue, 29 Jul 2025 18:08:32 +0200 Subject: [PATCH 1/3] HTTPCLIENT-2385: make DefaultManagedHttpClientConnection and DefaultManagedAsyncClientConnection extensible --- .../http/impl/io/DefaultManagedHttpClientConnection.java | 2 +- .../org/apache/hc/client5/http/impl/io/LoggingInputStream.java | 2 +- .../org/apache/hc/client5/http/impl/io/LoggingOutputStream.java | 2 +- .../org/apache/hc/client5/http/impl/io/LoggingSocketHolder.java | 2 +- .../http/impl/nio/DefaultManagedAsyncClientConnection.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultManagedHttpClientConnection.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultManagedHttpClientConnection.java index 13c9daaf79..66ee6261c6 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultManagedHttpClientConnection.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultManagedHttpClientConnection.java @@ -56,7 +56,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -final class DefaultManagedHttpClientConnection +public class DefaultManagedHttpClientConnection extends DefaultBHttpClientConnection implements ManagedHttpClientConnection, Identifiable { private static final Logger LOG = LoggerFactory.getLogger(DefaultManagedHttpClientConnection.class); diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingInputStream.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingInputStream.java index 34af67a022..850d70ec26 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingInputStream.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingInputStream.java @@ -36,7 +36,7 @@ /** * Delegates {@link InputStream} calls and logs to a {@link Wire}. */ -class LoggingInputStream extends FilterInputStream { +public class LoggingInputStream extends FilterInputStream { private final Wire wire; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingOutputStream.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingOutputStream.java index 258b40859a..d01b99d106 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingOutputStream.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingOutputStream.java @@ -32,7 +32,7 @@ import org.apache.hc.client5.http.impl.Wire; -class LoggingOutputStream extends OutputStream { +public class LoggingOutputStream extends OutputStream { private final OutputStream out; private final Wire wire; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingSocketHolder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingSocketHolder.java index a042849e93..21b810316d 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingSocketHolder.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingSocketHolder.java @@ -38,7 +38,7 @@ import org.apache.hc.core5.http.impl.io.SocketHolder; import org.slf4j.Logger; -class LoggingSocketHolder extends SocketHolder { +public class LoggingSocketHolder extends SocketHolder { private final Wire wire; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultManagedAsyncClientConnection.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultManagedAsyncClientConnection.java index 6db73dd027..c039d1bce3 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultManagedAsyncClientConnection.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultManagedAsyncClientConnection.java @@ -57,7 +57,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -final class DefaultManagedAsyncClientConnection implements ManagedAsyncClientConnection, Identifiable { +public class DefaultManagedAsyncClientConnection implements ManagedAsyncClientConnection, Identifiable { private static final Logger LOG = LoggerFactory.getLogger(DefaultManagedAsyncClientConnection.class); From 1a6bdd3ee42760cb894b09e66e5392345578e818 Mon Sep 17 00:00:00 2001 From: "Gerlach, Winfried" Date: Thu, 31 Jul 2025 09:31:17 +0200 Subject: [PATCH 2/3] HTTPCLIENT-2385: revert making Logging... classes public --- .../org/apache/hc/client5/http/impl/io/LoggingInputStream.java | 2 +- .../org/apache/hc/client5/http/impl/io/LoggingOutputStream.java | 2 +- .../org/apache/hc/client5/http/impl/io/LoggingSocketHolder.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingInputStream.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingInputStream.java index 850d70ec26..34af67a022 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingInputStream.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingInputStream.java @@ -36,7 +36,7 @@ /** * Delegates {@link InputStream} calls and logs to a {@link Wire}. */ -public class LoggingInputStream extends FilterInputStream { +class LoggingInputStream extends FilterInputStream { private final Wire wire; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingOutputStream.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingOutputStream.java index d01b99d106..258b40859a 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingOutputStream.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingOutputStream.java @@ -32,7 +32,7 @@ import org.apache.hc.client5.http.impl.Wire; -public class LoggingOutputStream extends OutputStream { +class LoggingOutputStream extends OutputStream { private final OutputStream out; private final Wire wire; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingSocketHolder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingSocketHolder.java index 21b810316d..a042849e93 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingSocketHolder.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingSocketHolder.java @@ -38,7 +38,7 @@ import org.apache.hc.core5.http.impl.io.SocketHolder; import org.slf4j.Logger; -public class LoggingSocketHolder extends SocketHolder { +class LoggingSocketHolder extends SocketHolder { private final Wire wire; From e4e711e62444590df5e11c39fd9860f5f89387df Mon Sep 17 00:00:00 2001 From: "Gerlach, Winfried" Date: Thu, 31 Jul 2025 19:58:25 +0200 Subject: [PATCH 3/3] HTTPCLIENT-2385: add @Internal as requested by ok2c --- .../http/impl/io/DefaultManagedHttpClientConnection.java | 2 ++ .../http/impl/nio/DefaultManagedAsyncClientConnection.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultManagedHttpClientConnection.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultManagedHttpClientConnection.java index 66ee6261c6..f5fb1f69f4 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultManagedHttpClientConnection.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultManagedHttpClientConnection.java @@ -38,6 +38,7 @@ import javax.net.ssl.SSLSocket; import org.apache.hc.client5.http.io.ManagedHttpClientConnection; +import org.apache.hc.core5.annotation.Internal; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.ContentLengthStrategy; @@ -56,6 +57,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +@Internal public class DefaultManagedHttpClientConnection extends DefaultBHttpClientConnection implements ManagedHttpClientConnection, Identifiable { diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultManagedAsyncClientConnection.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultManagedAsyncClientConnection.java index c039d1bce3..7ecb814149 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultManagedAsyncClientConnection.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultManagedAsyncClientConnection.java @@ -35,6 +35,7 @@ import javax.net.ssl.SSLSession; import org.apache.hc.client5.http.nio.ManagedAsyncClientConnection; +import org.apache.hc.core5.annotation.Internal; import org.apache.hc.core5.concurrent.FutureCallback; import org.apache.hc.core5.http.EndpointDetails; import org.apache.hc.core5.http.HttpConnection; @@ -57,6 +58,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +@Internal public class DefaultManagedAsyncClientConnection implements ManagedAsyncClientConnection, Identifiable { private static final Logger LOG = LoggerFactory.getLogger(DefaultManagedAsyncClientConnection.class);