fix: restore health indicator bean type compatibility and update tests

Author: prathmeshcc

spring-cloud-gcp-autoconfigure/src/main/java/com/google/cloud/spring/autoconfigure/pubsub/health/PubSubHealthIndicatorAutoConfiguration.java

@@ -63,6 +63,6 @@ public PubSubHealthIndicatorAutoConfiguration(
   @ConditionalOnMissingBean(name = {"pubSubHealthIndicator", "pubSubHealthContributor"})
   public HealthContributor pubSubHealthContributor(Map<String, PubSubTemplate> pubSubTemplates) {
     Assert.notNull(pubSubTemplates, "pubSubTemplates must be provided");
-    return createComposite(pubSubTemplates);
+    return createContributor(pubSubTemplates);
   }
 }

spring-cloud-gcp-autoconfigure/src/main/java/com/google/cloud/spring/autoconfigure/spanner/health/SpannerHealthIndicatorAutoConfiguration.java

@@ -62,6 +62,6 @@ public SpannerHealthIndicatorAutoConfiguration(
   @ConditionalOnMissingBean(name = {"spannerHealthIndicator", "spannerHealthContributor"})
   public HealthContributor spannerHealthContributor(Map<String, SpannerTemplate> spannerTemplates) {
     Assert.notNull(spannerTemplates, "SpannerTemplates must be provided");
-    return createComposite(spannerTemplates);
+    return createContributor(spannerTemplates);
   }
 }

spring-cloud-gcp-autoconfigure/src/test/java/com/google/cloud/spring/autoconfigure/pubsub/health/PubSubHealthIndicatorAutoConfigurationTests.java

@@ -68,19 +68,12 @@ void healthIndicatorPresent_defaults() throws Exception {
         .withBean("pubSubTemplate", PubSubTemplate.class, () -> mockPubSubTemplate)
         .run(
             ctx -> {
-              HealthContributor healthContributor = ctx.getBean(HealthContributor.class);
-              assertThat(healthContributor).isNotNull();
-              PubSubHealthIndicator indicator;
-              if (healthContributor instanceof CompositeHealthContributor composite) {
-                indicator = (PubSubHealthIndicator) composite.getContributor("pubSubTemplate");
-              } else {
-                indicator = (PubSubHealthIndicator) healthContributor;
-              }
-              assertThat(indicator).isNotNull();
-              assertThat(indicator.getSubscription()).matches(UUID_PATTERN);
-              assertThat(indicator.getTimeoutMillis()).isEqualTo(5000);
-              assertThat(indicator.isAcknowledgeMessages()).isFalse();
-              assertThat(indicator.isSpecifiedSubscription()).isFalse();
+              PubSubHealthIndicator healthIndicator = ctx.getBean(PubSubHealthIndicator.class);
+              assertThat(healthIndicator).isNotNull();
+              assertThat(healthIndicator.getSubscription()).matches(UUID_PATTERN);
+              assertThat(healthIndicator.getTimeoutMillis()).isEqualTo(5000);
+              assertThat(healthIndicator.isAcknowledgeMessages()).isFalse();
+              assertThat(healthIndicator.isSpecifiedSubscription()).isFalse();
             });
   }
 
@@ -98,14 +91,7 @@ void healthIndicatorPresent_customConfig() {
             "spring.cloud.gcp.pubsub.health.acknowledgeMessages=true")
         .run(
             ctx -> {
-              HealthContributor healthContributor = ctx.getBean(HealthContributor.class);
-              assertThat(healthContributor).isNotNull();
-              PubSubHealthIndicator healthIndicator;
-              if (healthContributor instanceof CompositeHealthContributor composite) {
-                healthIndicator = (PubSubHealthIndicator) composite.getContributor("pubSubTemplate");
-              } else {
-                healthIndicator = (PubSubHealthIndicator) healthContributor;
-              }
+              PubSubHealthIndicator healthIndicator = ctx.getBean(PubSubHealthIndicator.class);
               assertThat(healthIndicator).isNotNull();
               assertThat(healthIndicator.getSubscription()).isEqualTo("test");
               assertThat(healthIndicator.getTimeoutMillis()).isEqualTo(1500);

spring-cloud-gcp-autoconfigure/src/test/java/com/google/cloud/spring/autoconfigure/spanner/health/SpannerHealthIndicatorAutoConfigurationTests.java

@@ -28,9 +28,8 @@
 import com.google.cloud.spring.autoconfigure.spanner.GcpSpannerAutoConfiguration;
 import com.google.gson.Gson;
 import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.health.contributor.CompositeHealthContributor;
-import org.springframework.boot.health.contributor.HealthContributor;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -60,13 +59,7 @@ void testSpannerHealthIndicatorCreated() {
     final String defaultQuery = "SELECT 1";
     this.contextRunner.run(
         context -> {
-          HealthContributor contributor = context.getBean(HealthContributor.class);
-          SpannerHealthIndicator indicator;
-          if (contributor instanceof CompositeHealthContributor composite) {
-            indicator = (SpannerHealthIndicator) composite.getContributor("spannerTemplate");
-          } else {
-            indicator = (SpannerHealthIndicator) contributor;
-          }
+          SpannerHealthIndicator indicator = context.getBean(SpannerHealthIndicator.class);
           assertThat(indicator).isNotNull();
           assertThat(indicator)
               .hasFieldOrPropertyWithValue("validationStatement", Statement.of(defaultQuery));
@@ -80,13 +73,7 @@ void testSpannerHealthIndicatorCreatedWithQuery() {
         .withPropertyValues("spring.cloud.gcp.spanner.health.query=" + customQuery)
         .run(
             context -> {
-              HealthContributor contributor = context.getBean(HealthContributor.class);
-              SpannerHealthIndicator indicator;
-              if (contributor instanceof CompositeHealthContributor composite) {
-                indicator = (SpannerHealthIndicator) composite.getContributor("spannerTemplate");
-              } else {
-                indicator = (SpannerHealthIndicator) contributor;
-              }
+              SpannerHealthIndicator indicator = context.getBean(SpannerHealthIndicator.class);
               assertThat(indicator).isNotNull();
               assertThat(indicator)
                   .hasFieldOrPropertyWithValue("validationStatement", Statement.of(customQuery));
@@ -95,9 +82,11 @@ void testSpannerHealthIndicatorCreatedWithQuery() {
 
   @Test
   void testSpannerHealthIndicatorNotCreated() {
-    this.contextRunner.withPropertyValues("management.health.spanner.enabled=false")
-        .run(context -> {assertThat(context).doesNotHaveBean(HealthContributor.class);
-            });
+    ApplicationContextRunner contextRunnerNew =
+        this.contextRunner.withPropertyValues("management.health.spanner.enabled=false");
+    assertThatThrownBy(
+            () -> contextRunnerNew.run(context -> context.getBean(SpannerHealthIndicator.class)))
+        .isInstanceOf(NoSuchBeanDefinitionException.class);
   }
 
   /** Spring Boot config for tests. */