Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-06-24 21:12:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring to use spring jcl module instead of slf4j.

Browse Source 
Original Pull Request #2635
Closes #2634
This commit is contained in:
Junghoon Ban 2023-07-17 04:06:38 +09:00 committed by GitHub
parent 5b4ab0c86e
commit 341518d0cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,8 +26,8 @@ import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Set; import java.util.Set;
import org.slf4j.Logger; import org.apache.commons.logging.Log;
import org.slf4j.LoggerFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.core.annotation.AnnotatedElementUtils; import org.springframework.core.annotation.AnnotatedElementUtils;
import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.dao.InvalidDataAccessApiUsageException;
import org.springframework.data.elasticsearch.UncategorizedElasticsearchException; import org.springframework.data.elasticsearch.UncategorizedElasticsearchException;
@ -60,7 +60,7 @@ import org.springframework.util.Assert;
public class IndicesTemplate extends ChildTemplate<ElasticsearchTransport, ElasticsearchIndicesClient> public class IndicesTemplate extends ChildTemplate<ElasticsearchTransport, ElasticsearchIndicesClient>
implements IndexOperations { 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 // we need a cluster client as well because ES has put some methods from the indices API into the cluster client
// (component templates) // (component templates)

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

@ -25,6 +25,8 @@ import co.elastic.clients.elasticsearch.core.get.GetResult;
import co.elastic.clients.elasticsearch.core.search.ResponseBody; import co.elastic.clients.elasticsearch.core.search.ResponseBody;
import co.elastic.clients.json.JsonpMapper; import co.elastic.clients.json.JsonpMapper;
import co.elastic.clients.transport.Version; 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.Flux;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import reactor.util.function.Tuple2; import reactor.util.function.Tuple2;
@ -39,8 +41,6 @@ import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.reactivestreams.Publisher; import org.reactivestreams.Publisher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort;
import org.springframework.data.elasticsearch.BulkFailureException; import org.springframework.data.elasticsearch.BulkFailureException;
import org.springframework.data.elasticsearch.NoSuchIndexException; import org.springframework.data.elasticsearch.NoSuchIndexException;
@ -72,7 +72,7 @@ import org.springframework.util.StringUtils;
*/ */
public class ReactiveElasticsearchTemplate extends AbstractReactiveElasticsearchTemplate { 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 ReactiveElasticsearchClient client;
private final RequestConverter requestConverter; private final RequestConverter requestConverter;

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

@ -40,8 +40,8 @@ import java.util.*;
import java.util.function.Function; import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.slf4j.Logger; import org.apache.commons.logging.Log;
import org.slf4j.LoggerFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.data.elasticsearch.ElasticsearchErrorCause; import org.springframework.data.elasticsearch.ElasticsearchErrorCause;
import org.springframework.data.elasticsearch.core.IndexInformation; import org.springframework.data.elasticsearch.core.IndexInformation;
import org.springframework.data.elasticsearch.core.MultiGetItem; import org.springframework.data.elasticsearch.core.MultiGetItem;
@ -65,7 +65,7 @@ import org.springframework.util.Assert;
*/ */
class ResponseConverter { class ResponseConverter {
private static final Logger LOGGER = LoggerFactory.getLogger(ResponseConverter.class); private static final Log LOGGER = LogFactory.getLog(ResponseConverter.class);
private final JsonpMapper jsonpMapper; private final JsonpMapper jsonpMapper;
@ -193,7 +193,7 @@ class ResponseConverter {
if (indexMappingRecord == null) { if (indexMappingRecord == null) {
if (mappings.size() != 1) { 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(); return Document.create();
} }
String index = mappings.keySet().iterator().next(); String index = mappings.keySet().iterator().next();

8
src/main/java/org/springframework/data/elasticsearch/core/AbstractReactiveElasticsearchTemplate.java
View File

@ -15,6 +15,8 @@
*/ */
package org.springframework.data.elasticsearch.core; 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.Flux;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import reactor.core.publisher.Sinks; import reactor.core.publisher.Sinks;
@ -28,8 +30,6 @@ import java.util.stream.Collectors;
import org.reactivestreams.Subscriber; import org.reactivestreams.Subscriber;
import org.reactivestreams.Subscription; import org.reactivestreams.Subscription;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware; import org.springframework.context.ApplicationContextAware;
@ -73,8 +73,8 @@ import org.springframework.util.Assert;
abstract public class AbstractReactiveElasticsearchTemplate abstract public class AbstractReactiveElasticsearchTemplate
implements ReactiveElasticsearchOperations, ApplicationContextAware { implements ReactiveElasticsearchOperations, ApplicationContextAware {
protected static final Logger QUERY_LOGGER = LoggerFactory protected static final Log QUERY_LOGGER = LogFactory
.getLogger("org.springframework.data.elasticsearch.core.QUERY"); .getLog("org.springframework.data.elasticsearch.core.QUERY");
protected final ElasticsearchConverter converter; protected final ElasticsearchConverter converter;
protected final SimpleElasticsearchMappingContext mappingContext; protected final SimpleElasticsearchMappingContext mappingContext;