Merge pull request #19681 from scottfrederick

* pr/19681: Remove support for deprecated Elasticsearch Jest client Closes gh-19681
spring-projects · Jan 13, 2020 · da6fe4a · da6fe4a
2 parents b34a311 + c789592
commit da6fe4a
Show file tree

Hide file tree

Showing 19 changed files with 3 additions and 894 deletions.
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle b/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle
@@ -62,7 +62,6 @@ dependencies {
 	optional 'io.micrometer:micrometer-registry-statsd'
 	optional 'io.micrometer:micrometer-registry-wavefront'
 	optional 'io.projectreactor.netty:reactor-netty'
-	optional 'io.searchbox:jest'
 	optional 'jakarta.jms:jakarta.jms-api'
 	optional 'jakarta.servlet:jakarta.servlet-api'
 	optional 'javax.cache:cache-api'

diff --git a/...uate/autoconfigure/elasticsearch/ElasticSearchJestHealthContributorAutoConfiguration.java b/...uate/autoconfigure/elasticsearch/ElasticSearchJestHealthContributorAutoConfiguration.java
diff --git a/...t-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories b/...t-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories
@@ -13,7 +13,6 @@ org.springframework.boot.actuate.autoconfigure.context.properties.ConfigurationP
 org.springframework.boot.actuate.autoconfigure.context.ShutdownEndpointAutoConfiguration,\
 org.springframework.boot.actuate.autoconfigure.couchbase.CouchbaseHealthContributorAutoConfiguration,\
 org.springframework.boot.actuate.autoconfigure.couchbase.CouchbaseReactiveHealthContributorAutoConfiguration,\
-org.springframework.boot.actuate.autoconfigure.elasticsearch.ElasticSearchJestHealthContributorAutoConfiguration,\
 org.springframework.boot.actuate.autoconfigure.elasticsearch.ElasticSearchRestHealthContributorAutoConfiguration,\
 org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration,\
 org.springframework.boot.actuate.autoconfigure.endpoint.jmx.JmxEndpointAutoConfiguration,\

diff --git a/...ate/autoconfigure/elasticsearch/ElasticsearchHealthContributorAutoConfigurationTests.java b/...ate/autoconfigure/elasticsearch/ElasticsearchHealthContributorAutoConfigurationTests.java
diff --git a/.../actuate/autoconfigure/integrationtest/WebEndpointsAutoConfigurationIntegrationTests.java b/.../actuate/autoconfigure/integrationtest/WebEndpointsAutoConfigurationIntegrationTests.java
@@ -80,12 +80,10 @@ private ReactiveWebApplicationContextRunner reactiveWebRunner() {
 			Neo4jRepositoriesAutoConfiguration.class, MongoAutoConfiguration.class, MongoDataAutoConfiguration.class,
 			MongoReactiveAutoConfiguration.class, MongoReactiveDataAutoConfiguration.class,
 			RepositoryRestMvcAutoConfiguration.class, HazelcastAutoConfiguration.class,
-			ElasticsearchDataAutoConfiguration.class,
-			org.springframework.boot.autoconfigure.elasticsearch.jest.JestAutoConfiguration.class,
-			SolrRepositoriesAutoConfiguration.class, SolrAutoConfiguration.class, RedisAutoConfiguration.class,
-			RedisRepositoriesAutoConfiguration.class, MetricsAutoConfiguration.class })
+			ElasticsearchDataAutoConfiguration.class, SolrRepositoriesAutoConfiguration.class,
+			SolrAutoConfiguration.class, RedisAutoConfiguration.class, RedisRepositoriesAutoConfiguration.class,
+			MetricsAutoConfiguration.class })
 	@SpringBootConfiguration
-	@SuppressWarnings("deprecation")
 	static class WebEndpointTestApplication {
 
 	}

diff --git a/spring-boot-project/spring-boot-actuator/build.gradle b/spring-boot-project/spring-boot-actuator/build.gradle
@@ -24,7 +24,6 @@ dependencies {
 	optional 'io.micrometer:micrometer-registry-prometheus'
 	optional 'io.prometheus:simpleclient_pushgateway'
 	optional 'io.reactivex:rxjava-reactive-streams'
-	optional 'io.searchbox:jest'
 	optional 'org.elasticsearch.client:elasticsearch-rest-client'
 	optional ('io.undertow:undertow-servlet') {
 		exclude group: 'org.jboss.spec.javax.annotation', module: 'jboss-annotations-api_1.2_spec'

diff --git a/...java/org/springframework/boot/actuate/elasticsearch/ElasticsearchJestHealthIndicator.java b/...java/org/springframework/boot/actuate/elasticsearch/ElasticsearchJestHealthIndicator.java
diff --git a/...org/springframework/boot/actuate/elasticsearch/ElasticsearchJestHealthIndicatorTests.java b/...org/springframework/boot/actuate/elasticsearch/ElasticsearchJestHealthIndicatorTests.java
diff --git a/spring-boot-project/spring-boot-autoconfigure/build.gradle b/spring-boot-project/spring-boot-autoconfigure/build.gradle
@@ -34,7 +34,6 @@ dependencies {
 	optional 'de.flapdoodle.embed:de.flapdoodle.embed.mongo'
 	optional 'io.lettuce:lettuce-core'
 	optional 'io.projectreactor.netty:reactor-netty'
-	optional 'io.searchbox:jest'
 	optional 'io.rsocket:rsocket-core'
 	optional 'io.rsocket:rsocket-transport-netty'
 	optional ('io.undertow:undertow-servlet') {