Stop using ObjectProvider<List> and ObjectProvider<Collection>

Closes gh-14467

Author: wilkinsona

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/jmx/JmxEndpointAutoConfiguration.java

@@ -16,8 +16,7 @@
 
 package org.springframework.boot.actuate.autoconfigure.endpoint.jmx;
 
-import java.util.Collection;
-import java.util.Collections;
+import java.util.stream.Collectors;
 
 import javax.management.MBeanServer;
 
@@ -75,11 +74,11 @@ public JmxEndpointAutoConfiguration(ApplicationContext applicationContext,
 	@ConditionalOnMissingBean(JmxEndpointsSupplier.class)
 	public JmxEndpointDiscoverer jmxAnnotationEndpointDiscoverer(
 			ParameterValueMapper parameterValueMapper,
-			ObjectProvider<Collection<OperationInvokerAdvisor>> invokerAdvisors,
-			ObjectProvider<Collection<EndpointFilter<ExposableJmxEndpoint>>> filters) {
+			ObjectProvider<OperationInvokerAdvisor> invokerAdvisors,
+			ObjectProvider<EndpointFilter<ExposableJmxEndpoint>> filters) {
 		return new JmxEndpointDiscoverer(this.applicationContext, parameterValueMapper,
-				invokerAdvisors.getIfAvailable(Collections::emptyList),
-				filters.getIfAvailable(Collections::emptyList));
+				invokerAdvisors.orderedStream().collect(Collectors.toList()),
+				filters.orderedStream().collect(Collectors.toList()));
 	}
 
 	@Bean

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointAutoConfiguration.java

@@ -20,6 +20,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration;
@@ -95,12 +96,12 @@ public EndpointMediaTypes endpointMediaTypes() {
 	public WebEndpointDiscoverer webEndpointDiscoverer(
 			ParameterValueMapper parameterValueMapper,
 			EndpointMediaTypes endpointMediaTypes, PathMapper webEndpointPathMapper,
-			ObjectProvider<Collection<OperationInvokerAdvisor>> invokerAdvisors,
-			ObjectProvider<Collection<EndpointFilter<ExposableWebEndpoint>>> filters) {
+			ObjectProvider<OperationInvokerAdvisor> invokerAdvisors,
+			ObjectProvider<EndpointFilter<ExposableWebEndpoint>> filters) {
 		return new WebEndpointDiscoverer(this.applicationContext, parameterValueMapper,
 				endpointMediaTypes, webEndpointPathMapper,
-				invokerAdvisors.getIfAvailable(Collections::emptyList),
-				filters.getIfAvailable(Collections::emptyList));
+				invokerAdvisors.orderedStream().collect(Collectors.toList()),
+				filters.orderedStream().collect(Collectors.toList()));
 	}
 
 	@Bean
@@ -144,10 +145,10 @@ static class WebEndpointServletConfiguration {
 		@ConditionalOnMissingBean(ServletEndpointsSupplier.class)
 		public ServletEndpointDiscoverer servletEndpointDiscoverer(
 				ApplicationContext applicationContext, PathMapper webEndpointPathMapper,
-				ObjectProvider<Collection<EndpointFilter<ExposableServletEndpoint>>> filters) {
+				ObjectProvider<EndpointFilter<ExposableServletEndpoint>> filters) {
 			return new ServletEndpointDiscoverer(applicationContext,
 					webEndpointPathMapper,
-					filters.getIfAvailable(Collections::emptyList));
+					filters.orderedStream().collect(Collectors.toList()));
 		}
 
 	}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,7 @@
 
 package org.springframework.boot.actuate.autoconfigure.info;
 
