Skip to content

Commit 880787f

Browse files
mp911demp911de
committed
Migrate off SLF4J to Spring JCL.
Closes #1194
1 parent f20b81e commit 880787f

17 files changed

+154
-144
lines changed

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CqlSessionFactoryBean.java

+7-5
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
import java.util.stream.Collectors;
2828
import java.util.stream.Stream;
2929

30-
import org.slf4j.Logger;
31-
import org.slf4j.LoggerFactory;
30+
import org.apache.commons.logging.Log;
31+
import org.apache.commons.logging.LogFactory;
3232

3333
import org.springframework.beans.factory.DisposableBean;
3434
import org.springframework.beans.factory.FactoryBean;
@@ -82,6 +82,8 @@ public class CqlSessionFactoryBean
8282

8383
private static final CassandraExceptionTranslator EXCEPTION_TRANSLATOR = new CassandraExceptionTranslator();
8484

85+
protected final Log log = LogFactory.getLog(getClass());
86+
8587
private int port = DEFAULT_PORT;
8688

8789
private @Nullable CassandraConverter converter;
@@ -101,8 +103,6 @@ public class CqlSessionFactoryBean
101103
private List<String> startupScripts = Collections.emptyList();
102104
private List<String> shutdownScripts = Collections.emptyList();
103105

104-
protected final Logger logger = LoggerFactory.getLogger(getClass());
105-
106106
private Set<KeyspaceActionSpecification> keyspaceSpecifications = new HashSet<>();
107107

