You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2018/01/11 08:19:44 UTC
[1/2] httpcomponents-client git commit: SLF4J logging facade
Repository: httpcomponents-client
Updated Branches:
refs/heads/master 16147b185 -> eb71f45ee
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAddCookies.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAddCookies.java b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAddCookies.java
index 857a472..d64a6c7 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAddCookies.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAddCookies.java
@@ -52,8 +52,8 @@ import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.net.URIAuthority;
import org.apache.hc.core5.util.Args;
import org.apache.hc.core5.util.TextUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Request interceptor that matches cookies available in the current
@@ -65,7 +65,7 @@ import org.apache.logging.log4j.Logger;
@Contract(threading = ThreadingBehavior.IMMUTABLE)
public class RequestAddCookies implements HttpRequestInterceptor {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
public RequestAddCookies() {
super();
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAuthCache.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAuthCache.java b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAuthCache.java
index 6c3e9ab..562bc2f 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAuthCache.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAuthCache.java
@@ -44,8 +44,8 @@ import org.apache.hc.core5.http.HttpRequestInterceptor;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.net.URIAuthority;
import org.apache.hc.core5.util.Args;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Request interceptor that can preemptively authenticate against known hosts,
@@ -57,7 +57,7 @@ import org.apache.logging.log4j.Logger;
@Contract(threading = ThreadingBehavior.IMMUTABLE)
public class RequestAuthCache implements HttpRequestInterceptor {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
public RequestAuthCache() {
super();
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestClientConnControl.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestClientConnControl.java b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestClientConnControl.java
index d027eb0..e1cebc1 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestClientConnControl.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestClientConnControl.java
@@ -40,8 +40,8 @@ import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpRequestInterceptor;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.util.Args;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This protocol interceptor is responsible for adding {@code Connection}
@@ -53,7 +53,7 @@ import org.apache.logging.log4j.Logger;
@Contract(threading = ThreadingBehavior.IMMUTABLE)
public class RequestClientConnControl implements HttpRequestInterceptor {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private static final String PROXY_CONN_DIRECTIVE = "Proxy-Connection";
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/ResponseProcessCookies.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/ResponseProcessCookies.java b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/ResponseProcessCookies.java
index 8ec84b8..4dc563a 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/ResponseProcessCookies.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/ResponseProcessCookies.java
@@ -45,8 +45,8 @@ import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.HttpResponseInterceptor;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.util.Args;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Response interceptor that populates the current {@link CookieStore} with data
@@ -57,7 +57,7 @@ import org.apache.logging.log4j.Logger;
@Contract(threading = ThreadingBehavior.IMMUTABLE)
public class ResponseProcessCookies implements HttpResponseInterceptor {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
public ResponseProcessCookies() {
super();
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcherLoader.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcherLoader.java b/httpclient5/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcherLoader.java
index af1adcb..a037971 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcherLoader.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcherLoader.java
@@ -39,8 +39,8 @@ import java.util.List;
import org.apache.hc.core5.annotation.Contract;
import org.apache.hc.core5.annotation.ThreadingBehavior;
import org.apache.hc.core5.util.Args;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* {@link PublicSuffixMatcher} loader.
@@ -83,7 +83,7 @@ public final class PublicSuffixMatcherLoader {
DEFAULT_INSTANCE = load(url);
} catch (final IOException ex) {
// Should never happen
- final Logger log = LogManager.getLogger(PublicSuffixMatcherLoader.class);
+ final Logger log = LoggerFactory.getLogger(PublicSuffixMatcherLoader.class);
if (log.isWarnEnabled()) {
log.warn("Failure loading public suffix list from default resource", ex);
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/DefaultHostnameVerifier.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/DefaultHostnameVerifier.java b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/DefaultHostnameVerifier.java
index 41c7383..6deb749 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/DefaultHostnameVerifier.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/DefaultHostnameVerifier.java
@@ -55,8 +55,8 @@ import org.apache.hc.client5.http.psl.PublicSuffixMatcher;
import org.apache.hc.core5.annotation.Contract;
import org.apache.hc.core5.annotation.ThreadingBehavior;
import org.apache.hc.core5.net.InetAddressUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Default {@link javax.net.ssl.HostnameVerifier} implementation.
@@ -78,7 +78,7 @@ public final class DefaultHostnameVerifier implements HttpClientHostnameVerifier
}
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final PublicSuffixMatcher publicSuffixMatcher;
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/H2TlsStrategy.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/H2TlsStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/H2TlsStrategy.java
index df82ba4..1ae07b3 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/H2TlsStrategy.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/H2TlsStrategy.java
@@ -58,8 +58,8 @@ import org.apache.hc.core5.reactor.ssl.TransportSecurityLayer;
import org.apache.hc.core5.ssl.SSLContexts;
import org.apache.hc.core5.util.Args;
import org.apache.hc.core5.util.TextUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Default SSL upgrade strategy for non-blocking connections.
@@ -102,7 +102,7 @@ public class H2TlsStrategy implements TlsStrategy {
getDefaultHostnameVerifier());
}
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final SSLContext sslContext;
private final String[] supportedProtocols;
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/SSLConnectionSocketFactory.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/SSLConnectionSocketFactory.java b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/SSLConnectionSocketFactory.java
index fcdd496..25dc62a 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/SSLConnectionSocketFactory.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/SSLConnectionSocketFactory.java
@@ -58,8 +58,8 @@ import org.apache.hc.core5.ssl.SSLInitializationException;
import org.apache.hc.core5.util.Args;
import org.apache.hc.core5.util.TextUtils;
import org.apache.hc.core5.util.TimeValue;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Layered socket factory for TLS/SSL connections.
@@ -142,7 +142,7 @@ public class SSLConnectionSocketFactory implements LayeredConnectionSocketFactor
public static final String TLS = "TLS";
public static final String SSL = "SSL";
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
/**
* @since 4.4
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestInternalExecRuntime.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestInternalExecRuntime.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestInternalExecRuntime.java
index e11a534..783ba82 100644
--- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestInternalExecRuntime.java
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestInternalExecRuntime.java
@@ -44,13 +44,13 @@ import org.apache.hc.core5.http.impl.io.HttpRequestExecutor;
import org.apache.hc.core5.io.ShutdownType;
import org.apache.hc.core5.util.TimeValue;
import org.apache.hc.core5.util.Timeout;
-import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
+import org.slf4j.Logger;
@SuppressWarnings({"static-access"}) // test code
public class TestInternalExecRuntime {
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 241a017..2f3d0f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,7 +73,7 @@
<commons-codec.version>1.10</commons-codec.version>
<ehcache.version>3.4.0</ehcache.version>
<memcached.version>2.12.3</memcached.version>
- <slf4j.version>1.7.13</slf4j.version>
+ <slf4j.version>1.7.25</slf4j.version>
<junit.version>4.12</junit.version>
<easymock.version>2.5.2</easymock.version>
<mockito.version>2.7.22</mockito.version>
@@ -99,21 +99,25 @@
<version>${httpcore.version}</version>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j.version}</version>
</dependency>
+ <!-- TODO remove after upgrade to HttpCore 5.0b2 -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
+ <artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-core</artifactId>
<version>${log4j.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
[2/2] httpcomponents-client git commit: SLF4J logging facade
Posted by ol...@apache.org.
SLF4J logging facade
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/commit/eb71f45e
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/tree/eb71f45e
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/diff/eb71f45e
Branch: refs/heads/master
Commit: eb71f45ee5883a6bf89d18a7e4f6558672ba3646
Parents: 16147b1
Author: Oleg Kalnichevski <ol...@apache.org>
Authored: Wed Jan 10 10:59:00 2018 +0100
Committer: Oleg Kalnichevski <ol...@apache.org>
Committed: Wed Jan 10 13:07:37 2018 +0100
----------------------------------------------------------------------
httpclient5-cache/pom.xml | 10 +++++++---
.../http/impl/cache/BasicHttpAsyncCache.java | 6 +++---
.../client5/http/impl/cache/BasicHttpCache.java | 6 +++---
.../http/impl/cache/CacheRevalidatorBase.java | 6 +++---
.../http/impl/cache/CacheableRequestPolicy.java | 6 +++---
.../cache/CachedResponseSuitabilityChecker.java | 6 +++---
.../hc/client5/http/impl/cache/CachingExec.java | 6 +++---
.../http/impl/cache/CachingExecBase.java | 6 +++---
.../cache/DefaultAsyncCacheInvalidator.java | 6 +++---
.../impl/cache/DefaultCacheInvalidator.java | 6 +++---
.../http/impl/cache/ResponseCachingPolicy.java | 6 +++---
.../cache/memcached/SHA256KeyHashingScheme.java | 6 +++---
httpclient5-fluent/pom.xml | 10 +++++++---
httpclient5-osgi/pom.xml | 12 +++---------
.../http/osgi/impl/OSGiCredentialsProvider.java | 6 +++---
httpclient5-testing/pom.xml | 13 +++++++++++++
httpclient5-win/pom.xml | 20 +++++++++++++++-----
.../http/impl/win/WindowsNegotiateScheme.java | 6 +++---
httpclient5/pom.xml | 10 +++++++---
.../impl/DefaultAuthenticationStrategy.java | 6 +++---
.../client5/http/impl/InMemoryDnsResolver.java | 6 +++---
.../org/apache/hc/client5/http/impl/Wire.java | 2 +-
.../impl/async/AbstractHttpAsyncClientBase.java | 6 +++---
.../http/impl/async/AsyncConnectExec.java | 6 +++---
.../http/impl/async/AsyncProtocolExec.java | 6 +++---
.../http/impl/async/AsyncRedirectExec.java | 6 +++---
.../client5/http/impl/async/AsyncRetryExec.java | 6 +++---
.../Http2AsyncClientEventHandlerFactory.java | 16 ++++++++--------
.../impl/async/Http2AsyncMainClientExec.java | 6 +++---
.../HttpAsyncClientEventHandlerFactory.java | 18 +++++++++---------
.../impl/async/HttpAsyncMainClientExec.java | 6 +++---
.../async/InternalHttp2AsyncExecRuntime.java | 2 +-
.../async/InternalHttpAsyncExecRuntime.java | 2 +-
.../client5/http/impl/async/LogAppendable.java | 2 +-
.../LoggingAsyncClientExchangeHandler.java | 2 +-
.../http/impl/async/LoggingIOSession.java | 2 +-
.../client5/http/impl/auth/BasicAuthCache.java | 6 +++---
.../client5/http/impl/auth/CredSspScheme.java | 6 +++---
.../client5/http/impl/auth/GGSSchemeBase.java | 6 +++---
.../http/impl/auth/HttpAuthenticator.java | 6 +++---
.../http/impl/classic/CloseableHttpClient.java | 6 +++---
.../client5/http/impl/classic/ConnectExec.java | 6 +++---
.../http/impl/classic/InternalExecRuntime.java | 2 +-
.../http/impl/classic/InternalHttpClient.java | 6 +++---
.../http/impl/classic/MainClientExec.java | 6 +++---
.../http/impl/classic/MinimalHttpClient.java | 6 +++---
.../client5/http/impl/classic/ProtocolExec.java | 6 +++---
.../client5/http/impl/classic/RedirectExec.java | 6 +++---
.../hc/client5/http/impl/classic/RetryExec.java | 6 +++---
.../classic/ServiceUnavailableRetryExec.java | 6 +++---
.../io/BasicHttpClientConnectionManager.java | 6 +++---
.../io/DefaultHttpClientConnectionOperator.java | 6 +++---
.../io/DefaultManagedHttpClientConnection.java | 10 +++++-----
.../http/impl/io/LenientHttpResponseParser.java | 6 +++---
.../http/impl/io/LoggingSocketHolder.java | 2 +-
.../io/PoolingHttpClientConnectionManager.java | 6 +++---
.../DefaultManagedAsyncClientConnection.java | 6 +++---
.../PoolingAsyncClientConnectionManager.java | 6 +++---
.../http/protocol/RequestAddCookies.java | 6 +++---
.../client5/http/protocol/RequestAuthCache.java | 6 +++---
.../http/protocol/RequestClientConnControl.java | 6 +++---
.../http/protocol/ResponseProcessCookies.java | 6 +++---
.../http/psl/PublicSuffixMatcherLoader.java | 6 +++---
.../http/ssl/DefaultHostnameVerifier.java | 6 +++---
.../hc/client5/http/ssl/H2TlsStrategy.java | 6 +++---
.../http/ssl/SSLConnectionSocketFactory.java | 6 +++---
.../impl/classic/TestInternalExecRuntime.java | 2 +-
pom.xml | 14 +++++++++-----
68 files changed, 239 insertions(+), 206 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5-cache/pom.xml
----------------------------------------------------------------------
diff --git a/httpclient5-cache/pom.xml b/httpclient5-cache/pom.xml
index cc73ab0..dd45b71 100644
--- a/httpclient5-cache/pom.xml
+++ b/httpclient5-cache/pom.xml
@@ -45,14 +45,18 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>${log4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpAsyncCache.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpAsyncCache.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpAsyncCache.java
index 7b38fa0..c2edfdf 100644
--- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpAsyncCache.java
+++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpAsyncCache.java
@@ -50,12 +50,12 @@ import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.message.RequestLine;
import org.apache.hc.core5.http.message.StatusLine;
import org.apache.hc.core5.util.ByteArrayBuffer;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
class BasicHttpAsyncCache implements HttpAsyncCache {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final CacheUpdateHandler cacheUpdateHandler;
private final CacheKeyGenerator cacheKeyGenerator;
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCache.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCache.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCache.java
index 248cbcc..ba27808 100644
--- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCache.java
+++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCache.java
@@ -46,12 +46,12 @@ import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.message.RequestLine;
import org.apache.hc.core5.http.message.StatusLine;
import org.apache.hc.core5.util.ByteArrayBuffer;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
class BasicHttpCache implements HttpCache {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final CacheUpdateHandler cacheUpdateHandler;
private final CacheKeyGenerator cacheKeyGenerator;
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheRevalidatorBase.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheRevalidatorBase.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheRevalidatorBase.java
index be9d3af..9813871 100644
--- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheRevalidatorBase.java
+++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheRevalidatorBase.java
@@ -45,8 +45,8 @@ import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.util.Args;
import org.apache.hc.core5.util.TimeValue;
import org.apache.hc.core5.util.Timeout;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Abstract cache re-validation class.
@@ -94,7 +94,7 @@ class CacheRevalidatorBase implements Closeable {
private final Set<String> pendingRequest;
private final ConcurrentCountMap<String> failureCache;
- final Logger log = LogManager.getLogger(getClass());
+ final Logger log = LoggerFactory.getLogger(getClass());
/**
* Create CacheValidator which will make ache revalidation requests
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheableRequestPolicy.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheableRequestPolicy.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheableRequestPolicy.java
index d2278af..620ad9b 100644
--- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheableRequestPolicy.java
+++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheableRequestPolicy.java
@@ -36,8 +36,8 @@ import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpVersion;
import org.apache.hc.core5.http.ProtocolVersion;
import org.apache.hc.core5.http.message.MessageSupport;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Determines if an HttpRequest is allowed to be served from the cache.
@@ -47,7 +47,7 @@ import org.apache.logging.log4j.Logger;
@Contract(threading = ThreadingBehavior.IMMUTABLE)
class CacheableRequestPolicy {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
/**
* Determines if an HttpRequest can be served from the cache.
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachedResponseSuitabilityChecker.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachedResponseSuitabilityChecker.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachedResponseSuitabilityChecker.java
index c7160fb..f191778 100644
--- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachedResponseSuitabilityChecker.java
+++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachedResponseSuitabilityChecker.java
@@ -40,8 +40,8 @@ import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.message.MessageSupport;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Determines whether a given {@link HttpCacheEntry} is suitable to be
@@ -52,7 +52,7 @@ import org.apache.logging.log4j.Logger;
@Contract(threading = ThreadingBehavior.IMMUTABLE)
class CachedResponseSuitabilityChecker {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final boolean sharedCache;
private final boolean useHeuristicCaching;
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExec.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExec.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExec.java
index a01e696..66796b4 100644
--- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExec.java
+++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExec.java
@@ -69,8 +69,8 @@ import org.apache.hc.core5.http.protocol.HttpCoreContext;
import org.apache.hc.core5.net.URIAuthority;
import org.apache.hc.core5.util.Args;
import org.apache.hc.core5.util.ByteArrayBuffer;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <p>
@@ -107,7 +107,7 @@ public class CachingExec extends CachingExecBase implements ExecChainHandler {
private final DefaultCacheRevalidator cacheRevalidator;
private final ConditionalRequestBuilder<ClassicHttpRequest> conditionalRequestBuilder;
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
CachingExec(final HttpCache cache, final DefaultCacheRevalidator cacheRevalidator, final CacheConfig config) {
super(config);
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExecBase.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExecBase.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExecBase.java
index 63c1739..9fd6f56 100644
--- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExecBase.java
+++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExecBase.java
@@ -54,8 +54,8 @@ import org.apache.hc.core5.http.ProtocolVersion;
import org.apache.hc.core5.http.message.MessageSupport;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.util.VersionInfo;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class CachingExecBase {
@@ -76,7 +76,7 @@ public class CachingExecBase {
final RequestProtocolCompliance requestCompliance;
final CacheConfig cacheConfig;
- final Logger log = LogManager.getLogger(getClass());
+ final Logger log = LoggerFactory.getLogger(getClass());
CachingExecBase(
final CacheValidityPolicy validityPolicy,
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultAsyncCacheInvalidator.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultAsyncCacheInvalidator.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultAsyncCacheInvalidator.java
index c9f7b22..6043a54 100644
--- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultAsyncCacheInvalidator.java
+++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultAsyncCacheInvalidator.java
@@ -47,8 +47,8 @@ import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.HttpStatus;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Given a particular HTTP request / response pair, flush any cache entries
@@ -62,7 +62,7 @@ public class DefaultAsyncCacheInvalidator extends CacheInvalidatorBase implement
public static final DefaultAsyncCacheInvalidator INSTANCE = new DefaultAsyncCacheInvalidator();
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private void removeEntry(final HttpAsyncCacheStorage storage, final String cacheKey) {
storage.removeEntry(cacheKey, new FutureCallback<Boolean>() {
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultCacheInvalidator.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultCacheInvalidator.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultCacheInvalidator.java
index 2297e6f..7313080 100644
--- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultCacheInvalidator.java
+++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultCacheInvalidator.java
@@ -41,8 +41,8 @@ import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpResponse;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Given a particular HTTP request / response pair, flush any cache entries
@@ -56,7 +56,7 @@ public class DefaultCacheInvalidator extends CacheInvalidatorBase implements Htt
public static final DefaultCacheInvalidator INSTANCE = new DefaultCacheInvalidator();
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private HttpCacheEntry getEntry(final HttpCacheStorage storage, final String cacheKey) {
try {
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseCachingPolicy.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseCachingPolicy.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseCachingPolicy.java
index 4078c1a..e862274 100644
--- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseCachingPolicy.java
+++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseCachingPolicy.java
@@ -46,8 +46,8 @@ import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.HttpVersion;
import org.apache.hc.core5.http.ProtocolVersion;
import org.apache.hc.core5.http.message.MessageSupport;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Determines if an HttpResponse can be cached.
@@ -68,7 +68,7 @@ class ResponseCachingPolicy {
HttpStatus.SC_MOVED_PERMANENTLY,
HttpStatus.SC_GONE));
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final long maxObjectSizeBytes;
private final boolean sharedCache;
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/SHA256KeyHashingScheme.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/SHA256KeyHashingScheme.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/SHA256KeyHashingScheme.java
index 9b1c13f..dd23b3c 100644
--- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/SHA256KeyHashingScheme.java
+++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/SHA256KeyHashingScheme.java
@@ -30,8 +30,8 @@ import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import org.apache.commons.codec.binary.Hex;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This is a {@link KeyHashingScheme} based on the
@@ -44,7 +44,7 @@ public final class SHA256KeyHashingScheme implements KeyHashingScheme {
public static final SHA256KeyHashingScheme INSTANCE = new SHA256KeyHashingScheme();
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
@Override
public String hash(final String key) {
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5-fluent/pom.xml
----------------------------------------------------------------------
diff --git a/httpclient5-fluent/pom.xml b/httpclient5-fluent/pom.xml
index 40253e1..6510e7b 100644
--- a/httpclient5-fluent/pom.xml
+++ b/httpclient5-fluent/pom.xml
@@ -51,15 +51,19 @@
<scope>test</scope>
<classifier>tests</classifier>
</dependency>
- <!-- direct dependency on logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>${log4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/httpclient5-osgi/pom.xml b/httpclient5-osgi/pom.xml
index dc29005..bc5c72f 100644
--- a/httpclient5-osgi/pom.xml
+++ b/httpclient5-osgi/pom.xml
@@ -40,8 +40,8 @@
<packaging>bundle</packaging>
<properties>
- <httpcore.osgi.import.version>"5.0-alpha2"</httpcore.osgi.import.version>
- <log4j.osgi.import.version>"2.8"</log4j.osgi.import.version>
+ <httpcore.osgi.import.version>"5.0-beta1"</httpcore.osgi.import.version>
+ <slf4j.osgi.import.version>"[1.7, 1.8)"</slf4j.osgi.import.version>
<osgi.framework.version>5.0.0</osgi.framework.version>
</properties>
@@ -57,12 +57,6 @@
<artifactId>httpcore5-osgi</artifactId>
<version>${httpcore.version}</version>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.httpcomponents.client5</groupId>
- <artifactId>httpcore-nio</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
@@ -134,7 +128,7 @@
org.ietf.jgss,,
org.osgi.framework,
org.osgi.service.cm,
- org.apache.logging.log4j;version=${log4j.osgi.import.version},
+ org.slf4j;version=${slf4j.osgi.import.version},
org.apache.hc.core5.*;version=${httpcore.osgi.import.version},
org.ehcache.*;resolution:=optional,
net.spy.memcached.*;resolution:=optional
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiCredentialsProvider.java
----------------------------------------------------------------------
diff --git a/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiCredentialsProvider.java b/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiCredentialsProvider.java
index dc9fc27..d49a7c4 100644
--- a/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiCredentialsProvider.java
+++ b/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiCredentialsProvider.java
@@ -35,15 +35,15 @@ import org.apache.hc.client5.http.auth.NTCredentials;
import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
import org.apache.hc.client5.http.osgi.services.ProxyConfiguration;
import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @since 4.3
*/
final class OSGiCredentialsProvider implements CredentialsStore {
- private static final Logger log = LogManager.getLogger(OSGiCredentialsProvider.class);
+ private static final Logger log = LoggerFactory.getLogger(OSGiCredentialsProvider.class);
private static final int HOST_AND_PORT_MATCH = 12;
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5-testing/pom.xml
----------------------------------------------------------------------
diff --git a/httpclient5-testing/pom.xml b/httpclient5-testing/pom.xml
index 3693fc3..35212ec 100644
--- a/httpclient5-testing/pom.xml
+++ b/httpclient5-testing/pom.xml
@@ -49,6 +49,18 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <!-- TODO remove after upgrade to HttpCore 5.0b2 -->
+ <dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<scope>compile</scope>
@@ -57,6 +69,7 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>compile</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5-win/pom.xml
----------------------------------------------------------------------
diff --git a/httpclient5-win/pom.xml b/httpclient5-win/pom.xml
index e4a9fc1..0cb290e 100644
--- a/httpclient5-win/pom.xml
+++ b/httpclient5-win/pom.xml
@@ -51,6 +51,21 @@
<classifier>tests</classifier>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<scope>compile</scope>
@@ -65,11 +80,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<reporting>
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateScheme.java
----------------------------------------------------------------------
diff --git a/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateScheme.java b/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateScheme.java
index 90dc906..e7d2b91 100644
--- a/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateScheme.java
+++ b/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateScheme.java
@@ -44,8 +44,8 @@ import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.net.URIAuthority;
import org.apache.hc.core5.util.Args;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.sun.jna.platform.win32.Secur32;
import com.sun.jna.platform.win32.Secur32Util;
@@ -71,7 +71,7 @@ import com.sun.jna.ptr.IntByReference;
*/
public class WindowsNegotiateScheme implements AuthScheme {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
// NTLM or Negotiate
private final String scheme;
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/pom.xml
----------------------------------------------------------------------
diff --git a/httpclient5/pom.xml b/httpclient5/pom.xml
index 9361eb9..f7e6d0b 100644
--- a/httpclient5/pom.xml
+++ b/httpclient5/pom.xml
@@ -48,14 +48,18 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>${log4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultAuthenticationStrategy.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultAuthenticationStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultAuthenticationStrategy.java
index 8923361..bfcf98f 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultAuthenticationStrategy.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultAuthenticationStrategy.java
@@ -48,8 +48,8 @@ import org.apache.hc.core5.annotation.ThreadingBehavior;
import org.apache.hc.core5.http.config.Lookup;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.util.Args;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Default implementation of {@link AuthenticationStrategy}
@@ -59,7 +59,7 @@ import org.apache.logging.log4j.Logger;
@Contract(threading = ThreadingBehavior.IMMUTABLE)
public class DefaultAuthenticationStrategy implements AuthenticationStrategy {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
public static final DefaultAuthenticationStrategy INSTANCE = new DefaultAuthenticationStrategy();
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/InMemoryDnsResolver.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/InMemoryDnsResolver.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/InMemoryDnsResolver.java
index 7c28c2b..f915b8c 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/InMemoryDnsResolver.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/InMemoryDnsResolver.java
@@ -34,8 +34,8 @@ import java.util.concurrent.ConcurrentHashMap;
import org.apache.hc.client5.http.DnsResolver;
import org.apache.hc.core5.util.Args;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* In-memory {@link DnsResolver} implementation.
@@ -45,7 +45,7 @@ import org.apache.logging.log4j.Logger;
public class InMemoryDnsResolver implements DnsResolver {
/** Logger associated to this class. */
- private final Logger log = LogManager.getLogger(InMemoryDnsResolver.class);
+ private final Logger log = LoggerFactory.getLogger(InMemoryDnsResolver.class);
/**
* In-memory collection that will hold the associations between a host name
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/Wire.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/Wire.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/Wire.java
index fd48ebd..e7db3fe 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/Wire.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/Wire.java
@@ -31,7 +31,7 @@ import java.nio.ByteBuffer;
import org.apache.hc.core5.annotation.Internal;
import org.apache.hc.core5.util.Args;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
@Internal
public class Wire {
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AbstractHttpAsyncClientBase.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AbstractHttpAsyncClientBase.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AbstractHttpAsyncClientBase.java
index 11ccf4a..8cf0793 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AbstractHttpAsyncClientBase.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AbstractHttpAsyncClientBase.java
@@ -40,14 +40,14 @@ import org.apache.hc.core5.reactor.DefaultConnectingIOReactor;
import org.apache.hc.core5.reactor.ExceptionEvent;
import org.apache.hc.core5.reactor.IOReactorStatus;
import org.apache.hc.core5.util.TimeValue;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
abstract class AbstractHttpAsyncClientBase extends CloseableHttpAsyncClient {
enum Status { READY, RUNNING, TERMINATED }
- final Logger log = LogManager.getLogger(getClass());
+ final Logger log = LoggerFactory.getLogger(getClass());
private final AsyncPushConsumerRegistry pushConsumerRegistry;
private final DefaultConnectingIOReactor ioReactor;
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncConnectExec.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncConnectExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncConnectExec.java
index 378b44e..e5a8e62 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncConnectExec.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncConnectExec.java
@@ -63,8 +63,8 @@ import org.apache.hc.core5.http.nio.AsyncEntityProducer;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
import org.apache.hc.core5.http.protocol.HttpProcessor;
import org.apache.hc.core5.util.Args;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Request executor in the HTTP request execution chain
@@ -76,7 +76,7 @@ import org.apache.logging.log4j.Logger;
@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
public final class AsyncConnectExec implements AsyncExecChainHandler {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final HttpProcessor proxyHttpProcessor;
private final AuthenticationStrategy proxyAuthStrategy;
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncProtocolExec.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncProtocolExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncProtocolExec.java
index 6d524fe..4b3f7b6 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncProtocolExec.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncProtocolExec.java
@@ -64,8 +64,8 @@ import org.apache.hc.core5.http.protocol.HttpCoreContext;
import org.apache.hc.core5.http.protocol.HttpProcessor;
import org.apache.hc.core5.net.URIAuthority;
import org.apache.hc.core5.util.Args;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Request executor in the request execution chain that is responsible
@@ -80,7 +80,7 @@ import org.apache.logging.log4j.Logger;
@Contract(threading = ThreadingBehavior.IMMUTABLE)
class AsyncProtocolExec implements AsyncExecChainHandler {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final HttpProcessor httpProcessor;
private final AuthenticationStrategy targetAuthStrategy;
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncRedirectExec.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncRedirectExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncRedirectExec.java
index cdd86b5..3975813 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncRedirectExec.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncRedirectExec.java
@@ -55,12 +55,12 @@ import org.apache.hc.core5.http.message.BasicHttpRequest;
import org.apache.hc.core5.http.nio.AsyncDataConsumer;
import org.apache.hc.core5.http.nio.AsyncEntityProducer;
import org.apache.hc.core5.util.LangUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
class AsyncRedirectExec implements AsyncExecChainHandler {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final HttpRoutePlanner routePlanner;
private final RedirectStrategy redirectStrategy;
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncRetryExec.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncRetryExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncRetryExec.java
index 309d44b..1118ed3 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncRetryExec.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncRetryExec.java
@@ -42,12 +42,12 @@ import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.nio.AsyncDataConsumer;
import org.apache.hc.core5.http.nio.AsyncEntityProducer;
import org.apache.hc.core5.util.Args;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
class AsyncRetryExec implements AsyncExecChainHandler {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final HttpRequestRetryHandler retryHandler;
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/Http2AsyncClientEventHandlerFactory.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/Http2AsyncClientEventHandlerFactory.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/Http2AsyncClientEventHandlerFactory.java
index 564a561..9c5cd87 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/Http2AsyncClientEventHandlerFactory.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/Http2AsyncClientEventHandlerFactory.java
@@ -48,8 +48,8 @@ import org.apache.hc.core5.reactor.IOEventHandler;
import org.apache.hc.core5.reactor.IOEventHandlerFactory;
import org.apache.hc.core5.reactor.TlsCapableIOSession;
import org.apache.hc.core5.util.Args;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @since 5.0
@@ -57,11 +57,11 @@ import org.apache.logging.log4j.Logger;
@Contract(threading = ThreadingBehavior.IMMUTABLE)
class Http2AsyncClientEventHandlerFactory implements IOEventHandlerFactory {
- private final Logger wireLog = LogManager.getLogger("org.apache.hc.client5.http.wire");
- private final Logger headerLog = LogManager.getLogger("org.apache.hc.client5.http.headers");
- private final Logger frameLog = LogManager.getLogger("org.apache.hc.client5.http2.frame");
- private final Logger framePayloadLog = LogManager.getLogger("org.apache.hc.client5.http2.frame.payload");
- private final Logger flowCtrlLog = LogManager.getLogger("org.apache.hc.client5.http2.flow");
+ private final Logger wireLog = LoggerFactory.getLogger("org.apache.hc.client5.http.wire");
+ private final Logger headerLog = LoggerFactory.getLogger("org.apache.hc.client5.http.headers");
+ private final Logger frameLog = LoggerFactory.getLogger("org.apache.hc.client5.http2.frame");
+ private final Logger framePayloadLog = LoggerFactory.getLogger("org.apache.hc.client5.http2.frame.payload");
+ private final Logger flowCtrlLog = LoggerFactory.getLogger("org.apache.hc.client5.http2.flow");
private final HttpProcessor httpProcessor;
private final HandlerFactory<AsyncPushConsumer> exchangeHandlerFactory;
@@ -81,7 +81,7 @@ class Http2AsyncClientEventHandlerFactory implements IOEventHandlerFactory {
@Override
public IOEventHandler createHandler(final TlsCapableIOSession ioSession, final Object attachment) {
- final Logger sessionLog = LogManager.getLogger(ioSession.getClass());
+ final Logger sessionLog = LoggerFactory.getLogger(ioSession.getClass());
if (sessionLog.isDebugEnabled()
|| wireLog.isDebugEnabled()
|| headerLog.isDebugEnabled()
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/Http2AsyncMainClientExec.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/Http2AsyncMainClientExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/Http2AsyncMainClientExec.java
index a954a56..18c6892 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/Http2AsyncMainClientExec.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/Http2AsyncMainClientExec.java
@@ -50,12 +50,12 @@ import org.apache.hc.core5.http.nio.AsyncEntityProducer;
import org.apache.hc.core5.http.nio.CapacityChannel;
import org.apache.hc.core5.http.nio.DataStreamChannel;
import org.apache.hc.core5.http.nio.RequestChannel;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
class Http2AsyncMainClientExec implements AsyncExecChainHandler {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
@Override
public void execute(
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientEventHandlerFactory.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientEventHandlerFactory.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientEventHandlerFactory.java
index 4a97d67..71f3a80 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientEventHandlerFactory.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientEventHandlerFactory.java
@@ -64,8 +64,8 @@ import org.apache.hc.core5.reactor.IOEventHandler;
import org.apache.hc.core5.reactor.IOEventHandlerFactory;
import org.apache.hc.core5.reactor.TlsCapableIOSession;
import org.apache.hc.core5.util.Args;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @since 5.0
@@ -73,12 +73,12 @@ import org.apache.logging.log4j.Logger;
@Contract(threading = ThreadingBehavior.IMMUTABLE)
class HttpAsyncClientEventHandlerFactory implements IOEventHandlerFactory {
- private final Logger streamLog = LogManager.getLogger(InternalHttpAsyncClient.class);
- private final Logger wireLog = LogManager.getLogger("org.apache.hc.client5.http.wire");
- private final Logger headerLog = LogManager.getLogger("org.apache.hc.client5.http.headers");
- private final Logger frameLog = LogManager.getLogger("org.apache.hc.client5.http2.frame");
- private final Logger framePayloadLog = LogManager.getLogger("org.apache.hc.client5.http2.frame.payload");
- private final Logger flowCtrlLog = LogManager.getLogger("org.apache.hc.client5.http2.flow");
+ private final Logger streamLog = LoggerFactory.getLogger(InternalHttpAsyncClient.class);
+ private final Logger wireLog = LoggerFactory.getLogger("org.apache.hc.client5.http.wire");
+ private final Logger headerLog = LoggerFactory.getLogger("org.apache.hc.client5.http.headers");
+ private final Logger frameLog = LoggerFactory.getLogger("org.apache.hc.client5.http2.frame");
+ private final Logger framePayloadLog = LoggerFactory.getLogger("org.apache.hc.client5.http2.frame.payload");
+ private final Logger flowCtrlLog = LoggerFactory.getLogger("org.apache.hc.client5.http2.flow");
private final HttpProcessor httpProcessor;
private final HandlerFactory<AsyncPushConsumer> exchangeHandlerFactory;
@@ -111,7 +111,7 @@ class HttpAsyncClientEventHandlerFactory implements IOEventHandlerFactory {
@Override
public IOEventHandler createHandler(final TlsCapableIOSession ioSession, final Object attachment) {
- final Logger sessionLog = LogManager.getLogger(ioSession.getClass());
+ final Logger sessionLog = LoggerFactory.getLogger(ioSession.getClass());
if (sessionLog.isDebugEnabled()
|| streamLog.isDebugEnabled()
|| wireLog.isDebugEnabled()
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncMainClientExec.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncMainClientExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncMainClientExec.java
index 012803c..301382c 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncMainClientExec.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncMainClientExec.java
@@ -55,12 +55,12 @@ import org.apache.hc.core5.http.nio.CapacityChannel;
import org.apache.hc.core5.http.nio.DataStreamChannel;
import org.apache.hc.core5.http.nio.RequestChannel;
import org.apache.hc.core5.util.TimeValue;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
class HttpAsyncMainClientExec implements AsyncExecChainHandler {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final ConnectionKeepAliveStrategy keepAliveStrategy;
private final UserTokenHandler userTokenHandler;
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalHttp2AsyncExecRuntime.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalHttp2AsyncExecRuntime.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalHttp2AsyncExecRuntime.java
index 4c93f85..be8ef7c 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalHttp2AsyncExecRuntime.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalHttp2AsyncExecRuntime.java
@@ -45,7 +45,7 @@ import org.apache.hc.core5.http2.nio.pool.H2ConnPool;
import org.apache.hc.core5.io.ShutdownType;
import org.apache.hc.core5.reactor.IOSession;
import org.apache.hc.core5.util.TimeValue;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
class InternalHttp2AsyncExecRuntime implements AsyncExecRuntime {
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalHttpAsyncExecRuntime.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalHttpAsyncExecRuntime.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalHttpAsyncExecRuntime.java
index 761662d..dc91be1 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalHttpAsyncExecRuntime.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalHttpAsyncExecRuntime.java
@@ -45,7 +45,7 @@ import org.apache.hc.core5.http.nio.AsyncClientExchangeHandler;
import org.apache.hc.core5.http2.HttpVersionPolicy;
import org.apache.hc.core5.reactor.ConnectionInitiator;
import org.apache.hc.core5.util.TimeValue;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
class InternalHttpAsyncExecRuntime implements AsyncExecRuntime {
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LogAppendable.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LogAppendable.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LogAppendable.java
index 5d5070d..1a328a6 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LogAppendable.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LogAppendable.java
@@ -29,7 +29,7 @@ package org.apache.hc.client5.http.impl.async;
import java.io.IOException;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
public final class LogAppendable implements Appendable {
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LoggingAsyncClientExchangeHandler.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LoggingAsyncClientExchangeHandler.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LoggingAsyncClientExchangeHandler.java
index 1adb824..b605da4 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LoggingAsyncClientExchangeHandler.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LoggingAsyncClientExchangeHandler.java
@@ -42,7 +42,7 @@ import org.apache.hc.core5.http.nio.CapacityChannel;
import org.apache.hc.core5.http.nio.DataStreamChannel;
import org.apache.hc.core5.http.nio.RequestChannel;
import org.apache.hc.core5.util.Identifiable;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
final class LoggingAsyncClientExchangeHandler implements AsyncClientExchangeHandler, Identifiable {
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LoggingIOSession.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LoggingIOSession.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LoggingIOSession.java
index c8f27c1..b9f4ede 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LoggingIOSession.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LoggingIOSession.java
@@ -44,7 +44,7 @@ import org.apache.hc.core5.reactor.ssl.SSLBufferManagement;
import org.apache.hc.core5.reactor.ssl.SSLSessionInitializer;
import org.apache.hc.core5.reactor.ssl.SSLSessionVerifier;
import org.apache.hc.core5.reactor.ssl.TlsDetails;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
class LoggingIOSession implements TlsCapableIOSession {
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/BasicAuthCache.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/BasicAuthCache.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/BasicAuthCache.java
index d9b2980..33f886c 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/BasicAuthCache.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/BasicAuthCache.java
@@ -44,8 +44,8 @@ import org.apache.hc.core5.annotation.Contract;
import org.apache.hc.core5.annotation.ThreadingBehavior;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.util.Args;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Default implementation of {@link AuthCache}. This implements
@@ -60,7 +60,7 @@ import org.apache.logging.log4j.Logger;
@Contract(threading = ThreadingBehavior.SAFE_CONDITIONAL)
public class BasicAuthCache implements AuthCache {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final Map<HttpHost, byte[]> map;
private final SchemePortResolver schemePortResolver;
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/CredSspScheme.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/CredSspScheme.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/CredSspScheme.java
index 040bcdd..62484ae 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/CredSspScheme.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/CredSspScheme.java
@@ -60,8 +60,8 @@ import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.util.Args;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <p>
@@ -83,7 +83,7 @@ public class CredSspScheme implements AuthScheme
private static final Charset UNICODE_LITTLE_UNMARKED = Charset.forName( "UnicodeLittleUnmarked" );
public static final String SCHEME_NAME = "CredSSP";
- private final Logger log = LogManager.getLogger( CredSspScheme.class );
+ private final Logger log = LoggerFactory.getLogger( CredSspScheme.class );
enum State
{
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/GGSSchemeBase.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/GGSSchemeBase.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/GGSSchemeBase.java
index 1453a21..9afa26d 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/GGSSchemeBase.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/GGSSchemeBase.java
@@ -47,14 +47,14 @@ import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.util.Args;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
import org.ietf.jgss.GSSContext;
import org.ietf.jgss.GSSCredential;
import org.ietf.jgss.GSSException;
import org.ietf.jgss.GSSManager;
import org.ietf.jgss.GSSName;
import org.ietf.jgss.Oid;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @since 4.2
@@ -68,7 +68,7 @@ public abstract class GGSSchemeBase implements AuthScheme {
FAILED,
}
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final KerberosConfig config;
private final DnsResolver dnsResolver;
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java
index 3f651c5..20b480c 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java
@@ -58,8 +58,8 @@ import org.apache.hc.core5.http.message.ParserCursor;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.util.Asserts;
import org.apache.hc.core5.util.CharArrayBuffer;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @since 4.3
@@ -71,7 +71,7 @@ public class HttpAuthenticator {
public HttpAuthenticator(final Logger log) {
super();
- this.log = log != null ? log : LogManager.getLogger(getClass());
+ this.log = log != null ? log : LoggerFactory.getLogger(getClass());
this.parser = new AuthChallengeParser();
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/CloseableHttpClient.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/CloseableHttpClient.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/CloseableHttpClient.java
index 28fa833..de105ca 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/CloseableHttpClient.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/CloseableHttpClient.java
@@ -45,8 +45,8 @@ import org.apache.hc.core5.http.io.HttpClientResponseHandler;
import org.apache.hc.core5.http.io.entity.EntityUtils;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.util.Args;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Base implementation of {@link HttpClient} that also implements {@link Closeable}.
@@ -56,7 +56,7 @@ import org.apache.logging.log4j.Logger;
@Contract(threading = ThreadingBehavior.SAFE)
public abstract class CloseableHttpClient implements HttpClient, Closeable {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
protected abstract CloseableHttpResponse doExecute(HttpHost target, ClassicHttpRequest request,
HttpContext context) throws IOException;
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ConnectExec.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ConnectExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ConnectExec.java
index 1fb5900..aa31790 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ConnectExec.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ConnectExec.java
@@ -60,8 +60,8 @@ import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
import org.apache.hc.core5.http.message.StatusLine;
import org.apache.hc.core5.http.protocol.HttpProcessor;
import org.apache.hc.core5.util.Args;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Request executor in the HTTP request execution chain
@@ -73,7 +73,7 @@ import org.apache.logging.log4j.Logger;
@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
public final class ConnectExec implements ExecChainHandler {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final ConnectionReuseStrategy reuseStrategy;
private final HttpProcessor proxyHttpProcessor;
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/InternalExecRuntime.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/InternalExecRuntime.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/InternalExecRuntime.java
index 40b4d20..6398957 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/InternalExecRuntime.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/InternalExecRuntime.java
@@ -50,7 +50,7 @@ import org.apache.hc.core5.io.ShutdownType;
import org.apache.hc.core5.util.Args;
import org.apache.hc.core5.util.TimeValue;
import org.apache.hc.core5.util.Timeout;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
class InternalExecRuntime implements ExecRuntime, Cancellable {
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/InternalHttpClient.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/InternalHttpClient.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/InternalHttpClient.java
index e4fd36a..e915677 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/InternalHttpClient.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/InternalHttpClient.java
@@ -60,8 +60,8 @@ import org.apache.hc.core5.http.protocol.BasicHttpContext;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.net.URIAuthority;
import org.apache.hc.core5.util.Args;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Internal class.
@@ -71,7 +71,7 @@ import org.apache.logging.log4j.Logger;
@Contract(threading = ThreadingBehavior.SAFE_CONDITIONAL)
class InternalHttpClient extends CloseableHttpClient implements Configurable {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final HttpClientConnectionManager connManager;
private final HttpRequestExecutor requestExecutor;
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/MainClientExec.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/MainClientExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/MainClientExec.java
index 661139d..aa08ed7 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/MainClientExec.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/MainClientExec.java
@@ -48,8 +48,8 @@ import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.message.RequestLine;
import org.apache.hc.core5.util.Args;
import org.apache.hc.core5.util.TimeValue;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The last request executor in the HTTP request execution chain
@@ -61,7 +61,7 @@ import org.apache.logging.log4j.Logger;
@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
final class MainClientExec implements ExecChainHandler {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final ConnectionReuseStrategy reuseStrategy;
private final ConnectionKeepAliveStrategy keepAliveStrategy;
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/MinimalHttpClient.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/MinimalHttpClient.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/MinimalHttpClient.java
index a34ea27..2ecb520 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/MinimalHttpClient.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/MinimalHttpClient.java
@@ -64,8 +64,8 @@ import org.apache.hc.core5.http.protocol.RequestUserAgent;
import org.apache.hc.core5.net.URIAuthority;
import org.apache.hc.core5.util.Args;
import org.apache.hc.core5.util.VersionInfo;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Internal class.
@@ -75,7 +75,7 @@ import org.apache.logging.log4j.Logger;
@Contract(threading = ThreadingBehavior.SAFE)
public class MinimalHttpClient extends CloseableHttpClient {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final HttpClientConnectionManager connManager;
private final ConnectionReuseStrategy reuseStrategy;
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ProtocolExec.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ProtocolExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ProtocolExec.java
index 0816223..c311a87 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ProtocolExec.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ProtocolExec.java
@@ -63,8 +63,8 @@ import org.apache.hc.core5.http.protocol.HttpCoreContext;
import org.apache.hc.core5.http.protocol.HttpProcessor;
import org.apache.hc.core5.net.URIAuthority;
import org.apache.hc.core5.util.Args;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Request executor in the request execution chain that is responsible
@@ -80,7 +80,7 @@ import org.apache.logging.log4j.Logger;
@Contract(threading = ThreadingBehavior.IMMUTABLE)
final class ProtocolExec implements ExecChainHandler {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final HttpProcessor httpProcessor;
private final AuthenticationStrategy targetAuthStrategy;
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RedirectExec.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RedirectExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RedirectExec.java
index 80e5cbf..6743afd 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RedirectExec.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RedirectExec.java
@@ -58,8 +58,8 @@ import org.apache.hc.core5.http.ProtocolException;
import org.apache.hc.core5.http.io.entity.EntityUtils;
import org.apache.hc.core5.util.Args;
import org.apache.hc.core5.util.LangUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Request executor in the request execution chain that is responsible
@@ -75,7 +75,7 @@ import org.apache.logging.log4j.Logger;
@Contract(threading = ThreadingBehavior.SAFE_CONDITIONAL)
final class RedirectExec implements ExecChainHandler {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final RedirectStrategy redirectStrategy;
private final HttpRoutePlanner routePlanner;
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RetryExec.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RetryExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RetryExec.java
index 8e7c8a5..1f1be4f 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RetryExec.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RetryExec.java
@@ -42,8 +42,8 @@ import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.NoHttpResponseException;
import org.apache.hc.core5.util.Args;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Request executor in the request execution chain that is responsible
@@ -60,7 +60,7 @@ import org.apache.logging.log4j.Logger;
@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
final class RetryExec implements ExecChainHandler {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final HttpRequestRetryHandler retryHandler;
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ServiceUnavailableRetryExec.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ServiceUnavailableRetryExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ServiceUnavailableRetryExec.java
index e36a02f..285d4d8 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ServiceUnavailableRetryExec.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ServiceUnavailableRetryExec.java
@@ -41,8 +41,8 @@ import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.util.Args;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Request executor in the request execution chain that is responsible
@@ -59,7 +59,7 @@ import org.apache.logging.log4j.Logger;
@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
final class ServiceUnavailableRetryExec implements ExecChainHandler {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final ServiceUnavailableRetryStrategy retryStrategy;
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java
index f884313..d6f1f6f 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java
@@ -66,8 +66,8 @@ import org.apache.hc.core5.util.Asserts;
import org.apache.hc.core5.util.LangUtils;
import org.apache.hc.core5.util.TimeValue;
import org.apache.hc.core5.util.Timeout;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A connection manager for a single connection. This connection manager maintains only one active
@@ -90,7 +90,7 @@ import org.apache.logging.log4j.Logger;
@Contract(threading = ThreadingBehavior.SAFE)
public class BasicHttpClientConnectionManager implements HttpClientConnectionManager {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final HttpClientConnectionOperator connectionOperator;
private final HttpConnectionFactory<ManagedHttpClientConnection> connFactory;
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpClientConnectionOperator.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpClientConnectionOperator.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpClientConnectionOperator.java
index 0a38018..6b532b7 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpClientConnectionOperator.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpClientConnectionOperator.java
@@ -56,8 +56,8 @@ import org.apache.hc.core5.http.config.SocketConfig;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.util.Args;
import org.apache.hc.core5.util.TimeValue;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Default implementation of {@link HttpClientConnectionOperator} used as default in Http client,
@@ -72,7 +72,7 @@ public class DefaultHttpClientConnectionOperator implements HttpClientConnection
static final String SOCKET_FACTORY_REGISTRY = "http.socket-factory-registry";
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final Lookup<ConnectionSocketFactory> socketFactoryRegistry;
private final SchemePortResolver schemePortResolver;
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultManagedHttpClientConnection.java
----------------------------------------------------------------------
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 98e0e29..6e5d78c 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
@@ -51,8 +51,8 @@ import org.apache.hc.core5.http.message.RequestLine;
import org.apache.hc.core5.http.message.StatusLine;
import org.apache.hc.core5.io.ShutdownType;
import org.apache.hc.core5.util.Identifiable;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Default {@link ManagedHttpClientConnection} implementation.
@@ -62,9 +62,9 @@ import org.apache.logging.log4j.Logger;
final class DefaultManagedHttpClientConnection
extends DefaultBHttpClientConnection implements ManagedHttpClientConnection, Identifiable {
- private final Logger log = LogManager.getLogger(DefaultManagedHttpClientConnection.class);
- private final Logger headerlog = LogManager.getLogger("org.apache.hc.client5.http.headers");
- private final Logger wirelog = LogManager.getLogger("org.apache.hc.client5.http.wire");
+ private final Logger log = LoggerFactory.getLogger(DefaultManagedHttpClientConnection.class);
+ private final Logger headerlog = LoggerFactory.getLogger("org.apache.hc.client5.http.headers");
+ private final Logger wirelog = LoggerFactory.getLogger("org.apache.hc.client5.http.wire");
private final String id;
private final AtomicBoolean closed;
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LenientHttpResponseParser.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LenientHttpResponseParser.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LenientHttpResponseParser.java
index b7b0e50..4a0c246 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LenientHttpResponseParser.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LenientHttpResponseParser.java
@@ -36,8 +36,8 @@ import org.apache.hc.core5.http.config.H1Config;
import org.apache.hc.core5.http.impl.io.DefaultHttpResponseParser;
import org.apache.hc.core5.http.message.LineParser;
import org.apache.hc.core5.util.CharArrayBuffer;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Lenient HTTP response parser implementation that can skip malformed data until
@@ -47,7 +47,7 @@ import org.apache.logging.log4j.Logger;
*/
public class LenientHttpResponseParser extends DefaultHttpResponseParser {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
/**
* Creates new instance of DefaultHttpResponseParser.
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingSocketHolder.java
----------------------------------------------------------------------
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 b7aae76..5107b33 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
@@ -34,7 +34,7 @@ import java.net.Socket;
import org.apache.hc.client5.http.impl.Wire;
import org.apache.hc.core5.http.impl.io.SocketHolder;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
class LoggingSocketHolder extends SocketHolder {
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java
index cb17912..d077dee 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java
@@ -74,8 +74,8 @@ import org.apache.hc.core5.util.Args;
import org.apache.hc.core5.util.Asserts;
import org.apache.hc.core5.util.TimeValue;
import org.apache.hc.core5.util.Timeout;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* {@code ClientConnectionPoolManager} maintains a pool of
@@ -105,7 +105,7 @@ import org.apache.logging.log4j.Logger;
public class PoolingHttpClientConnectionManager
implements HttpClientConnectionManager, ConnPoolControl<HttpRoute> {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
public static final int DEFAULT_MAX_TOTAL_CONNECTIONS = 25;
public static final int DEFAULT_MAX_CONNECTIONS_PER_ROUTE = 5;
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultManagedAsyncClientConnection.java
----------------------------------------------------------------------
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 8a8a85a..29ff01e 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
@@ -52,8 +52,8 @@ import org.apache.hc.core5.reactor.ssl.SSLSessionVerifier;
import org.apache.hc.core5.reactor.ssl.TlsDetails;
import org.apache.hc.core5.reactor.ssl.TransportSecurityLayer;
import org.apache.hc.core5.util.Identifiable;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Default {@link ManagedAsyncClientConnection} implementation.
@@ -63,7 +63,7 @@ import org.apache.logging.log4j.Logger;
@Internal
final class DefaultManagedAsyncClientConnection implements ManagedAsyncClientConnection, Identifiable {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final IOSession ioSession;
private final int socketTimeout;
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb71f45e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManager.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManager.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManager.java
index 7973f61..2550df9 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManager.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManager.java
@@ -77,8 +77,8 @@ import org.apache.hc.core5.util.Asserts;
import org.apache.hc.core5.util.Identifiable;
import org.apache.hc.core5.util.TimeValue;
import org.apache.hc.core5.util.Timeout;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* {@code PoolingAsyncClientConnectionManager} maintains a pool of non-blocking
@@ -101,7 +101,7 @@ import org.apache.logging.log4j.Logger;
@Contract(threading = ThreadingBehavior.SAFE_CONDITIONAL)
public class PoolingAsyncClientConnectionManager implements AsyncClientConnectionManager, ConnPoolControl<HttpRoute> {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
public static final int DEFAULT_MAX_TOTAL_CONNECTIONS = 25;
public static final int DEFAULT_MAX_CONNECTIONS_PER_ROUTE = 5;