Browse Source

Merge branch '4.0.x'

Closes gh-48903
pull/48906/head
Andy Wilkinson 2 weeks ago
parent
commit
44748296c7
  1. 2
      module/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchRestClientConfigurations.java

2
module/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchRestClientConfigurations.java

@ -45,7 +45,6 @@ import org.apache.hc.core5.util.Timeout; @@ -45,7 +45,6 @@ import org.apache.hc.core5.util.Timeout;
import org.jspecify.annotations.Nullable;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate;
@ -139,7 +138,6 @@ class ElasticsearchRestClientConfigurations { @@ -139,7 +138,6 @@ class ElasticsearchRestClientConfigurations {
}
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(Sniffer.class)
@ConditionalOnSingleCandidate(Rest5Client.class)
@ConditionalOnProperty(name = "spring.elasticsearch.restclient.sniffer.enabled")
static class RestClientSnifferConfiguration {

Loading…
Cancel
Save