From 341518d0ccd2272bb8d17657deef05d77739e7f1 Mon Sep 17 00:00:00 2001 From: Junghoon Ban Date: Mon, 17 Jul 2023 04:06:38 +0900 Subject: [PATCH] Refactoring to use spring jcl module instead of slf4j. Original Pull Request #2635 Closes #2634 --- .../data/elasticsearch/client/elc/IndicesTemplate.java | 6 +++--- .../client/elc/ReactiveElasticsearchTemplate.java | 6 +++--- .../data/elasticsearch/client/elc/ResponseConverter.java | 8 ++++---- .../core/AbstractReactiveElasticsearchTemplate.java | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/springframework/data/elasticsearch/client/elc/IndicesTemplate.java b/src/main/java/org/springframework/data/elasticsearch/client/elc/IndicesTemplate.java index 208422ade..47c6f29fa 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/elc/IndicesTemplate.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/elc/IndicesTemplate.java @@ -26,8 +26,8 @@ import java.util.Map; import java.util.Objects; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.core.annotation.AnnotatedElementUtils; import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.data.elasticsearch.UncategorizedElasticsearchException; @@ -60,7 +60,7 @@ import org.springframework.util.Assert; public class IndicesTemplate extends ChildTemplate implements IndexOperations { - private static final Logger LOGGER = LoggerFactory.getLogger(IndicesTemplate.class); + private static final Log LOGGER = LogFactory.getLog(IndicesTemplate.class); // we need a cluster client as well because ES has put some methods from the indices API into the cluster client // (component templates) diff --git a/src/main/java/org/springframework/data/elasticsearch/client/elc/ReactiveElasticsearchTemplate.java b/src/main/java/org/springframework/data/elasticsearch/client/elc/ReactiveElasticsearchTemplate.java index 5cf1bc85f..2d1fa70f6 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/elc/ReactiveElasticsearchTemplate.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/elc/ReactiveElasticsearchTemplate.java @@ -25,6 +25,8 @@ import co.elastic.clients.elasticsearch.core.get.GetResult; import co.elastic.clients.elasticsearch.core.search.ResponseBody; import co.elastic.clients.json.JsonpMapper; import co.elastic.clients.transport.Version; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.util.function.Tuple2; @@ -39,8 +41,6 @@ import java.util.function.Function; import java.util.stream.Collectors; import org.reactivestreams.Publisher; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.data.domain.Sort; import org.springframework.data.elasticsearch.BulkFailureException; import org.springframework.data.elasticsearch.NoSuchIndexException; @@ -72,7 +72,7 @@ import org.springframework.util.StringUtils; */ public class ReactiveElasticsearchTemplate extends AbstractReactiveElasticsearchTemplate { - private static final Logger LOGGER = LoggerFactory.getLogger(ReactiveElasticsearchTemplate.class); + private static final Log LOGGER = LogFactory.getLog(ReactiveElasticsearchTemplate.class); private final ReactiveElasticsearchClient client; private final RequestConverter requestConverter; diff --git a/src/main/java/org/springframework/data/elasticsearch/client/elc/ResponseConverter.java b/src/main/java/org/springframework/data/elasticsearch/client/elc/ResponseConverter.java index 11bd0fefa..9083fc8ae 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/elc/ResponseConverter.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/elc/ResponseConverter.java @@ -40,8 +40,8 @@ import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.data.elasticsearch.ElasticsearchErrorCause; import org.springframework.data.elasticsearch.core.IndexInformation; import org.springframework.data.elasticsearch.core.MultiGetItem; @@ -65,7 +65,7 @@ import org.springframework.util.Assert; */ class ResponseConverter { - private static final Logger LOGGER = LoggerFactory.getLogger(ResponseConverter.class); + private static final Log LOGGER = LogFactory.getLog(ResponseConverter.class); private final JsonpMapper jsonpMapper; @@ -193,7 +193,7 @@ class ResponseConverter { if (indexMappingRecord == null) { if (mappings.size() != 1) { - LOGGER.warn("no mapping returned for index {}", indexCoordinates.getIndexName()); + LOGGER.warn(String.format("no mapping returned for index %s", indexCoordinates.getIndexName())); return Document.create(); } String index = mappings.keySet().iterator().next(); diff --git a/src/main/java/org/springframework/data/elasticsearch/core/AbstractReactiveElasticsearchTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/AbstractReactiveElasticsearchTemplate.java index a053edb40..7cfbad7b7 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/AbstractReactiveElasticsearchTemplate.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/AbstractReactiveElasticsearchTemplate.java @@ -15,6 +15,8 @@ */ package org.springframework.data.elasticsearch.core; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.core.publisher.Sinks; @@ -28,8 +30,6 @@ import java.util.stream.Collectors; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; @@ -73,8 +73,8 @@ import org.springframework.util.Assert; abstract public class AbstractReactiveElasticsearchTemplate implements ReactiveElasticsearchOperations, ApplicationContextAware { - protected static final Logger QUERY_LOGGER = LoggerFactory - .getLogger("org.springframework.data.elasticsearch.core.QUERY"); + protected static final Log QUERY_LOGGER = LogFactory + .getLog("org.springframework.data.elasticsearch.core.QUERY"); protected final ElasticsearchConverter converter; protected final SimpleElasticsearchMappingContext mappingContext;