Skip to content

Commit 341518d

Browse files
Refactoring to use spring jcl module instead of slf4j.
Original Pull Request #2635 Closes #2634
1 parent 5b4ab0c commit 341518d

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

src/main/java/org/springframework/data/elasticsearch/client/elc/IndicesTemplate.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
import java.util.Objects;
2727
import java.util.Set;
2828

29-
import org.slf4j.Logger;
30-
import org.slf4j.LoggerFactory;
29+
import org.apache.commons.logging.Log;
30+
import org.apache.commons.logging.LogFactory;
3131
import org.springframework.core.annotation.AnnotatedElementUtils;
3232
import org.springframework.dao.InvalidDataAccessApiUsageException;
3333
import org.springframework.data.elasticsearch.UncategorizedElasticsearchException;
@@ -60,7 +60,7 @@
6060
public class IndicesTemplate extends ChildTemplate<ElasticsearchTransport, ElasticsearchIndicesClient>
6161
implements IndexOperations {
6262

63-
private static final Logger LOGGER = LoggerFactory.getLogger(IndicesTemplate.class);
63+
private static final Log LOGGER = LogFactory.getLog(IndicesTemplate.class);
6464

6565
// we need a cluster client as well because ES has put some methods from the indices API into the cluster client
6666
// (component templates)

src/main/java/org/springframework/data/elasticsearch/client/elc/ReactiveElasticsearchTemplate.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
import co.elastic.clients.elasticsearch.core.search.ResponseBody;
2626
import co.elastic.clients.json.JsonpMapper;
2727
import co.elastic.clients.transport.Version;
28+
import org.apache.commons.logging.Log;
29+
import org.apache.commons.logging.LogFactory;
2830
import reactor.core.publisher.Flux;
2931
import reactor.core.publisher.Mono;
3032
import reactor.util.function.Tuple2;
@@ -39,8 +41,6 @@
3941
import java.util.stream.Collectors;
4042

4143
import org.reactivestreams.Publisher;
42-
import org.slf4j.Logger;
43-
import org.slf4j.LoggerFactory;
4444
import org.springframework.data.domain.Sort;
4545
import org.springframework.data.elasticsearch.BulkFailureException;
4646
import org.springframework.data.elasticsearch.NoSuchIndexException;
@@ -72,7 +72,7 @@
7272
*/
7373
public class ReactiveElasticsearchTemplate extends AbstractReactiveElasticsearchTemplate {
7474

75-
private static final Logger LOGGER = LoggerFactory.getLogger(ReactiveElasticsearchTemplate.class);
75+
private static final Log LOGGER = LogFactory.getLog(ReactiveElasticsearchTemplate.class);
7676

7777
private final ReactiveElasticsearchClient client;
7878
private final RequestConverter requestConverter;

src/main/java/org/springframework/data/elasticsearch/client/elc/ResponseConverter.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
import java.util.function.Function;
4141
import java.util.stream.Collectors;
4242

43-
import org.slf4j.Logger;
44-
import org.slf4j.LoggerFactory;
43+
import org.apache.commons.logging.Log;
44+
import org.apache.commons.logging.LogFactory;
4545
import org.springframework.data.elasticsearch.ElasticsearchErrorCause;
4646
import org.springframework.data.elasticsearch.core.IndexInformation;
4747
import org.springframework.data.elasticsearch.core.MultiGetItem;
@@ -65,7 +65,7 @@
6565
*/
6666
class ResponseConverter {
6767

68-
private static final Logger LOGGER = LoggerFactory.getLogger(ResponseConverter.class);
68+
private static final Log LOGGER = LogFactory.getLog(ResponseConverter.class);
6969

7070
private final JsonpMapper jsonpMapper;
7171

@@ -193,7 +193,7 @@ public Document indicesGetMapping(GetMappingResponse getMappingResponse, IndexCo
193193
if (indexMappingRecord == null) {
194194

195195
if (mappings.size() != 1) {
196-
LOGGER.warn("no mapping returned for index {}", indexCoordinates.getIndexName());
196+
LOGGER.warn(String.format("no mapping returned for index %s", indexCoordinates.getIndexName()));
197197
return Document.create();
198198
}
199199
String index = mappings.keySet().iterator().next();

src/main/java/org/springframework/data/elasticsearch/core/AbstractReactiveElasticsearchTemplate.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
*/
1616
package org.springframework.data.elasticsearch.core;
1717

18+
import org.apache.commons.logging.Log;
19+
import org.apache.commons.logging.LogFactory;
1820
import reactor.core.publisher.Flux;
1921
import reactor.core.publisher.Mono;
2022
import reactor.core.publisher.Sinks;
@@ -28,8 +30,6 @@
2830

2931
import org.reactivestreams.Subscriber;
3032
import org.reactivestreams.Subscription;
31-
import org.slf4j.Logger;
32-
import org.slf4j.LoggerFactory;
3333
import org.springframework.beans.BeansException;
3434
import org.springframework.context.ApplicationContext;
3535
import org.springframework.context.ApplicationContextAware;
@@ -73,8 +73,8 @@
7373
abstract public class AbstractReactiveElasticsearchTemplate
7474
implements ReactiveElasticsearchOperations, ApplicationContextAware {
7575

76-
protected static final Logger QUERY_LOGGER = LoggerFactory
77-
.getLogger("org.springframework.data.elasticsearch.core.QUERY");
76+
protected static final Log QUERY_LOGGER = LogFactory
77+
.getLog("org.springframework.data.elasticsearch.core.QUERY");
7878

7979
protected final ElasticsearchConverter converter;
8080
protected final SimpleElasticsearchMappingContext mappingContext;

0 commit comments

Comments
 (0)