-import java.util.Collections;
-import java.util.List;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
@@ -42,9 +41,9 @@ public class InfoEndpointAutoConfiguration {
 	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnEnabledEndpoint
-	public InfoEndpoint infoEndpoint(
-			ObjectProvider<List<InfoContributor>> infoContributors) {
-		return new InfoEndpoint(infoContributors.getIfAvailable(Collections::emptyList));
+	public InfoEndpoint infoEndpoint(ObjectProvider<InfoContributor> infoContributors) {
+		return new InfoEndpoint(
+				infoContributors.orderedStream().collect(Collectors.toList()));
 	}
 
 }

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthIndicatorAutoConfiguration.java

@@ -19,6 +19,7 @@
 import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import javax.sql.DataSource;
 
@@ -73,9 +74,10 @@ public class DataSourceHealthIndicatorAutoConfiguration extends
 
 	public DataSourceHealthIndicatorAutoConfiguration(
 			ObjectProvider<Map<String, DataSource>> dataSources,
-			ObjectProvider<Collection<DataSourcePoolMetadataProvider>> metadataProviders) {
+			ObjectProvider<DataSourcePoolMetadataProvider> metadataProviders) {
 		this.dataSources = filterDataSources(dataSources.getIfAvailable());
-		this.metadataProviders = metadataProviders.getIfAvailable();
+		this.metadataProviders = metadataProviders.orderedStream()
+				.collect(Collectors.toList());
 	}
 
 	private Map<String, DataSource> filterDataSources(

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/scheduling/ScheduledTasksEndpointAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,7 @@
 
 package org.springframework.boot.actuate.autoconfigure.scheduling;
 
-import java.util.Collections;
-import java.util.List;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
@@ -41,8 +40,9 @@ public class ScheduledTasksEndpointAutoConfiguration {
 	@ConditionalOnMissingBean
 	@ConditionalOnEnabledEndpoint
 	public ScheduledTasksEndpoint scheduledTasksEndpoint(
-			ObjectProvider<List<ScheduledTaskHolder>> holders) {
-		return new ScheduledTasksEndpoint(holders.getIfAvailable(Collections::emptyList));
+			ObjectProvider<ScheduledTaskHolder> holders) {
+		return new ScheduledTasksEndpoint(
+				holders.orderedStream().collect(Collectors.toList()));
 	}
 
 }

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/jersey/JerseyManagementChildContextConfiguration.java

@@ -16,8 +16,7 @@
 
 package org.springframework.boot.actuate.autoconfigure.web.jersey;
 
-import java.util.Collections;
-import java.util.List;
+import java.util.stream.Stream;
 
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.servlet.ServletContainer;
@@ -48,12 +47,11 @@
 @ConditionalOnMissingClass("org.springframework.web.servlet.DispatcherServlet")
 public class JerseyManagementChildContextConfiguration {
 
-	private final List<ResourceConfigCustomizer> resourceConfigCustomizers;
+	private final Stream<ResourceConfigCustomizer> resourceConfigCustomizers;
 
 	public JerseyManagementChildContextConfiguration(
-			ObjectProvider<List<ResourceConfigCustomizer>> resourceConfigCustomizers) {
-		this.resourceConfigCustomizers = resourceConfigCustomizers
-				.getIfAvailable(Collections::emptyList);
+			ObjectProvider<ResourceConfigCustomizer> resourceConfigCustomizers) {
+		this.resourceConfigCustomizers = resourceConfigCustomizers.orderedStream();
 	}
 
 	@Bean
@@ -65,9 +63,8 @@ public ServletRegistrationBean<ServletContainer> jerseyServletRegistration() {
 	@Bean
 	public ResourceConfig endpointResourceConfig() {
 		ResourceConfig resourceConfig = new ResourceConfig();
-		for (ResourceConfigCustomizer customizer : this.resourceConfigCustomizers) {
-			customizer.customize(resourceConfig);
-		}
+		this.resourceConfigCustomizers
+				.forEach((customizer) -> customizer.customize(resourceConfig));
 		return resourceConfig;
 	}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/mappings/MappingsEndpointAutoConfiguration.java

@@ -16,8 +16,7 @@
 
 package org.springframework.boot.actuate.autoconfigure.web.mappings;
 
-import java.util.Collection;
-import java.util.Collections;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
@@ -50,9 +49,9 @@ public class MappingsEndpointAutoConfiguration {
 	@Bean
 	@ConditionalOnEnabledEndpoint
 	public MappingsEndpoint mappingsEndpoint(ApplicationContext applicationContext,
-			ObjectProvider<Collection<MappingDescriptionProvider>> descriptionProviders) {
+			ObjectProvider<MappingDescriptionProvider> descriptionProviders) {
 		return new MappingsEndpoint(
-				descriptionProviders.getIfAvailable(Collections::emptyList),
+				descriptionProviders.orderedStream().collect(Collectors.toList()),
 				applicationContext);
 	}
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/admin/SpringApplicationAdminJmxAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
 
 package org.springframework.boot.autoconfigure.admin;
 
-import java.util.List;
-
 import javax.management.MalformedObjectNameException;
 
 import org.springframework.beans.factory.ObjectProvider;
@@ -57,13 +55,13 @@ public class SpringApplicationAdminJmxAutoConfiguration {
 	 */
 	private static final String DEFAULT_JMX_NAME = "org.springframework.boot:type=Admin,name=SpringApplication";
 
-	private final List<MBeanExporter> mbeanExporters;
+	private final Iterable<MBeanExporter> mbeanExporters;
 
 	private final Environment environment;
 
 	public SpringApplicationAdminJmxAutoConfiguration(
-			ObjectProvider<List<MBeanExporter>> mbeanExporters, Environment environment) {
-		this.mbeanExporters = mbeanExporters.getIfAvailable();
+			ObjectProvider<MBeanExporter> mbeanExporters, Environment environment) {
+		this.mbeanExporters = mbeanExporters;
 		this.environment = environment;
 	}
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAnnotationDrivenConfiguration.java

@@ -16,7 +16,7 @@
 
 package org.springframework.boot.autoconfigure.amqp;
 
-import java.util.List;
+import java.util.stream.Collectors;
 
 import org.springframework.amqp.rabbit.annotation.EnableRabbit;
 import org.springframework.amqp.rabbit.config.DirectRabbitListenerContainerFactory;
@@ -47,13 +47,13 @@ class RabbitAnnotationDrivenConfiguration {
 
 	private final ObjectProvider<MessageRecoverer> messageRecoverer;
 
-	private final ObjectProvider<List<RabbitRetryTemplateCustomizer>> retryTemplateCustomizers;
+	private final ObjectProvider<RabbitRetryTemplateCustomizer> retryTemplateCustomizers;
 
 	private final RabbitProperties properties;
 
 	RabbitAnnotationDrivenConfiguration(ObjectProvider<MessageConverter> messageConverter,
 			ObjectProvider<MessageRecoverer> messageRecoverer,
-			ObjectProvider<List<RabbitRetryTemplateCustomizer>> retryTemplateCustomizers,
+			ObjectProvider<RabbitRetryTemplateCustomizer> retryTemplateCustomizers,
 			RabbitProperties properties) {
 		this.messageConverter = messageConverter;
 		this.messageRecoverer = messageRecoverer;
@@ -67,8 +67,8 @@ public SimpleRabbitListenerContainerFactoryConfigurer simpleRabbitListenerContai
 		SimpleRabbitListenerContainerFactoryConfigurer configurer = new SimpleRabbitListenerContainerFactoryConfigurer();
 		configurer.setMessageConverter(this.messageConverter.getIfUnique());
 		configurer.setMessageRecoverer(this.messageRecoverer.getIfUnique());
-		configurer.setRetryTemplateCustomizers(
-				this.retryTemplateCustomizers.getIfAvailable());
+		configurer.setRetryTemplateCustomizers(this.retryTemplateCustomizers
+				.orderedStream().collect(Collectors.toList()));
 		configurer.setRabbitProperties(this.properties);
 		return configurer;
 	}
@@ -90,8 +90,8 @@ public DirectRabbitListenerContainerFactoryConfigurer directRabbitListenerContai
 		DirectRabbitListenerContainerFactoryConfigurer configurer = new DirectRabbitListenerContainerFactoryConfigurer();
 		configurer.setMessageConverter(this.messageConverter.getIfUnique());
 		configurer.setMessageRecoverer(this.messageRecoverer.getIfUnique());
-		configurer.setRetryTemplateCustomizers(
-				this.retryTemplateCustomizers.getIfAvailable());
+		configurer.setRetryTemplateCustomizers(this.retryTemplateCustomizers
+				.orderedStream().collect(Collectors.toList()));
 		configurer.setRabbitProperties(this.properties);
 		return configurer;
 	}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java

@@ -17,7 +17,7 @@
 package org.springframework.boot.autoconfigure.amqp;
 
 import java.time.Duration;
-import java.util.List;
+import java.util.stream.Collectors;
 
 import com.rabbitmq.client.Channel;
 
@@ -161,11 +161,11 @@ protected static class RabbitTemplateConfiguration {
 
 		private final ObjectProvider<MessageConverter> messageConverter;
 
-		private final ObjectProvider<List<RabbitRetryTemplateCustomizer>> retryTemplateCustomizers;
+		private final ObjectProvider<RabbitRetryTemplateCustomizer> retryTemplateCustomizers;
 
 		public RabbitTemplateConfiguration(RabbitProperties properties,
 				ObjectProvider<MessageConverter> messageConverter,
-				ObjectProvider<List<RabbitRetryTemplateCustomizer>> retryTemplateCustomizers) {
+				ObjectProvider<RabbitRetryTemplateCustomizer> retryTemplateCustomizers) {
 			this.properties = properties;
 			this.messageConverter = messageConverter;
 			this.retryTemplateCustomizers = retryTemplateCustomizers;
@@ -185,8 +185,9 @@ public RabbitTemplate rabbitTemplate(ConnectionFactory connectionFactory) {
 			RabbitProperties.Template properties = this.properties.getTemplate();
 			if (properties.getRetry().isEnabled()) {
 				template.setRetryTemplate(new RetryTemplateFactory(
-						this.retryTemplateCustomizers.getIfAvailable())
-								.createRetryTemplate(properties.getRetry(),
+						this.retryTemplateCustomizers.orderedStream()
+								.collect(Collectors.toList())).createRetryTemplate(
+										properties.getRetry(),
 										RabbitRetryTemplateCustomizer.Target.SENDER));
 			}
 			map.from(properties::getReceiveTimeout).whenNonNull().as(Duration::toMillis)

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfiguration.java

@@ -16,7 +16,7 @@
 
 package org.springframework.boot.autoconfigure.cache;
 
-import java.util.List;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.ObjectProvider;
@@ -67,8 +67,9 @@ public class CacheAutoConfiguration {
 	@Bean
 	@ConditionalOnMissingBean
 	public CacheManagerCustomizers cacheManagerCustomizers(
-			ObjectProvider<List<CacheManagerCustomizer<?>>> customizers) {
-		return new CacheManagerCustomizers(customizers.getIfAvailable());
+			ObjectProvider<CacheManagerCustomizer<?>> customizers) {
+		return new CacheManagerCustomizers(
+				customizers.orderedStream().collect(Collectors.toList()));
 	}
 
 	@Bean