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:16:49 UTC
httpcomponents-core git commit: SLF4J logging facade
Repository: httpcomponents-core
Updated Branches:
refs/heads/master ce51858e3 -> 5a66acc87
SLF4J logging facade
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/commit/5a66acc8
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/tree/5a66acc8
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/diff/5a66acc8
Branch: refs/heads/master
Commit: 5a66acc87619a2d6dd3e01876ca58cc740be320b
Parents: ce51858
Author: Oleg Kalnichevski <ol...@apache.org>
Authored: Mon Jan 8 14:44:31 2018 +0100
Committer: Oleg Kalnichevski <ol...@apache.org>
Committed: Mon Jan 8 14:44:31 2018 +0100
----------------------------------------------------------------------
httpcore5-h2/pom.xml | 7 ++++++-
httpcore5-testing/pom.xml | 9 ++++++++-
.../testing/classic/LoggingBHttpClientConnection.java | 10 +++++-----
.../testing/classic/LoggingBHttpServerConnection.java | 10 +++++-----
.../core5/testing/classic/LoggingConnPoolListener.java | 6 +++---
.../core5/testing/classic/LoggingExceptionListener.java | 6 +++---
.../testing/classic/LoggingHttp1StreamListener.java | 6 +++---
.../java/org/apache/hc/core5/testing/classic/Wire.java | 2 +-
.../org/apache/hc/core5/testing/nio/LogAppendable.java | 2 +-
.../core5/testing/nio/LoggingHttp1StreamListener.java | 8 ++++----
.../core5/testing/nio/LoggingHttp2StreamListener.java | 12 ++++++------
.../apache/hc/core5/testing/nio/LoggingIOSession.java | 2 +-
.../hc/core5/testing/nio/LoggingIOSessionDecorator.java | 8 ++++----
.../hc/core5/testing/nio/LoggingIOSessionListener.java | 6 +++---
.../testing/classic/ClassicAuthenticationTest.java | 6 +++---
.../testing/classic/ClassicServerAndRequesterTest.java | 6 +++---
.../hc/core5/testing/nio/Http1AuthenticationTest.java | 6 +++---
.../hc/core5/testing/nio/Http1IntegrationTest.java | 6 +++---
.../core5/testing/nio/Http1ServerAndRequesterTest.java | 6 +++---
.../org/apache/hc/core5/testing/nio/Http2ALPNTest.java | 6 +++---
.../hc/core5/testing/nio/Http2IntegrationTest.java | 6 +++---
.../core5/testing/nio/Http2ProtocolNegotiationTest.java | 6 +++---
.../nio/Http2ServerAndMultiplexingRequesterTest.java | 6 +++---
.../core5/testing/nio/Http2ServerAndRequesterTest.java | 6 +++---
.../core5/testing/nio/InternalHttp1ServerTestBase.java | 6 +++---
.../core5/testing/nio/InternalHttp2ServerTestBase.java | 6 +++---
httpcore5/pom.xml | 7 ++++++-
pom.xml | 9 +++++++--
28 files changed, 102 insertions(+), 80 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5a66acc8/httpcore5-h2/pom.xml
----------------------------------------------------------------------
diff --git a/httpcore5-h2/pom.xml b/httpcore5-h2/pom.xml
index 00257e3..6214cb5 100644
--- a/httpcore5-h2/pom.xml
+++ b/httpcore5-h2/pom.xml
@@ -54,8 +54,13 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
+ <artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5a66acc8/httpcore5-testing/pom.xml
----------------------------------------------------------------------
diff --git a/httpcore5-testing/pom.xml b/httpcore5-testing/pom.xml
index 14f5663..19487e2 100644
--- a/httpcore5-testing/pom.xml
+++ b/httpcore5-testing/pom.xml
@@ -50,6 +50,11 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.2</version>
@@ -57,13 +62,15 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
+ <artifactId>log4j-slf4j-impl</artifactId>
<scope>compile</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>compile</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5a66acc8/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingBHttpClientConnection.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingBHttpClientConnection.java b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingBHttpClientConnection.java
index 6a09f84..052e46f 100644
--- a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingBHttpClientConnection.java
+++ b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingBHttpClientConnection.java
@@ -46,8 +46,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.LoggerFactory;
+import org.slf4j.Logger;
public class LoggingBHttpClientConnection extends DefaultBHttpClientConnection implements Identifiable {
@@ -70,9 +70,9 @@ public class LoggingBHttpClientConnection extends DefaultBHttpClientConnection i
incomingContentStrategy, outgoingContentStrategy,
requestWriterFactory, responseParserFactory);
this.id = "http-outgoing-" + COUNT.incrementAndGet();
- this.log = LogManager.getLogger(getClass());
- this.headerlog = LogManager.getLogger("org.apache.hc.core5.http.headers");
- this.wire = new Wire(LogManager.getLogger("org.apache.hc.core5.http.wire"), this.id);
+ this.log = LoggerFactory.getLogger(getClass());
+ this.headerlog = LoggerFactory.getLogger("org.apache.hc.core5.http.headers");
+ this.wire = new Wire(LoggerFactory.getLogger("org.apache.hc.core5.http.wire"), this.id);
}
public LoggingBHttpClientConnection(final H1Config h1Config) {
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5a66acc8/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingBHttpServerConnection.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingBHttpServerConnection.java b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingBHttpServerConnection.java
index 57dc56e..a7af3ae 100644
--- a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingBHttpServerConnection.java
+++ b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingBHttpServerConnection.java
@@ -46,8 +46,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.LoggerFactory;
+import org.slf4j.Logger;
public class LoggingBHttpServerConnection extends DefaultBHttpServerConnection implements Identifiable {
private static final AtomicLong COUNT = new AtomicLong();
@@ -70,9 +70,9 @@ public class LoggingBHttpServerConnection extends DefaultBHttpServerConnection i
incomingContentStrategy, outgoingContentStrategy,
requestParserFactory, responseWriterFactory);
this.id = "http-incoming-" + COUNT.incrementAndGet();
- this.log = LogManager.getLogger(getClass());
- this.headerlog = LogManager.getLogger("org.apache.hc.core5.http.headers");
- this.wire = new Wire(LogManager.getLogger("org.apache.hc.core5.http.wire"), this.id);
+ this.log = LoggerFactory.getLogger(getClass());
+ this.headerlog = LoggerFactory.getLogger("org.apache.hc.core5.http.headers");
+ this.wire = new Wire(LoggerFactory.getLogger("org.apache.hc.core5.http.wire"), this.id);
}
@Override
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5a66acc8/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingConnPoolListener.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingConnPoolListener.java b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingConnPoolListener.java
index e812935..ee22e48 100644
--- a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingConnPoolListener.java
+++ b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingConnPoolListener.java
@@ -31,14 +31,14 @@ import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.pool.ConnPoolListener;
import org.apache.hc.core5.pool.ConnPoolStats;
import org.apache.hc.core5.pool.PoolStats;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
public class LoggingConnPoolListener implements ConnPoolListener<HttpHost> {
public final static LoggingConnPoolListener INSTANCE = new LoggingConnPoolListener();
- private final Logger connLog = LogManager.getLogger("org.apache.hc.core5.http.connection");
+ private final Logger connLog = LoggerFactory.getLogger("org.apache.hc.core5.http.connection");
private LoggingConnPoolListener() {
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5a66acc8/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingExceptionListener.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingExceptionListener.java b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingExceptionListener.java
index 7019f09..ed1a21a 100644
--- a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingExceptionListener.java
+++ b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingExceptionListener.java
@@ -32,14 +32,14 @@ import java.net.SocketException;
import org.apache.hc.core5.http.ConnectionClosedException;
import org.apache.hc.core5.http.ExceptionListener;
import org.apache.hc.core5.http.HttpConnection;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
public class LoggingExceptionListener implements ExceptionListener {
public final static LoggingExceptionListener INSTANCE = new LoggingExceptionListener();
- private final Logger connLog = LogManager.getLogger("org.apache.hc.core5.http.connection");
+ private final Logger connLog = LoggerFactory.getLogger("org.apache.hc.core5.http.connection");
@Override
public void onError(final Exception ex) {
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5a66acc8/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingHttp1StreamListener.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingHttp1StreamListener.java b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingHttp1StreamListener.java
index ea677f3..5dc08fc 100644
--- a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingHttp1StreamListener.java
+++ b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingHttp1StreamListener.java
@@ -31,14 +31,14 @@ import org.apache.hc.core5.http.HttpConnection;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.impl.Http1StreamListener;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
public class LoggingHttp1StreamListener implements Http1StreamListener {
public static final LoggingHttp1StreamListener INSTANCE = new LoggingHttp1StreamListener();
- private final Logger connLog = LogManager.getLogger("org.apache.hc.core5.http.connection");
+ private final Logger connLog = LoggerFactory.getLogger("org.apache.hc.core5.http.connection");
@Override
public void onRequestHead(final HttpConnection connection, final HttpRequest request) {
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5a66acc8/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/Wire.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/Wire.java b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/Wire.java
index e2284b4..aebe608 100644
--- a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/Wire.java
+++ b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/Wire.java
@@ -29,7 +29,7 @@ package org.apache.hc.core5.testing.classic;
import java.nio.ByteBuffer;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
public class Wire {
private final Logger log;
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5a66acc8/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/LogAppendable.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/LogAppendable.java b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/LogAppendable.java
index 8ef4d7d..1761341 100644
--- a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/LogAppendable.java
+++ b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/LogAppendable.java
@@ -29,7 +29,7 @@ package org.apache.hc.core5.testing.nio;
import java.io.IOException;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
class LogAppendable implements Appendable {
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5a66acc8/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/LoggingHttp1StreamListener.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/LoggingHttp1StreamListener.java b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/LoggingHttp1StreamListener.java
index 7b05720..89e2eba 100644
--- a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/LoggingHttp1StreamListener.java
+++ b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/LoggingHttp1StreamListener.java
@@ -37,8 +37,8 @@ import org.apache.hc.core5.http.impl.Http1StreamListener;
import org.apache.hc.core5.http.message.RequestLine;
import org.apache.hc.core5.http.message.StatusLine;
import org.apache.hc.core5.testing.classic.LoggingSupport;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
public class LoggingHttp1StreamListener implements Http1StreamListener {
@@ -48,8 +48,8 @@ public class LoggingHttp1StreamListener implements Http1StreamListener {
public final static LoggingHttp1StreamListener INSTANCE_SERVER = new LoggingHttp1StreamListener(Type.SERVER);
private final Type type;
- private final Logger connLog = LogManager.getLogger("org.apache.hc.core5.http.connection");
- private final Logger headerLog = LogManager.getLogger("org.apache.hc.core5.http.headers");
+ private final Logger connLog = LoggerFactory.getLogger("org.apache.hc.core5.http.connection");
+ private final Logger headerLog = LoggerFactory.getLogger("org.apache.hc.core5.http.headers");
private LoggingHttp1StreamListener(final Type type) {
this.type = type;
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5a66acc8/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/LoggingHttp2StreamListener.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/LoggingHttp2StreamListener.java b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/LoggingHttp2StreamListener.java
index e3f2122..192dd6a 100644
--- a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/LoggingHttp2StreamListener.java
+++ b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/LoggingHttp2StreamListener.java
@@ -36,8 +36,8 @@ import org.apache.hc.core5.http2.frame.FramePrinter;
import org.apache.hc.core5.http2.frame.RawFrame;
import org.apache.hc.core5.http2.impl.nio.Http2StreamListener;
import org.apache.hc.core5.testing.classic.LoggingSupport;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class LoggingHttp2StreamListener implements Http2StreamListener {
@@ -51,10 +51,10 @@ public class LoggingHttp2StreamListener implements Http2StreamListener {
private LoggingHttp2StreamListener() {
this.framePrinter = new FramePrinter();
- this.headerLog = LogManager.getLogger("org.apache.hc.core5.http.headers");
- this.frameLog = LogManager.getLogger("org.apache.hc.core5.http2.frame");
- this.framePayloadLog = LogManager.getLogger("org.apache.hc.core5.http2.frame.payload");
- this.flowCtrlLog = LogManager.getLogger("org.apache.hc.core5.http2.flow");
+ this.headerLog = LoggerFactory.getLogger("org.apache.hc.core5.http.headers");
+ this.frameLog = LoggerFactory.getLogger("org.apache.hc.core5.http2.frame");
+ this.framePayloadLog = LoggerFactory.getLogger("org.apache.hc.core5.http2.frame.payload");
+ this.flowCtrlLog = LoggerFactory.getLogger("org.apache.hc.core5.http2.flow");
}
private void logFrameInfo(final String prefix, final RawFrame frame) {
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5a66acc8/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/LoggingIOSession.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/LoggingIOSession.java b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/LoggingIOSession.java
index b3d597c..59ac54b 100644
--- a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/LoggingIOSession.java
+++ b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/LoggingIOSession.java
@@ -38,7 +38,7 @@ import org.apache.hc.core5.reactor.Command;
import org.apache.hc.core5.reactor.IOEventHandler;
import org.apache.hc.core5.reactor.IOSession;
import org.apache.hc.core5.testing.classic.Wire;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
public class LoggingIOSession implements IOSession {
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5a66acc8/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/LoggingIOSessionDecorator.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/LoggingIOSessionDecorator.java b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/LoggingIOSessionDecorator.java
index eb713ed..ac33f40 100644
--- a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/LoggingIOSessionDecorator.java
+++ b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/LoggingIOSessionDecorator.java
@@ -29,21 +29,21 @@ package org.apache.hc.core5.testing.nio;
import org.apache.hc.core5.function.Decorator;
import org.apache.hc.core5.reactor.IOSession;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
public class LoggingIOSessionDecorator implements Decorator<IOSession> {
public final static LoggingIOSessionDecorator INSTANCE = new LoggingIOSessionDecorator();
- private final Logger wireLog = LogManager.getLogger("org.apache.hc.core5.http.wire");
+ private final Logger wireLog = LoggerFactory.getLogger("org.apache.hc.core5.http.wire");
private LoggingIOSessionDecorator() {
}
@Override
public IOSession decorate(final IOSession ioSession) {
- final Logger sessionLog = LogManager.getLogger(ioSession.getClass());
+ final Logger sessionLog = LoggerFactory.getLogger(ioSession.getClass());
return new LoggingIOSession(ioSession, sessionLog, wireLog);
}
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5a66acc8/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/LoggingIOSessionListener.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/LoggingIOSessionListener.java b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/LoggingIOSessionListener.java
index 73f8681..74e66f7 100644
--- a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/LoggingIOSessionListener.java
+++ b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/LoggingIOSessionListener.java
@@ -31,14 +31,14 @@ import org.apache.hc.core5.http.ConnectionClosedException;
import org.apache.hc.core5.reactor.IOSession;
import org.apache.hc.core5.reactor.IOSessionListener;
import org.apache.hc.core5.testing.classic.LoggingSupport;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
public class LoggingIOSessionListener implements IOSessionListener {
public final static LoggingIOSessionListener INSTANCE = new LoggingIOSessionListener();
- private final Logger connLog = LogManager.getLogger("org.apache.hc.core5.http.connection");
+ private final Logger connLog = LoggerFactory.getLogger("org.apache.hc.core5.http.connection");
private LoggingIOSessionListener() {
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5a66acc8/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicAuthenticationTest.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicAuthenticationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicAuthenticationTest.java
index 2f9d9b3..f582477 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicAuthenticationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicAuthenticationTest.java
@@ -58,8 +58,8 @@ import org.apache.hc.core5.http.protocol.HttpCoreContext;
import org.apache.hc.core5.io.ShutdownType;
import org.apache.hc.core5.net.URIAuthority;
import org.apache.hc.core5.util.Timeout;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
import org.hamcrest.CoreMatchers;
import org.junit.Assert;
import org.junit.Rule;
@@ -81,7 +81,7 @@ public class ClassicAuthenticationTest {
private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final boolean respondImmediately;
private HttpServer server;
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5a66acc8/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerAndRequesterTest.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerAndRequesterTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerAndRequesterTest.java
index 2706af5..fdbe3a5 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerAndRequesterTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerAndRequesterTest.java
@@ -52,8 +52,8 @@ import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
import org.apache.hc.core5.io.ShutdownType;
import org.apache.hc.core5.util.Timeout;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
import org.hamcrest.CoreMatchers;
import org.junit.Assert;
import org.junit.Rule;
@@ -64,7 +64,7 @@ public class ClassicServerAndRequesterTest {
private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private HttpServer server;
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5a66acc8/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1AuthenticationTest.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1AuthenticationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1AuthenticationTest.java
index 90e6b96..0126ee3 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1AuthenticationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1AuthenticationTest.java
@@ -65,8 +65,8 @@ import org.apache.hc.core5.reactor.ListenerEndpoint;
import org.apache.hc.core5.testing.classic.LoggingConnPoolListener;
import org.apache.hc.core5.testing.classic.LoggingHttp1StreamListener;
import org.apache.hc.core5.util.Timeout;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
import org.hamcrest.CoreMatchers;
import org.junit.Assert;
import org.junit.Rule;
@@ -88,7 +88,7 @@ public class Http1AuthenticationTest {
private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final boolean respondImmediately;
private HttpAsyncServer server;
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5a66acc8/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java
index ba0a634..92b9ef3 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java
@@ -130,8 +130,8 @@ import org.apache.hc.core5.testing.SSLTestContexts;
import org.apache.hc.core5.util.CharArrayBuffer;
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.LoggerFactory;
+import org.slf4j.Logger;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -142,7 +142,7 @@ import org.junit.runners.Parameterized;
@RunWith(Parameterized.class)
public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
@Parameterized.Parameters(name = "{0}")
public static Collection<Object[]> protocols() {
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5a66acc8/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1ServerAndRequesterTest.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1ServerAndRequesterTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1ServerAndRequesterTest.java
index 3bba0e5..9d1065c 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1ServerAndRequesterTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1ServerAndRequesterTest.java
@@ -76,8 +76,8 @@ import org.apache.hc.core5.reactor.ListenerEndpoint;
import org.apache.hc.core5.testing.SSLTestContexts;
import org.apache.hc.core5.testing.classic.LoggingConnPoolListener;
import org.apache.hc.core5.util.Timeout;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
import org.hamcrest.CoreMatchers;
import org.junit.Assert;
import org.junit.Rule;
@@ -89,7 +89,7 @@ import org.junit.runners.Parameterized;
@RunWith(Parameterized.class)
public class Http1ServerAndRequesterTest {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
@Parameterized.Parameters(name = "{0}")
public static Collection<Object[]> protocols() {
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5a66acc8/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http2ALPNTest.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http2ALPNTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http2ALPNTest.java
index 3f29e26..835ec1d 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http2ALPNTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http2ALPNTest.java
@@ -60,8 +60,8 @@ import org.apache.hc.core5.reactor.ListenerEndpoint;
import org.apache.hc.core5.testing.SSLTestContexts;
import org.apache.hc.core5.testing.TestingSupport;
import org.apache.hc.core5.util.Timeout;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
import org.hamcrest.CoreMatchers;
import org.junit.Assert;
import org.junit.Assume;
@@ -74,7 +74,7 @@ import org.junit.rules.ExternalResource;
public class Http2ALPNTest {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5a66acc8/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http2IntegrationTest.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http2IntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http2IntegrationTest.java
index 86a95ac..429c6d9 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http2IntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http2IntegrationTest.java
@@ -116,8 +116,8 @@ import org.apache.hc.core5.reactor.IOSession;
import org.apache.hc.core5.testing.SSLTestContexts;
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.LoggerFactory;
+import org.slf4j.Logger;
import org.hamcrest.CoreMatchers;
import org.junit.After;
import org.junit.Assert;
@@ -129,7 +129,7 @@ import org.junit.runners.Parameterized;
@RunWith(Parameterized.class)
public class Http2IntegrationTest extends InternalHttp2ServerTestBase {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
@Parameterized.Parameters(name = "{0}")
public static Collection<Object[]> protocols() {
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5a66acc8/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http2ProtocolNegotiationTest.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http2ProtocolNegotiationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http2ProtocolNegotiationTest.java
index 9b9530e..cf67abf 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http2ProtocolNegotiationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http2ProtocolNegotiationTest.java
@@ -63,8 +63,8 @@ import org.apache.hc.core5.testing.TestingSupport;
import org.apache.hc.core5.testing.classic.LoggingConnPoolListener;
import org.apache.hc.core5.testing.classic.LoggingHttp1StreamListener;
import org.apache.hc.core5.util.Timeout;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
import org.hamcrest.CoreMatchers;
import org.junit.Assert;
import org.junit.Assume;
@@ -78,7 +78,7 @@ public class Http2ProtocolNegotiationTest {
private static final Timeout TIMEOUT = Timeout.ofSeconds(30);
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private HttpAsyncServer server;
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5a66acc8/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http2ServerAndMultiplexingRequesterTest.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http2ServerAndMultiplexingRequesterTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http2ServerAndMultiplexingRequesterTest.java
index 791fd13..72aae99 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http2ServerAndMultiplexingRequesterTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http2ServerAndMultiplexingRequesterTest.java
@@ -68,8 +68,8 @@ import org.apache.hc.core5.testing.SSLTestContexts;
import org.apache.hc.core5.testing.TestingSupport;
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.LoggerFactory;
+import org.slf4j.Logger;
import org.hamcrest.CoreMatchers;
import org.junit.Assert;
import org.junit.Assume;
@@ -84,7 +84,7 @@ import org.junit.runners.Parameterized;
@RunWith(Parameterized.class)
public class Http2ServerAndMultiplexingRequesterTest {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
@Parameterized.Parameters(name = "{0}")
public static Collection<Object[]> protocols() {
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5a66acc8/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http2ServerAndRequesterTest.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http2ServerAndRequesterTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http2ServerAndRequesterTest.java
index 3e7f7d0..c5eb965 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http2ServerAndRequesterTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http2ServerAndRequesterTest.java
@@ -65,8 +65,8 @@ import org.apache.hc.core5.testing.SSLTestContexts;
import org.apache.hc.core5.testing.TestingSupport;
import org.apache.hc.core5.testing.classic.LoggingConnPoolListener;
import org.apache.hc.core5.util.Timeout;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
import org.hamcrest.CoreMatchers;
import org.junit.Assert;
import org.junit.Assume;
@@ -81,7 +81,7 @@ import org.junit.runners.Parameterized;
@RunWith(Parameterized.class)
public class Http2ServerAndRequesterTest {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
@Parameterized.Parameters(name = "{0}")
public static Collection<Object[]> protocols() {
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5a66acc8/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/InternalHttp1ServerTestBase.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/InternalHttp1ServerTestBase.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/InternalHttp1ServerTestBase.java
index 7d78b59..3bbcb50 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/InternalHttp1ServerTestBase.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/InternalHttp1ServerTestBase.java
@@ -34,14 +34,14 @@ import org.apache.hc.core5.reactor.ExceptionEvent;
import org.apache.hc.core5.reactor.IOReactorConfig;
import org.apache.hc.core5.testing.SSLTestContexts;
import org.apache.hc.core5.util.TimeValue;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
import org.junit.Rule;
import org.junit.rules.ExternalResource;
public abstract class InternalHttp1ServerTestBase {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
protected final URIScheme scheme;
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5a66acc8/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/InternalHttp2ServerTestBase.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/InternalHttp2ServerTestBase.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/InternalHttp2ServerTestBase.java
index 786d3f7..a6dc728 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/InternalHttp2ServerTestBase.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/InternalHttp2ServerTestBase.java
@@ -34,14 +34,14 @@ import org.apache.hc.core5.reactor.ExceptionEvent;
import org.apache.hc.core5.reactor.IOReactorConfig;
import org.apache.hc.core5.testing.SSLTestContexts;
import org.apache.hc.core5.util.TimeValue;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
import org.junit.Rule;
import org.junit.rules.ExternalResource;
public abstract class InternalHttp2ServerTestBase {
- private final Logger log = LogManager.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
protected final URIScheme scheme;
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5a66acc8/httpcore5/pom.xml
----------------------------------------------------------------------
diff --git a/httpcore5/pom.xml b/httpcore5/pom.xml
index 78cf2ee..bfe02c0 100644
--- a/httpcore5/pom.xml
+++ b/httpcore5/pom.xml
@@ -49,8 +49,13 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
+ <artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5a66acc8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5a61a4c..3f8fdbc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,6 +79,7 @@
<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
<junit.version>4.12</junit.version>
<mockito.version>2.7.22</mockito.version>
+ <slf4j.version>1.7.25</slf4j.version>
<log4j.version>2.8.2</log4j.version>
</properties>
@@ -97,15 +98,19 @@
<scope>test</scope>
</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>
+ <artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j.version}</version>
- <scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>