Spring/spring-data-relational
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Migrate off Slf4J to JCL.

Browse Source 
Closes #1091
Original pull request #1092
This commit is contained in:
Jens Schauder
2021-11-17 14:32:01 +01:00
parent 4ef014246b
commit cdff3850ae
7 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/BasicJdbcConverter.java
View File

@@ -22,8 +22,8 @@ import java.sql.SQLException;
import java.util.Map;
import java.util.Optional;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
@@ -71,7 +71,7 @@ import org.springframework.util.Assert;
*/
public class BasicJdbcConverter extends BasicRelationalConverter implements JdbcConverter, ApplicationContextAware {
private static final Logger LOG = LoggerFactory.getLogger(BasicJdbcConverter.class);
private static final Log LOG = LogFactory.getLog(BasicJdbcConverter.class);
private static final Converter<Iterable<?>, Map<?, ?>> ITERABLE_OF_ENTRY_TO_MAP_CONVERTER = new IterableOfEntryToMapConverter();
private final JdbcTypeFactory typeFactory;

8
spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/ResultSetAccessor.java
View File

@@ -20,8 +20,8 @@ import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.data.mapping.MappingException;
import org.springframework.jdbc.support.JdbcUtils;
import org.springframework.lang.Nullable;
@@ -38,7 +38,7 @@ import org.springframework.util.LinkedCaseInsensitiveMap;
*/
class ResultSetAccessor {
private static final Logger LOG = LoggerFactory.getLogger(ResultSetAccessor.class);
private static final Log LOG = LogFactory.getLog(ResultSetAccessor.class);
private final ResultSet resultSet;
@@ -64,7 +64,7 @@ class ResultSetAccessor {
String label = metaData.getColumnLabel(i);
if (index.containsKey(label)) {
LOG.warn("ResultSet contains {} multiple times", label);
LOG.warn(String.format("ResultSet contains %s multiple times", label));
continue;
}

6
spring-data-jdbc/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategy.java
View File

@@ -24,8 +24,8 @@ import java.util.stream.Collectors;
import org.apache.ibatis.session.SqlSession;
import org.mybatis.spring.SqlSessionTemplate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
@@ -66,7 +66,7 @@ import org.springframework.util.Assert;
*/
public class MyBatisDataAccessStrategy implements DataAccessStrategy {
private static final Logger LOG = LoggerFactory.getLogger(MyBatisDataAccessStrategy.class);
private static final Log LOG = LogFactory.getLog(MyBatisDataAccessStrategy.class);
private static final String VERSION_SQL_PARAMETER_NAME_OLD = "___oldOptimisticLockingVersion";
private final SqlSession sqlSession;

6
spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/AbstractJdbcConfiguration.java
View File

@@ -20,8 +20,8 @@ import java.util.Collections;
import java.util.List;
import java.util.Optional;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
@@ -66,7 +66,7 @@ import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
@Configuration(proxyBeanMethods = false)
public class AbstractJdbcConfiguration implements ApplicationContextAware {
private static final Logger LOG = LoggerFactory.getLogger(AbstractJdbcConfiguration.class);
private static final Log LOG = LogFactory.getLog(AbstractJdbcConfiguration.class);
private ApplicationContext applicationContext;

6
spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/DataSourceConfiguration.java
View File

@@ -23,8 +23,8 @@ import java.util.concurrent.TimeUnit;
import javax.sql.DataSource;
import org.awaitility.Awaitility;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
@@ -45,7 +45,7 @@ import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator;
@Configuration
abstract class DataSourceConfiguration {
private static final Logger LOG = LoggerFactory.getLogger(DataSourceConfiguration.class);
private static final Log LOG = LogFactory.getLog(DataSourceConfiguration.class);
@Autowired Class<?> testClass;
@Autowired Environment environment;

6
spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/OracleDataSourceConfiguration.java
View File

@@ -17,8 +17,8 @@ package org.springframework.data.jdbc.testing;
import javax.sql.DataSource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
import org.springframework.jdbc.core.JdbcTemplate;
@@ -40,7 +40,7 @@ import org.testcontainers.containers.OracleContainer;
@Profile("oracle")
public class OracleDataSourceConfiguration extends DataSourceConfiguration {
private static final Logger LOG = LoggerFactory.getLogger(OracleDataSourceConfiguration.class);
private static final Log LOG = LogFactory.getLog(OracleDataSourceConfiguration.class);
private static OracleContainer ORACLE_CONTAINER;

20
spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/event/AbstractRelationalEventListener.java
View File

@@ -15,8 +15,8 @@
*/
package org.springframework.data.relational.core.mapping.event;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.context.ApplicationListener;
import org.springframework.core.GenericTypeResolver;
@@ -29,7 +29,7 @@ import org.springframework.core.GenericTypeResolver;
*/
public class AbstractRelationalEventListener<E> implements ApplicationListener<AbstractRelationalEvent<?>> {
private static final Logger LOG = LoggerFactory.getLogger(AbstractRelationalEventListener.class);
private static final Log LOG = LogFactory.getLog(AbstractRelationalEventListener.class);
private final Class<?> domainClass;
@@ -80,7 +80,7 @@ public class AbstractRelationalEventListener<E> implements ApplicationListener<A
protected void onBeforeConvert(BeforeConvertEvent<E> event) {
if (LOG.isDebugEnabled()) {
LOG.debug("onBeforeConvert({})", event.getEntity());
LOG.debug(String.format("onBeforeConvert(%s)", event.getEntity()));
}
}
@@ -92,7 +92,7 @@ public class AbstractRelationalEventListener<E> implements ApplicationListener<A
protected void onBeforeSave(BeforeSaveEvent<E> event) {
if (LOG.isDebugEnabled()) {
LOG.debug("onBeforeSave({})", event.getAggregateChange());
LOG.debug(String.format("onBeforeSave(%s)", event.getAggregateChange()));
}
}
@@ -104,7 +104,7 @@ public class AbstractRelationalEventListener<E> implements ApplicationListener<A
protected void onAfterSave(AfterSaveEvent<E> event) {
if (LOG.isDebugEnabled()) {
LOG.debug("onAfterSave({})", event.getAggregateChange());
LOG.debug(String.format("onAfterSave(%s)", event.getAggregateChange()));
}
}
@@ -118,7 +118,7 @@ public class AbstractRelationalEventListener<E> implements ApplicationListener<A
protected void onAfterLoad(AfterLoadEvent<E> event) {
if (LOG.isDebugEnabled()) {
LOG.debug("onAfterLoad({})", event.getEntity());
LOG.debug(String.format("onAfterLoad(%s)", event.getEntity()));
}
}
@@ -131,7 +131,7 @@ public class AbstractRelationalEventListener<E> implements ApplicationListener<A
protected void onAfterConvert(AfterConvertEvent<E> event) {
if (LOG.isDebugEnabled()) {
LOG.debug("onAfterConvert({})", event.getEntity());
LOG.debug(String.format("onAfterConvert(%s)", event.getEntity()));
}
}
@@ -143,7 +143,7 @@ public class AbstractRelationalEventListener<E> implements ApplicationListener<A
protected void onAfterDelete(AfterDeleteEvent<E> event) {
if (LOG.isDebugEnabled()) {
LOG.debug("onAfterDelete({})", event.getAggregateChange());
LOG.debug(String.format("onAfterDelete(%s)", event.getAggregateChange()));
}
}
@@ -155,7 +155,7 @@ public class AbstractRelationalEventListener<E> implements ApplicationListener<A
protected void onBeforeDelete(BeforeDeleteEvent<E> event) {
if (LOG.isDebugEnabled()) {
LOG.debug("onBeforeDelete({})", event.getAggregateChange());
LOG.debug(String.format("onBeforeDelete(%s)", event.getAggregateChange()));
}
}