Skip to content

Commit 5d26efd

Browse files
committed
Drop SLF4J in favor of Reactor's Logger utilities
[resolves #200]
1 parent da4b6b3 commit 5d26efd

File tree

5 files changed

+13
-19
lines changed

5 files changed

+13
-19
lines changed

pom.xml

+1-7
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,14 @@
4848
<r2dbc-spi.version>${project.version}</r2dbc-spi.version>
4949
<reactor.version>Dysprosium-SR1</reactor.version>
5050
<scram-client.version>2.1</scram-client.version>
51-
<slf4j.version>1.7.26</slf4j.version>
5251
<spring-framework.version>5.2.1.RELEASE</spring-framework.version>
5352
<testcontainers.version>1.12.3</testcontainers.version>
5453
</properties>
5554

5655
<licenses>
5756
<license>
5857
<name>Apache License 2.0</name>
59-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
58+
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
6059
<distribution>repo</distribution>
6160
</license>
6261
</licenses>
@@ -149,11 +148,6 @@
149148
<classifier>osx-x86_64</classifier>
150149
<optional>true</optional>
151150
</dependency>
152-
<dependency>
153-
<groupId>org.slf4j</groupId>
154-
<artifactId>slf4j-api</artifactId>
155-
<version>${slf4j.version}</version>
156-
</dependency>
157151
<dependency>
158152
<groupId>com.google.code.findbugs</groupId>
159153
<artifactId>jsr305</artifactId>

src/main/java/io/r2dbc/postgresql/Extensions.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
package io.r2dbc.postgresql;
1818

1919
import io.r2dbc.postgresql.extension.Extension;
20-
import org.slf4j.Logger;
21-
import org.slf4j.LoggerFactory;
20+
import reactor.util.Logger;
21+
import reactor.util.Loggers;
2222

2323
import java.security.AccessController;
2424
import java.security.PrivilegedAction;
@@ -33,7 +33,7 @@
3333
*/
3434
final class Extensions {
3535

36-
private static final Logger logger = LoggerFactory.getLogger(Extensions.class);
36+
private static final Logger logger = Loggers.getLogger(Extensions.class);
3737

3838
private final List<Extension> extensions;
3939

src/main/java/io/r2dbc/postgresql/PostgresqlConnection.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@
3030
import io.r2dbc.spi.ValidationDepth;
3131
import org.reactivestreams.Publisher;
3232
import org.reactivestreams.Subscription;
33-
import org.slf4j.Logger;
34-
import org.slf4j.LoggerFactory;
3533
import reactor.core.CoreSubscriber;
3634
import reactor.core.Disposable;
3735
import reactor.core.publisher.DirectProcessor;
3836
import reactor.core.publisher.Flux;
3937
import reactor.core.publisher.FluxSink;
4038
import reactor.core.publisher.Mono;
39+
import reactor.util.Logger;
40+
import reactor.util.Loggers;
4141
import reactor.util.annotation.Nullable;
4242

4343
import java.util.concurrent.atomic.AtomicReference;
@@ -51,7 +51,7 @@
5151
*/
5252
final class PostgresqlConnection implements io.r2dbc.postgresql.api.PostgresqlConnection {
5353

54-
private final Logger logger = LoggerFactory.getLogger(this.getClass());
54+
private final Logger logger = Loggers.getLogger(this.getClass());
5555

5656
private final Client client;
5757

src/main/java/io/r2dbc/postgresql/client/DefaultHostnameVerifier.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
package io.r2dbc.postgresql.client;
1818

19-
import org.slf4j.Logger;
20-
import org.slf4j.LoggerFactory;
19+
import reactor.util.Logger;
20+
import reactor.util.Loggers;
2121
import reactor.util.annotation.Nullable;
2222

2323
import javax.naming.InvalidNameException;
@@ -94,7 +94,7 @@ private int countChars(String value, char ch) {
9494
}
9595
};
9696

97-
private final Logger logger = LoggerFactory.getLogger(this.getClass());
97+
private final Logger logger = Loggers.getLogger(this.getClass());
9898

9999
@Override
100100
public boolean verify(String hostname, SSLSession session) {

src/main/java/io/r2dbc/postgresql/client/ReactorNettyClient.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
import io.r2dbc.postgresql.util.Assert;
4242
import io.r2dbc.spi.R2dbcNonTransientResourceException;
4343
import org.reactivestreams.Publisher;
44-
import org.slf4j.Logger;
45-
import org.slf4j.LoggerFactory;
4644
import reactor.core.Disposable;
4745
import reactor.core.publisher.DirectProcessor;
4846
import reactor.core.publisher.EmitterProcessor;
@@ -56,6 +54,8 @@
5654
import reactor.netty.resources.LoopResources;
5755
import reactor.netty.tcp.TcpClient;
5856
import reactor.netty.tcp.TcpResources;
57+
import reactor.util.Logger;
58+
import reactor.util.Loggers;
5959
import reactor.util.annotation.Nullable;
6060
import reactor.util.concurrent.Queues;
6161

@@ -83,7 +83,7 @@
8383
*/
8484
public final class ReactorNettyClient implements Client {
8585

86-
private static final Logger logger = LoggerFactory.getLogger(ReactorNettyClient.class);
86+
private static final Logger logger = Loggers.getLogger(ReactorNettyClient.class);
8787

8888
private static final boolean DEBUG_ENABLED = logger.isDebugEnabled();
8989

0 commit comments

Comments
 (0)