Move Data Elasticsearch health auto-configuration

Author: wilkinsona

spring-boot-project/spring-boot-actuator-autoconfigure-all/build.gradle

@@ -32,7 +32,6 @@ dependencies {
 	optional(project(":spring-boot-project:spring-boot-cache"))
 	optional(project(":spring-boot-project:spring-boot-couchbase"))
 	optional(project(":spring-boot-project:spring-boot-data-cassandra"))
-	optional(project(":spring-boot-project:spring-boot-data-elasticsearch"))
 	optional(project(":spring-boot-project:spring-boot-data-jpa"))
 	optional(project(":spring-boot-project:spring-boot-data-mongodb"))
 	optional(project(":spring-boot-project:spring-boot-data-neo4j"))
@@ -132,7 +131,6 @@ dependencies {
 	optional("org.eclipse.jetty:jetty-server") {
 		exclude group: "org.eclipse.jetty.toolchain", module: "jetty-jakarta-servlet-api"
 	}
-	optional("org.elasticsearch.client:elasticsearch-rest-client")
 	optional("org.glassfish.jersey.core:jersey-server")
 	optional("org.glassfish.jersey.containers:jersey-container-servlet-core")
 	optional("org.glassfish.jersey.ext:jersey-micrometer")
@@ -159,7 +157,6 @@ dependencies {
 	optional("org.springframework.data:spring-data-ldap")
 	optional("org.springframework.data:spring-data-mongodb")
 	optional("org.springframework.data:spring-data-redis")
-	optional("org.springframework.data:spring-data-elasticsearch")
 	optional("org.springframework.graphql:spring-graphql")
 	optional("org.springframework.kafka:spring-kafka")
 	optional("org.springframework.security:spring-security-config")

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/data/package-info.java

@@ -8,7 +8,6 @@ org.springframework.boot.actuate.autoconfigure.cloudfoundry.servlet.CloudFoundry
 org.springframework.boot.actuate.autoconfigure.condition.ConditionsReportEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.context.properties.ConfigurationPropertiesReportEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.context.ShutdownEndpointAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.data.elasticsearch.ElasticsearchReactiveHealthContributorAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.data.mongo.MongoHealthContributorAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.data.mongo.MongoReactiveHealthContributorAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.data.redis.RedisHealthContributorAutoConfiguration

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -27,7 +27,6 @@
 import org.springframework.boot.cassandra.autoconfigure.CassandraAutoConfiguration;
 import org.springframework.boot.context.annotation.UserConfigurations;
 import org.springframework.boot.data.cassandra.autoconfigure.CassandraDataAutoConfiguration;
-import org.springframework.boot.data.elasticsearch.autoconfigure.ElasticsearchDataAutoConfiguration;
 import org.springframework.boot.data.mongodb.autoconfigure.MongoDataAutoConfiguration;
 import org.springframework.boot.data.mongodb.autoconfigure.MongoReactiveDataAutoConfiguration;
 import org.springframework.boot.data.neo4j.autoconfigure.Neo4jDataAutoConfiguration;
@@ -82,8 +81,7 @@ private ReactiveWebApplicationContextRunner reactiveWebRunner() {
 			CassandraAutoConfiguration.class, CassandraDataAutoConfiguration.class, Neo4jDataAutoConfiguration.class,
 			Neo4jReactiveDataAutoConfiguration.class, MongoAutoConfiguration.class, MongoDataAutoConfiguration.class,
 			MongoReactiveAutoConfiguration.class, MongoReactiveDataAutoConfiguration.class,
-			RepositoryRestMvcAutoConfiguration.class, HazelcastAutoConfiguration.class,
-			ElasticsearchDataAutoConfiguration.class, RedisAutoConfiguration.class,
+			RepositoryRestMvcAutoConfiguration.class, HazelcastAutoConfiguration.class, RedisAutoConfiguration.class,
 			RedisRepositoriesAutoConfiguration.class, BraveAutoConfiguration.class,
 			OpenTelemetryTracingAutoConfiguration.class })
 	@SpringBootConfiguration

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebEndpointsAutoConfigurationIntegrationTests.java

@@ -21,7 +21,7 @@ dependencies {
 	dockerTestImplementation("org.testcontainers:elasticsearch")
 	dockerTestImplementation("org.testcontainers:junit-jupiter")
 
-	optional(project(":spring-boot-project:spring-boot-actuator"))
+	optional(project(":spring-boot-project:spring-boot-actuator-autoconfigure"))
 	optional(project(":spring-boot-project:spring-boot-autoconfigure"))
 	optional(project(":spring-boot-project:spring-boot-reactor"))
 

spring-boot-project/spring-boot-data-elasticsearch/build.gradle

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.data.elasticsearch;
+package org.springframework.boot.data.elasticsearch.actuate.health.autoconfigure;
 
 import reactor.core.publisher.Flux;
 
@@ -28,6 +28,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.data.elasticsearch.actuate.health.ElasticsearchReactiveHealthIndicator;
+import org.springframework.boot.elasticsearch.autoconfigure.ReactiveElasticsearchClientAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.elasticsearch.client.elc.ReactiveElasticsearchClient;
 
@@ -37,11 +38,11 @@
  * {@link ReactiveElasticsearchClient}.
  *
  * @author Aleksander Lech
- * @since 2.3.2
+ * @since 4.0.0
  */
-@AutoConfiguration(
-		afterName = "org.springframework.boot.elasticsearch.autoconfigure.ReactiveElasticsearchClientAutoConfiguration")
-@ConditionalOnClass({ ReactiveElasticsearchClient.class, Flux.class, ElasticsearchReactiveHealthIndicator.class })
+@AutoConfiguration(after = ReactiveElasticsearchClientAutoConfiguration.class)
+@ConditionalOnClass({ ReactiveElasticsearchClient.class, Flux.class, ElasticsearchReactiveHealthIndicator.class,
+		ConditionalOnEnabledHealthIndicator.class })
 @ConditionalOnBean(ReactiveElasticsearchClient.class)
 @ConditionalOnEnabledHealthIndicator("elasticsearch")
 public class ElasticsearchReactiveHealthContributorAutoConfiguration extends

…eHealthContributorAutoConfiguration.java …eHealthContributorAutoConfiguration.javaspring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/data/elasticsearch/ElasticsearchReactiveHealthContributorAutoConfiguration.java renamed to spring-boot-project/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/actuate/health/autoconfigure/ElasticsearchReactiveHealthContributorAutoConfiguration.java spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/data/elasticsearch/ElasticsearchReactiveHealthContributorAutoConfiguration.java renamed to spring-boot-project/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/actuate/health/autoconfigure/ElasticsearchReactiveHealthContributorAutoConfiguration.java

@@ -15,6 +15,7 @@
  */
 
 /**
- * Auto-configuration for actuator Elasticsearch concerns dependent on Spring Data.
+ * Auto-configuration for Elasticsearch health integration using Spring Data
+ * Elasticsearch.
  */
-package org.springframework.boot.actuate.autoconfigure.data.elasticsearch;
+package org.springframework.boot.data.elasticsearch.actuate.health.autoconfigure;

…ure/data/elasticsearch/package-info.java …e/health/autoconfigure/package-info.javaspring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/data/elasticsearch/package-info.java renamed to spring-boot-project/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/actuate/health/autoconfigure/package-info.java spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/data/elasticsearch/package-info.java renamed to spring-boot-project/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/actuate/health/autoconfigure/package-info.java

@@ -1,3 +1,4 @@
+org.springframework.boot.data.elasticsearch.actuate.health.autoconfigure.ElasticsearchReactiveHealthContributorAutoConfiguration
 org.springframework.boot.data.elasticsearch.autoconfigure.ElasticsearchDataAutoConfiguration
 org.springframework.boot.data.elasticsearch.autoconfigure.ElasticsearchRepositoriesAutoConfiguration
 org.springframework.boot.data.elasticsearch.autoconfigure.ReactiveElasticsearchRepositoriesAutoConfiguration

spring-boot-project/spring-boot-data-elasticsearch/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -21,6 +21,7 @@
 import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.data.elasticsearch.actuate.health.ElasticsearchReactiveHealthIndicator;
+import org.springframework.boot.data.elasticsearch.actuate.health.autoconfigure.ElasticsearchReactiveHealthContributorAutoConfiguration;
 import org.springframework.boot.data.elasticsearch.autoconfigure.ElasticsearchDataAutoConfiguration;
 import org.springframework.boot.elasticsearch.actuate.health.ElasticsearchRestClientHealthIndicator;
 import org.springframework.boot.elasticsearch.actuate.health.autoconfigure.ElasticsearchRestHealthContributorAutoConfiguration;