diff --git a/pom.xml b/pom.xml index 2c64717780..3e1d241804 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-relational-parent - 2.4.0-SNAPSHOT + 2.4.0-1091-slf4j-to-jcl-SNAPSHOT pom Spring Data Relational Parent diff --git a/spring-data-jdbc-distribution/pom.xml b/spring-data-jdbc-distribution/pom.xml index 0646c2846d..68d5fd36c9 100644 --- a/spring-data-jdbc-distribution/pom.xml +++ b/spring-data-jdbc-distribution/pom.xml @@ -14,7 +14,7 @@ org.springframework.data spring-data-relational-parent - 2.4.0-SNAPSHOT + 2.4.0-1091-slf4j-to-jcl-SNAPSHOT ../pom.xml diff --git a/spring-data-jdbc/pom.xml b/spring-data-jdbc/pom.xml index 11114a795e..36fe3a32b5 100644 --- a/spring-data-jdbc/pom.xml +++ b/spring-data-jdbc/pom.xml @@ -6,7 +6,7 @@ 4.0.0 spring-data-jdbc - 2.4.0-SNAPSHOT + 2.4.0-1091-slf4j-to-jcl-SNAPSHOT Spring Data JDBC Spring Data module for JDBC repositories. @@ -15,7 +15,7 @@ org.springframework.data spring-data-relational-parent - 2.4.0-SNAPSHOT + 2.4.0-1091-slf4j-to-jcl-SNAPSHOT diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/BasicJdbcConverter.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/BasicJdbcConverter.java index 0720496f52..dfefccd358 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/BasicJdbcConverter.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/BasicJdbcConverter.java @@ -22,8 +22,8 @@ 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 @@ */ 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, Map> ITERABLE_OF_ENTRY_TO_MAP_CONVERTER = new IterableOfEntryToMapConverter(); private final JdbcTypeFactory typeFactory; diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/ResultSetAccessor.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/ResultSetAccessor.java index d6cc83462e..26bf7d5451 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/ResultSetAccessor.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/ResultSetAccessor.java @@ -20,8 +20,8 @@ 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 @@ */ 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 @@ private static Map indexColumns(ResultSet resultSet) { 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; } diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategy.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategy.java index fe375c044a..0a5569d830 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategy.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategy.java @@ -24,8 +24,8 @@ 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 @@ */ 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; diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/AbstractJdbcConfiguration.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/AbstractJdbcConfiguration.java index 13ca2e865f..6a7702edc9 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/AbstractJdbcConfiguration.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/AbstractJdbcConfiguration.java @@ -20,8 +20,8 @@ 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 @@ @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; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/DataSourceConfiguration.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/DataSourceConfiguration.java index a8eebef273..aa95969df3 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/DataSourceConfiguration.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/DataSourceConfiguration.java @@ -23,8 +23,8 @@ 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 @@ @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; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/OracleDataSourceConfiguration.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/OracleDataSourceConfiguration.java index b095de9a33..03be1fe851 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/OracleDataSourceConfiguration.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/OracleDataSourceConfiguration.java @@ -17,8 +17,8 @@ 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 @@ @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; diff --git a/spring-data-relational/pom.xml b/spring-data-relational/pom.xml index a6eb48c891..9870b6faad 100644 --- a/spring-data-relational/pom.xml +++ b/spring-data-relational/pom.xml @@ -6,7 +6,7 @@ 4.0.0 spring-data-relational - 2.4.0-SNAPSHOT + 2.4.0-1091-slf4j-to-jcl-SNAPSHOT Spring Data Relational Spring Data Relational support @@ -14,7 +14,7 @@ org.springframework.data spring-data-relational-parent - 2.4.0-SNAPSHOT + 2.4.0-1091-slf4j-to-jcl-SNAPSHOT diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/event/AbstractRelationalEventListener.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/event/AbstractRelationalEventListener.java index a0eece8968..14f046e4b0 100644 --- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/event/AbstractRelationalEventListener.java +++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/event/AbstractRelationalEventListener.java @@ -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 @@ */ public class AbstractRelationalEventListener implements ApplicationListener> { - 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 void onApplicationEvent(AbstractRelationalEvent event) { protected void onBeforeConvert(BeforeConvertEvent event) { if (LOG.isDebugEnabled()) { - LOG.debug("onBeforeConvert({})", event.getEntity()); + LOG.debug(String.format("onBeforeConvert(%s)", event.getEntity())); } } @@ -92,7 +92,7 @@ protected void onBeforeConvert(BeforeConvertEvent event) { protected void onBeforeSave(BeforeSaveEvent event) { if (LOG.isDebugEnabled()) { - LOG.debug("onBeforeSave({})", event.getAggregateChange()); + LOG.debug(String.format("onBeforeSave(%s)", event.getAggregateChange())); } } @@ -104,7 +104,7 @@ protected void onBeforeSave(BeforeSaveEvent event) { protected void onAfterSave(AfterSaveEvent event) { if (LOG.isDebugEnabled()) { - LOG.debug("onAfterSave({})", event.getAggregateChange()); + LOG.debug(String.format("onAfterSave(%s)", event.getAggregateChange())); } } @@ -118,7 +118,7 @@ protected void onAfterSave(AfterSaveEvent event) { protected void onAfterLoad(AfterLoadEvent event) { if (LOG.isDebugEnabled()) { - LOG.debug("onAfterLoad({})", event.getEntity()); + LOG.debug(String.format("onAfterLoad(%s)", event.getEntity())); } } @@ -131,7 +131,7 @@ protected void onAfterLoad(AfterLoadEvent event) { protected void onAfterConvert(AfterConvertEvent event) { if (LOG.isDebugEnabled()) { - LOG.debug("onAfterConvert({})", event.getEntity()); + LOG.debug(String.format("onAfterConvert(%s)", event.getEntity())); } } @@ -143,7 +143,7 @@ protected void onAfterConvert(AfterConvertEvent event) { protected void onAfterDelete(AfterDeleteEvent event) { if (LOG.isDebugEnabled()) { - LOG.debug("onAfterDelete({})", event.getAggregateChange()); + LOG.debug(String.format("onAfterDelete(%s)", event.getAggregateChange())); } } @@ -155,7 +155,7 @@ protected void onAfterDelete(AfterDeleteEvent event) { protected void onBeforeDelete(BeforeDeleteEvent event) { if (LOG.isDebugEnabled()) { - LOG.debug("onBeforeDelete({})", event.getAggregateChange()); + LOG.debug(String.format("onBeforeDelete(%s)", event.getAggregateChange())); } }