Inject InfoContributors instead of exposing them on InfoEndpoint

Closes gh-13586

Author: mbhave

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfiguration.java

@@ -24,6 +24,7 @@
 import java.util.stream.Collectors;
 
 import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.boot.actuate.autoconfigure.cloudfoundry.CloudFoundryWebEndpointDiscoverer;
 import org.springframework.boot.actuate.autoconfigure.cloudfoundry.servlet.CloudFoundryInfoEndpointWebExtension;
@@ -99,9 +100,8 @@ public CloudFoundryReactiveHealthEndpointWebExtension cloudFoundryReactiveHealth
 	@ConditionalOnExposedEndpoint
 	@ConditionalOnBean({ InfoEndpoint.class, GitProperties.class })
 	public CloudFoundryInfoEndpointWebExtension cloudFoundryInfoEndpointWebExtension(
-			InfoEndpoint infoEndpoint, GitProperties properties) {
-		List<InfoContributor> existingContributors = infoEndpoint.getInfoContributors();
-		List<InfoContributor> contributors = existingContributors.stream()
+			GitProperties properties, ObjectProvider<InfoContributor> infoContributors) {
+		List<InfoContributor> contributors = infoContributors.orderedStream()
 				.map((infoContributor) -> {
 					if (infoContributor instanceof GitInfoContributor) {
 						return new GitInfoContributor(properties,

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfiguration.java

@@ -23,6 +23,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.actuate.autoconfigure.cloudfoundry.CloudFoundryWebEndpointDiscoverer;
 import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
 import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnExposedEndpoint;
@@ -100,9 +101,8 @@ public CloudFoundryHealthEndpointWebExtension cloudFoundryHealthEndpointWebExten
 	@ConditionalOnExposedEndpoint
 	@ConditionalOnBean({ InfoEndpoint.class, GitProperties.class })
 	public CloudFoundryInfoEndpointWebExtension cloudFoundryInfoEndpointWebExtension(
-			InfoEndpoint infoEndpoint, GitProperties properties) {
-		List<InfoContributor> existingContributors = infoEndpoint.getInfoContributors();
-		List<InfoContributor> contributors = existingContributors.stream()
+			GitProperties properties, ObjectProvider<InfoContributor> infoContributors) {
+		List<InfoContributor> contributors = infoContributors.orderedStream()
 				.map((infoContributor) -> {
 					if (infoContributor instanceof GitInfoContributor) {
 						return new GitInfoContributor(properties,

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/info/InfoEndpoint.java

@@ -55,8 +55,4 @@ public Map<String, Object> info() {
 		return build.getDetails();
 	}
 
-	public List<InfoContributor> getInfoContributors() {
-		return this.infoContributors;
-	}
-
 }