Skip to content

Commit ba90212

Browse files
committed
Remove usage of Slf4J.
Closes #2009
1 parent a7a9fbc commit ba90212

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/RowDocumentResultSetExtractor.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import java.util.Iterator;
2323
import java.util.Map;
2424

25-
import org.slf4j.Logger;
26-
import org.slf4j.LoggerFactory;
25+
import org.apache.commons.logging.Log;
26+
import org.apache.commons.logging.LogFactory;
2727
import org.springframework.dao.DataRetrievalFailureException;
2828
import org.springframework.data.jdbc.core.convert.RowDocumentExtractorSupport.AggregateContext;
2929
import org.springframework.data.jdbc.core.convert.RowDocumentExtractorSupport.RowDocumentSink;
@@ -45,8 +45,8 @@
4545
*/
4646
class RowDocumentResultSetExtractor {
4747

48-
private static final Logger log = LoggerFactory.getLogger(RowDocumentResultSetExtractor.class);
49-
public static final String DUPLICATE_COLUMN_WARNING = "ResultSet contains column \"{}\" multiple times. Later column index is {}";
48+
private static final Log log = LogFactory.getLog(RowDocumentResultSetExtractor.class);
49+
public static final String DUPLICATE_COLUMN_WARNING = "ResultSet contains column \"%s\" multiple times. Later column index is %s";
5050

5151
private final RelationalMappingContext context;
5252
private final PathToColumnMapping propertyToColumn;
@@ -76,7 +76,7 @@ static RowDocument toRowDocument(ResultSet resultSet) throws SQLException {
7676
String columnName = JdbcUtils.lookupColumnName(md, i+1);
7777
Object old = document.putIfAbsent(columnName, rsv instanceof Array a ? a.getArray() : rsv);
7878
if (old != null) {
79-
log.warn(DUPLICATE_COLUMN_WARNING, columnName, i);
79+
log.warn(DUPLICATE_COLUMN_WARNING.formatted(columnName, i));
8080
}
8181
}
8282

@@ -120,7 +120,7 @@ public Map<String, Integer> getColumnMap(ResultSet result) {
120120
String columnLabel = metaData.getColumnLabel(i + 1);
121121
Object old = columns.put(columnLabel, i + 1);
122122
if (old != null) {
123-
log.warn(DUPLICATE_COLUMN_WARNING, columnLabel, i);
123+
log.warn(DUPLICATE_COLUMN_WARNING.formatted( columnLabel, i));
124124
}
125125
}
126126
return columns;

spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/testing/ExternalDatabase.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import org.junit.jupiter.api.extension.BeforeAllCallback;
2424
import org.junit.jupiter.api.extension.ExtensionContext;
2525
import org.opentest4j.TestAbortedException;
26-
import org.slf4j.Logger;
27-
import org.slf4j.LoggerFactory;
26+
import org.apache.commons.logging.Log;
27+
import org.apache.commons.logging.LogFactory;
2828
import org.testcontainers.containers.JdbcDatabaseContainer;
2929

3030
/**
@@ -35,7 +35,7 @@
3535
*/
3636
public abstract class ExternalDatabase implements BeforeAllCallback {
3737

38-
private static final Logger LOG = LoggerFactory.getLogger(ExternalDatabase.class);
38+
private static final Log LOG = LogFactory.getLog(ExternalDatabase.class);
3939

4040
/**
4141
* Construct an absent database that is used as {@literal null} object if no database is available.

0 commit comments

Comments
 (0)