108108
private SchemaAction schemaAction = SchemaAction.NONE;
@@ -683,7 +683,9 @@ protected void closeSystemSession() {
683683
private void executeCql(Stream<String> cql, CqlSession session) {
684684

685685
cql.forEach(query -> {
686-
this.logger.info("Executing CQL [{}]", query);
686+
if (this.log.isInfoEnabled()) {
687+
this.log.info(String.format("Executing CQL [%s]", query));
688+
}
687689
session.execute(query);
688690
});
689691
}

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/AsyncCassandraTemplate.java

+25-24
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,8 @@
2222
import java.util.stream.Collectors;
2323
import java.util.stream.StreamSupport;
2424

25-
import com.datastax.oss.driver.api.core.CqlIdentifier;
26-
import com.datastax.oss.driver.api.core.CqlSession;
27-
import com.datastax.oss.driver.api.core.DriverException;
28-
import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
29-
import com.datastax.oss.driver.api.core.cql.AsyncResultSet;
30-
import com.datastax.oss.driver.api.core.cql.BoundStatement;
31-
import com.datastax.oss.driver.api.core.cql.PreparedStatement;
32-
import com.datastax.oss.driver.api.core.cql.ResultSet;
33-
import com.datastax.oss.driver.api.core.cql.Row;
34-
import com.datastax.oss.driver.api.core.cql.SimpleStatement;
35-
import com.datastax.oss.driver.api.core.cql.Statement;
36-
import com.datastax.oss.driver.api.querybuilder.QueryBuilder;
37-
import com.datastax.oss.driver.api.querybuilder.delete.Delete;
38-
import com.datastax.oss.driver.api.querybuilder.insert.Insert;
39-
import com.datastax.oss.driver.api.querybuilder.insert.RegularInsert;
40-
import com.datastax.oss.driver.api.querybuilder.select.Select;
41-
import com.datastax.oss.driver.api.querybuilder.truncate.Truncate;
42-
import com.datastax.oss.driver.api.querybuilder.update.Update;
43-
import org.slf4j.Logger;
44-
import org.slf4j.LoggerFactory;
25+
import org.apache.commons.logging.Log;
26+
import org.apache.commons.logging.LogFactory;
4527

4628
import org.springframework.beans.BeansException;
4729
import org.springframework.context.ApplicationContext;
@@ -81,6 +63,25 @@
8163
import org.springframework.util.Assert;
8264
import org.springframework.util.concurrent.ListenableFuture;
8365

66+
import com.datastax.oss.driver.api.core.CqlIdentifier;
67+
import com.datastax.oss.driver.api.core.CqlSession;
68+
import com.datastax.oss.driver.api.core.DriverException;
69+
import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
70+
import com.datastax.oss.driver.api.core.cql.AsyncResultSet;
71+
import com.datastax.oss.driver.api.core.cql.BoundStatement;
72+
import com.datastax.oss.driver.api.core.cql.PreparedStatement;
73+
import com.datastax.oss.driver.api.core.cql.ResultSet;
74+
import com.datastax.oss.driver.api.core.cql.Row;
75+
import com.datastax.oss.driver.api.core.cql.SimpleStatement;
76+
import com.datastax.oss.driver.api.core.cql.Statement;
77+
import com.datastax.oss.driver.api.querybuilder.QueryBuilder;
78+
import com.datastax.oss.driver.api.querybuilder.delete.Delete;
79+
import com.datastax.oss.driver.api.querybuilder.insert.Insert;
80+
import com.datastax.oss.driver.api.querybuilder.insert.RegularInsert;
81+
import com.datastax.oss.driver.api.querybuilder.select.Select;
82+
import com.datastax.oss.driver.api.querybuilder.truncate.Truncate;
83+
import com.datastax.oss.driver.api.querybuilder.update.Update;
84+
8485
/**
8586
* Primary implementation of {@link AsyncCassandraOperations}. It simplifies the use of asynchronous Cassandra usage and
8687
* helps to avoid common errors. It executes core Cassandra workflow. This class executes CQL queries or updates,
@@ -108,7 +109,7 @@
108109
public class AsyncCassandraTemplate
109110
implements AsyncCassandraOperations, ApplicationEventPublisherAware, ApplicationContextAware {
110111

111-
private final Logger logger = LoggerFactory.getLogger(getClass());
112+
private final Log log = LogFactory.getLog(getClass());
112113

113114
private final AsyncCqlOperations cqlOperations;
114115

@@ -874,7 +875,7 @@ private ListenableFuture<WriteResult> executeDelete(Object entity, CqlIdentifier
874875

875876
private <T> ListenableFuture<List<T>> doQuery(Statement<?> statement, RowMapper<T> rowMapper) {
876877

877-
if (PreparedStatementDelegate.canPrepare(isUsePreparedStatements(), statement, logger)) {
878+
if (PreparedStatementDelegate.canPrepare(isUsePreparedStatements(), statement, log)) {
878879

879880
PreparedStatementHandler statementHandler = new PreparedStatementHandler(statement);
880881
return getAsyncCqlOperations().query(statementHandler, statementHandler, rowMapper);
@@ -885,7 +886,7 @@ private <T> ListenableFuture<List<T>> doQuery(Statement<?> statement, RowMapper<
885886

886887
private ListenableFuture<Void> doQuery(Statement<?> statement, RowCallbackHandler callbackHandler) {
887888

888-
if (PreparedStatementDelegate.canPrepare(isUsePreparedStatements(), statement, logger)) {
889+
if (PreparedStatementDelegate.canPrepare(isUsePreparedStatements(), statement, log)) {
889890

890891
PreparedStatementHandler statementHandler = new PreparedStatementHandler(statement);
891892
return getAsyncCqlOperations().query(statementHandler, statementHandler, callbackHandler);
@@ -900,7 +901,7 @@ private ListenableFuture<AsyncResultSet> doQueryForResultSet(Statement<?> statem
900901

901902
private <T> ListenableFuture<T> doExecute(Statement<?> statement, Function<AsyncResultSet, T> mappingFunction) {
902903

903-
if (PreparedStatementDelegate.canPrepare(isUsePreparedStatements(), statement, logger)) {
904+
if (PreparedStatementDelegate.canPrepare(isUsePreparedStatements(), statement, log)) {
904905

905906
PreparedStatementHandler statementHandler = new PreparedStatementHandler(statement);
906907
return getAsyncCqlOperations().query(statementHandler, statementHandler,

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java

+25-24
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,8 @@
2020
import java.util.function.Function;
2121
import java.util.stream.Stream;
2222

23-
import com.datastax.oss.driver.api.core.CqlIdentifier;
24-
import com.datastax.oss.driver.api.core.CqlSession;
25-
import com.datastax.oss.driver.api.core.DriverException;
26-
import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
27-
import com.datastax.oss.driver.api.core.cql.BatchType;
28-
import com.datastax.oss.driver.api.core.cql.BoundStatement;
29-
import com.datastax.oss.driver.api.core.cql.PreparedStatement;
30-
import com.datastax.oss.driver.api.core.cql.ResultSet;
31-
import com.datastax.oss.driver.api.core.cql.Row;
32-
import com.datastax.oss.driver.api.core.cql.SimpleStatement;
33-
import com.datastax.oss.driver.api.core.cql.Statement;
34-
import com.datastax.oss.driver.api.querybuilder.QueryBuilder;
35-
import com.datastax.oss.driver.api.querybuilder.delete.Delete;
36-
import com.datastax.oss.driver.api.querybuilder.insert.Insert;
37-
import com.datastax.oss.driver.api.querybuilder.insert.RegularInsert;
38-
import com.datastax.oss.driver.api.querybuilder.select.Select;
39-
import com.datastax.oss.driver.api.querybuilder.truncate.Truncate;
40-
import com.datastax.oss.driver.api.querybuilder.update.Update;
41-
import org.slf4j.Logger;
42-
import org.slf4j.LoggerFactory;
23+
import org.apache.commons.logging.Log;
24+
import org.apache.commons.logging.LogFactory;
4325

4426
import org.springframework.beans.BeansException;
4527
import org.springframework.context.ApplicationContext;
@@ -78,6 +60,25 @@
7860
import org.springframework.lang.Nullable;
7961
import org.springframework.util.Assert;
8062

63+
import com.datastax.oss.driver.api.core.CqlIdentifier;
64+
import com.datastax.oss.driver.api.core.CqlSession;
65+
import com.datastax.oss.driver.api.core.DriverException;
66+
import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
67+
import com.datastax.oss.driver.api.core.cql.BatchType;
68+
import com.datastax.oss.driver.api.core.cql.BoundStatement;
69+
import com.datastax.oss.driver.api.core.cql.PreparedStatement;
70+
import com.datastax.oss.driver.api.core.cql.ResultSet;
71+
import com.datastax.oss.driver.api.core.cql.Row;
72+
import com.datastax.oss.driver.api.core.cql.SimpleStatement;
73+
import com.datastax.oss.driver.api.core.cql.Statement;
74+
import com.datastax.oss.driver.api.querybuilder.QueryBuilder;
75+
import com.datastax.oss.driver.api.querybuilder.delete.Delete;
76+
import com.datastax.oss.driver.api.querybuilder.insert.Insert;
77+
import com.datastax.oss.driver.api.querybuilder.insert.RegularInsert;
78+
import com.datastax.oss.driver.api.querybuilder.select.Select;
79+
import com.datastax.oss.driver.api.querybuilder.truncate.Truncate;
80+
import com.datastax.oss.driver.api.querybuilder.update.Update;
81+
8182
/**
8283
* Primary implementation of {@link CassandraOperations}. It simplifies the use of Cassandra usage and helps to avoid
8384
* common errors. It executes core Cassandra workflow. This class executes CQL queries or updates, initiating iteration
@@ -106,7 +107,7 @@
106107
*/
107108
public class CassandraTemplate implements CassandraOperations, ApplicationEventPublisherAware, ApplicationContextAware {
108109

109-
private final Logger logger = LoggerFactory.getLogger(getClass());
110+
private final Log log = LogFactory.getLog(getClass());
110111

111112
private final CqlOperations cqlOperations;
112113

@@ -919,7 +920,7 @@ private WriteResult executeDelete(Object entity, CqlIdentifier tableName, Simple
919920

920921
private <T> List<T> doQuery(Statement<?> statement, RowMapper<T> rowMapper) {
921922

922-
if (PreparedStatementDelegate.canPrepare(isUsePreparedStatements(), statement, logger)) {
923+
if (PreparedStatementDelegate.canPrepare(isUsePreparedStatements(), statement, log)) {
923924

924925
PreparedStatementHandler statementHandler = new PreparedStatementHandler(statement);
925926
return getCqlOperations().query(statementHandler, statementHandler, rowMapper);
@@ -934,7 +935,7 @@ private <T> T doQueryForObject(Statement<?> statement, Class<T> resultType) {
934935

935936
private <T> Stream<T> doQueryForStream(Statement<?> statement, RowMapper<T> rowMapper) {
936937

937-
if (PreparedStatementDelegate.canPrepare(isUsePreparedStatements(), statement, logger)) {
938+
if (PreparedStatementDelegate.canPrepare(isUsePreparedStatements(), statement, log)) {
938939

939940
PreparedStatementHandler statementHandler = new PreparedStatementHandler(statement);
940941
return getCqlOperations().queryForStream(statementHandler, statementHandler, rowMapper);
@@ -953,7 +954,7 @@ private ResultSet doQueryForResultSet(Statement<?> statement) {
953954

954955
private <T> T doExecute(Statement<?> statement, Function<ResultSet, T> mappingFunction) {
955956

956-
if (PreparedStatementDelegate.canPrepare(isUsePreparedStatements(), statement, logger)) {
957+
if (PreparedStatementDelegate.canPrepare(isUsePreparedStatements(), statement, log)) {
957958

958959
PreparedStatementHandler statementHandler = new PreparedStatementHandler(statement);
959960
return getCqlOperations().query(statementHandler, statementHandler, mappingFunction::apply);

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/PreparedStatementDelegate.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import java.util.Map;
1919

20-
import org.slf4j.Logger;
20+
import org.apache.commons.logging.Log;
2121

2222
import org.springframework.data.cassandra.core.cql.QueryExtractorDelegate;
2323
import org.springframework.util.StringUtils;
@@ -92,7 +92,7 @@ static SimpleStatement getStatementForPrepare(Statement<?> statement) {
9292
* @param logger
9393
* @return
9494
*/
95-
static boolean canPrepare(boolean usePreparedStatements, Statement<?> statement, Logger logger) {
95+
static boolean canPrepare(boolean usePreparedStatements, Statement<?> statement, Log logger) {
9696

9797
if (usePreparedStatements) {
9898

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplate.java

+28-26
Original file line numberDiff line numberDiff line change
@@ -15,33 +15,17 @@
1515
*/
1616
package org.springframework.data.cassandra.core;
1717

18+
import reactor.core.publisher.Flux;
19+
import reactor.core.publisher.Mono;
20+
import reactor.core.publisher.SynchronousSink;
21+
1822
import java.util.Collections;
1923
import java.util.function.BiConsumer;
2024
import java.util.function.Function;
2125

22-
import com.datastax.oss.driver.api.core.CqlIdentifier;
23-
import com.datastax.oss.driver.api.core.DriverException;
24-
import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
25-
import com.datastax.oss.driver.api.core.context.DriverContext;
26-
import com.datastax.oss.driver.api.core.cql.BatchType;
27-
import com.datastax.oss.driver.api.core.cql.BoundStatement;
28-
import com.datastax.oss.driver.api.core.cql.PreparedStatement;
29-
import com.datastax.oss.driver.api.core.cql.Row;
30-
import com.datastax.oss.driver.api.core.cql.SimpleStatement;
31-
import com.datastax.oss.driver.api.core.cql.Statement;
32-
import com.datastax.oss.driver.api.querybuilder.QueryBuilder;
33-
import com.datastax.oss.driver.api.querybuilder.delete.Delete;
34-
import com.datastax.oss.driver.api.querybuilder.insert.Insert;
35-
import com.datastax.oss.driver.api.querybuilder.insert.RegularInsert;
36-
import com.datastax.oss.driver.api.querybuilder.select.Select;
37-
import com.datastax.oss.driver.api.querybuilder.truncate.Truncate;
38-
import com.datastax.oss.driver.api.querybuilder.update.Update;
26+
import org.apache.commons.logging.Log;
27+
import org.apache.commons.logging.LogFactory;
3928
import org.reactivestreams.Publisher;
40-
import org.slf4j.Logger;
41-
import org.slf4j.LoggerFactory;
42-
import reactor.core.publisher.Flux;
43-
import reactor.core.publisher.Mono;
44-
import reactor.core.publisher.SynchronousSink;
4529

4630
import org.springframework.beans.BeansException;
4731
import org.springframework.context.ApplicationContext;
@@ -82,6 +66,24 @@
8266
import org.springframework.lang.Nullable;
8367
import org.springframework.util.Assert;
8468

69+
import com.datastax.oss.driver.api.core.CqlIdentifier;
70+
import com.datastax.oss.driver.api.core.DriverException;
71+
import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
72+
import com.datastax.oss.driver.api.core.context.DriverContext;
73+
import com.datastax.oss.driver.api.core.cql.BatchType;
74+
import com.datastax.oss.driver.api.core.cql.BoundStatement;
75+
import com.datastax.oss.driver.api.core.cql.PreparedStatement;
76+
import com.datastax.oss.driver.api.core.cql.Row;
77+
import com.datastax.oss.driver.api.core.cql.SimpleStatement;
78+
import com.datastax.oss.driver.api.core.cql.Statement;
79+
import com.datastax.oss.driver.api.querybuilder.QueryBuilder;
80+
import com.datastax.oss.driver.api.querybuilder.delete.Delete;
81+
import com.datastax.oss.driver.api.querybuilder.insert.Insert;
82+
import com.datastax.oss.driver.api.querybuilder.insert.RegularInsert;
83+
import com.datastax.oss.driver.api.querybuilder.select.Select;
84+
import com.datastax.oss.driver.api.querybuilder.truncate.Truncate;
85+
import com.datastax.oss.driver.api.querybuilder.update.Update;
86+
8587
/**
8688
* Primary implementation of {@link ReactiveCassandraOperations}. It simplifies the use of Reactive Cassandra usage and
8789
* helps to avoid common errors. It executes core Cassandra workflow. This class executes CQL queries or updates,
@@ -111,7 +113,7 @@
111113
public class ReactiveCassandraTemplate
112114
implements ReactiveCassandraOperations, ApplicationEventPublisherAware, ApplicationContextAware {
113115

114-
private final Logger logger = LoggerFactory.getLogger(getClass());
116+
private final Log log = LogFactory.getLog(getClass());
115117

116118
private final ReactiveCqlOperations cqlOperations;
117119

@@ -886,7 +888,7 @@ private Mono<WriteResult> executeDelete(Object entity, CqlIdentifier tableName,
886888

887889
private <T> Flux<T> doQuery(Statement<?> statement, RowMapper<T> rowMapper) {
888890

889-
if (PreparedStatementDelegate.canPrepare(isUsePreparedStatements(), statement, logger)) {
891+
if (PreparedStatementDelegate.canPrepare(isUsePreparedStatements(), statement, log)) {
890892

891893
PreparedStatementHandler statementHandler = new PreparedStatementHandler(statement);
892894
return getReactiveCqlOperations().query(statementHandler, statementHandler, rowMapper);
@@ -897,7 +899,7 @@ private <T> Flux<T> doQuery(Statement<?> statement, RowMapper<T> rowMapper) {
897899

898900
private <T> Mono<T> doExecute(Statement<?> statement, Function<ReactiveResultSet, T> mappingFunction) {
899901

900-
if (PreparedStatementDelegate.canPrepare(isUsePreparedStatements(), statement, logger)) {
902+
if (PreparedStatementDelegate.canPrepare(isUsePreparedStatements(), statement, log)) {
901903

902904
PreparedStatementHandler statementHandler = new PreparedStatementHandler(statement);
903905
return getReactiveCqlOperations()
@@ -910,7 +912,7 @@ private <T> Mono<T> doExecute(Statement<?> statement, Function<ReactiveResultSet
910912
private <T> Mono<T> doExecuteAndFlatMap(Statement<?> statement,
911913
Function<ReactiveResultSet, Mono<T>> mappingFunction) {
912914

913-
if (PreparedStatementDelegate.canPrepare(isUsePreparedStatements(), statement, logger)) {
915+
if (PreparedStatementDelegate.canPrepare(isUsePreparedStatements(), statement, log)) {
914916

915917
PreparedStatementHandler statementHandler = new PreparedStatementHandler(statement);
916918
return getReactiveCqlOperations().query(statementHandler, statementHandler, mappingFunction::apply).next();

0 commit comments

Comments
 (0)