Migrate off Slf4J to JCL.

schauder · schauder · commit fd43232e6742 · 2021-11-17T14:32:01.000+01:00
Closes #1091
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
@@ -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<Iterable<?>, 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
@@ -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<String, Integer> 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
@@ -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
@@ -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
@@ -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
@@ -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/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<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 void onApplicationEvent(AbstractRelationalEvent<?> event) {
 	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 @@ protected void onBeforeConvert(BeforeConvertEvent<E> event) {
 	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 @@ protected void onBeforeSave(BeforeSaveEvent<E> event) {
 	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 @@ protected void onAfterSave(AfterSaveEvent<E> event) {
 	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 @@ protected void onAfterLoad(AfterLoadEvent<E> event) {
 	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 @@ protected void onAfterConvert(AfterConvertEvent<E> event) {
 	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 @@ protected void onAfterDelete(AfterDeleteEvent<E> event) {
 	protected void onBeforeDelete(BeforeDeleteEvent<E> event) {
 
 		if (LOG.isDebugEnabled()) {
-			LOG.debug("onBeforeDelete({})", event.getAggregateChange());
+			LOG.debug(String.format("onBeforeDelete(%s)", event.getAggregateChange()));
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@`
`15`	`15`	`*/`
`16`	`16`	`package org.springframework.data.relational.core.mapping.event;`
`17`	`17`
`18`		`-import org.slf4j.Logger;`
`19`		`-import org.slf4j.LoggerFactory;`
	`18`	`+import org.apache.commons.logging.Log;`
	`19`	`+import org.apache.commons.logging.LogFactory;`
`20`	`20`	`import org.springframework.context.ApplicationListener;`
`21`	`21`	`import org.springframework.core.GenericTypeResolver;`
`22`	`22`
`@@ -29,7 +29,7 @@`
`29`	`29`	`*/`
`30`	`30`	`public class AbstractRelationalEventListener<E> implements ApplicationListener<AbstractRelationalEvent<?>> {`
`31`	`31`
`32`		`- private static final Logger LOG = LoggerFactory.getLogger(AbstractRelationalEventListener.class);`
	`32`	`+ private static final Log LOG = LogFactory.getLog(AbstractRelationalEventListener.class);`
`33`	`33`
`34`	`34`	`private final Class<?> domainClass;`
`35`	`35`
`@@ -80,7 +80,7 @@ public void onApplicationEvent(AbstractRelationalEvent<?> event) {`
`80`	`80`	`protected void onBeforeConvert(BeforeConvertEvent<E> event) {`
`81`	`81`
`82`	`82`	`if (LOG.isDebugEnabled()) {`
`83`		`- LOG.debug("onBeforeConvert({})", event.getEntity());`
	`83`	`+ LOG.debug(String.format("onBeforeConvert(%s)", event.getEntity()));`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`
`@@ -92,7 +92,7 @@ protected void onBeforeConvert(BeforeConvertEvent<E> event) {`
`92`	`92`	`protected void onBeforeSave(BeforeSaveEvent<E> event) {`
`93`	`93`
`94`	`94`	`if (LOG.isDebugEnabled()) {`
`95`		`- LOG.debug("onBeforeSave({})", event.getAggregateChange());`
	`95`	`+ LOG.debug(String.format("onBeforeSave(%s)", event.getAggregateChange()));`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`
`@@ -104,7 +104,7 @@ protected void onBeforeSave(BeforeSaveEvent<E> event) {`
`104`	`104`	`protected void onAfterSave(AfterSaveEvent<E> event) {`
`105`	`105`
`106`	`106`	`if (LOG.isDebugEnabled()) {`
`107`		`- LOG.debug("onAfterSave({})", event.getAggregateChange());`
	`107`	`+ LOG.debug(String.format("onAfterSave(%s)", event.getAggregateChange()));`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`
`@@ -118,7 +118,7 @@ protected void onAfterSave(AfterSaveEvent<E> event) {`
`118`	`118`	`protected void onAfterLoad(AfterLoadEvent<E> event) {`
`119`	`119`
`120`	`120`	`if (LOG.isDebugEnabled()) {`
`121`		`- LOG.debug("onAfterLoad({})", event.getEntity());`
	`121`	`+ LOG.debug(String.format("onAfterLoad(%s)", event.getEntity()));`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`
`@@ -131,7 +131,7 @@ protected void onAfterLoad(AfterLoadEvent<E> event) {`
`131`	`131`	`protected void onAfterConvert(AfterConvertEvent<E> event) {`
`132`	`132`
`133`	`133`	`if (LOG.isDebugEnabled()) {`
`134`		`- LOG.debug("onAfterConvert({})", event.getEntity());`
	`134`	`+ LOG.debug(String.format("onAfterConvert(%s)", event.getEntity()));`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`
`@@ -143,7 +143,7 @@ protected void onAfterConvert(AfterConvertEvent<E> event) {`
`143`	`143`	`protected void onAfterDelete(AfterDeleteEvent<E> event) {`
`144`	`144`
`145`	`145`	`if (LOG.isDebugEnabled()) {`
`146`		`- LOG.debug("onAfterDelete({})", event.getAggregateChange());`
	`146`	`+ LOG.debug(String.format("onAfterDelete(%s)", event.getAggregateChange()));`
`147`	`147`	`}`
`148`	`148`	`}`
`149`	`149`
`@@ -155,7 +155,7 @@ protected void onAfterDelete(AfterDeleteEvent<E> event) {`
`155`	`155`	`protected void onBeforeDelete(BeforeDeleteEvent<E> event) {`
`156`	`156`
`157`	`157`	`if (LOG.isDebugEnabled()) {`
`158`		`- LOG.debug("onBeforeDelete({})", event.getAggregateChange());`
	`158`	`+ LOG.debug(String.format("onBeforeDelete(%s)", event.getAggregateChange()));`
`159`	`159`	`}`
`160`	`160`	`}`
`161`	`161`