|
22 | 22 | import java.util.Iterator;
|
23 | 23 | import java.util.Map;
|
24 | 24 |
|
25 |
| -import org.slf4j.Logger; |
26 |
| -import org.slf4j.LoggerFactory; |
| 25 | +import org.apache.commons.logging.Log; |
| 26 | +import org.apache.commons.logging.LogFactory; |
27 | 27 | import org.springframework.dao.DataRetrievalFailureException;
|
28 | 28 | import org.springframework.data.jdbc.core.convert.RowDocumentExtractorSupport.AggregateContext;
|
29 | 29 | import org.springframework.data.jdbc.core.convert.RowDocumentExtractorSupport.RowDocumentSink;
|
|
45 | 45 | */
|
46 | 46 | class RowDocumentResultSetExtractor {
|
47 | 47 |
|
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"; |
50 | 50 |
|
51 | 51 | private final RelationalMappingContext context;
|
52 | 52 | private final PathToColumnMapping propertyToColumn;
|
@@ -76,7 +76,7 @@ static RowDocument toRowDocument(ResultSet resultSet) throws SQLException {
|
76 | 76 | String columnName = JdbcUtils.lookupColumnName(md, i+1);
|
77 | 77 | Object old = document.putIfAbsent(columnName, rsv instanceof Array a ? a.getArray() : rsv);
|
78 | 78 | if (old != null) {
|
79 |
| - log.warn(DUPLICATE_COLUMN_WARNING, columnName, i); |
| 79 | + log.warn(DUPLICATE_COLUMN_WARNING.formatted(columnName, i)); |
80 | 80 | }
|
81 | 81 | }
|
82 | 82 |
|
@@ -120,7 +120,7 @@ public Map<String, Integer> getColumnMap(ResultSet result) {
|
120 | 120 | String columnLabel = metaData.getColumnLabel(i + 1);
|
121 | 121 | Object old = columns.put(columnLabel, i + 1);
|
122 | 122 | if (old != null) {
|
123 |
| - log.warn(DUPLICATE_COLUMN_WARNING, columnLabel, i); |
| 123 | + log.warn(DUPLICATE_COLUMN_WARNING.formatted( columnLabel, i)); |
124 | 124 | }
|
125 | 125 | }
|
126 | 126 | return columns;
|
|
0 commit comments