Merge pull request #50799 from xfocus3

* gh-50791-grpc-health-overall:
  Polish "Honor gRPC overall health setting"
  Honor gRPC overall health setting

Closes gh-50799

module/spring-boot-grpc-server/src/main/java/org/springframework/boot/grpc/server/autoconfigure/health/AutoConfiguredHealthCheckedGrpcComponents.java

@@ -51,7 +51,7 @@ import org.springframework.util.ObjectUtils;
  */
 class AutoConfiguredHealthCheckedGrpcComponents implements HealthCheckedGrpcComponents {
 
-	private final HealthCheckedGrpcComponent server;
+	private final @Nullable HealthCheckedGrpcComponent server;
 
 	private final Map<String, HealthCheckedGrpcComponent> services;
 
@@ -68,8 +68,8 @@ class AutoConfiguredHealthCheckedGrpcComponents implements HealthCheckedGrpcComp
 				() -> StatusAggregator.of(properties.getStatus().getOrder()));
 		StatusMapper statusMapper = getNonQualifiedBean(beanFactory, StatusMapper.class,
 				() -> StatusMapper.of(properties.getStatus().getMapping()));
-		this.server = new AutoConfiguredHealthCheckedGrpcComponent(HealthContributorMembership.always(),
-				statusAggregator, statusMapper);
+		this.server = (properties.isIncludeOverallHealth()) ? new AutoConfiguredHealthCheckedGrpcComponent(
+				HealthContributorMembership.always(), statusAggregator, statusMapper) : null;
 		this.services = createServices(properties.getService(), beanFactory, statusAggregator, statusMapper);
 	}
 

module/spring-boot-grpc-server/src/test/java/org/springframework/boot/grpc/server/autoconfigure/health/AutoConfiguredHealthCheckedGrpcComponentsTests.java

@@ -59,6 +59,15 @@ class AutoConfiguredHealthCheckedGrpcComponentsTests {
 		});
 	}
 
+	@Test
+	void getServerWhenIncludeOverallHealthIsFalseReturnsNull() {
+		this.contextRunner.withPropertyValues("spring.grpc.server.health.include-overall-health=false")
+			.run((context) -> {
+				HealthCheckedGrpcComponents components = context.getBean(HealthCheckedGrpcComponents.class);
+				assertThat(components.getServer()).isNull();
+			});
+	}
+
 	@Test
 	void getServiceNamesReturnsServiceNames() {
 		this.contextRunner

module/spring-boot-grpc-server/src/test/java/org/springframework/boot/grpc/server/autoconfigure/health/GrpcServerHealthAutoConfigurationTests.java

@@ -302,6 +302,17 @@ class GrpcServerHealthAutoConfigurationTests {
 		});
 	}
 
+	@Test
+	void whenIncludeOverallHealthIsFalseDoesNotReportOverallHealth() {
+		this.contextRunner.withPropertyValues("spring.grpc.server.health.include-overall-health=false")
+			.run((context) -> {
+				GrpcServerHealth serverHealth = context.getBean(GrpcServerHealth.class);
+				Map<String, ServingStatus> result = new LinkedHashMap<>();
+				serverHealth.update(result::put);
+				assertThat(result).isEmpty();
+			});
+	}
+
 	@Test
 	void whenHasGrpcServerHealthBeanDoesNotCreateAdditional() {
 		this.contextRunner.withUserConfiguration(GrpcServerHealthConfiguration.class).run((context) -> {