Fix compiler warnings and polish

Fix various compiler warnings and apply a little polish.

Author: philwebb

Diff for: spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticSearchClientHealthIndicatorAutoConfiguration.java

@@ -43,6 +43,8 @@
  *
  * @author Stephane Nicoll
  * @since 2.1.0
+ * @deprecated since 2.2.0 as {@literal org.elasticsearch.client:transport} has been
+ * deprecated upstream
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(Client.class)
@@ -51,6 +53,7 @@
 @AutoConfigureBefore(HealthIndicatorAutoConfiguration.class)
 @AutoConfigureAfter(ElasticsearchAutoConfiguration.class)
 @EnableConfigurationProperties(ElasticsearchHealthIndicatorProperties.class)
+@Deprecated
 public class ElasticSearchClientHealthIndicatorAutoConfiguration extends
 		CompositeHealthIndicatorConfiguration<ElasticsearchHealthIndicator, Client> {
 

Diff for: spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticSearchJestHealthIndicatorAutoConfiguration.java

@@ -50,6 +50,7 @@
 @AutoConfigureBefore(HealthIndicatorAutoConfiguration.class)
 @AutoConfigureAfter({ JestAutoConfiguration.class,
 		ElasticSearchClientHealthIndicatorAutoConfiguration.class })
+@Deprecated
 public class ElasticSearchJestHealthIndicatorAutoConfiguration extends
 		CompositeHealthIndicatorConfiguration<ElasticsearchJestHealthIndicator, JestClient> {
 

Diff for: spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticSearchRestHealthIndicatorAutoConfiguration.java

@@ -50,6 +50,7 @@
 @AutoConfigureBefore(HealthIndicatorAutoConfiguration.class)
 @AutoConfigureAfter({ RestClientAutoConfiguration.class,
 		ElasticSearchClientHealthIndicatorAutoConfiguration.class })
+@SuppressWarnings("deprecation")
 public class ElasticSearchRestHealthIndicatorAutoConfiguration extends
 		CompositeHealthIndicatorConfiguration<ElasticsearchRestHealthIndicator, RestClient> {
 

Diff for: spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticsearchHealthIndicatorProperties.java

@@ -22,16 +22,20 @@
 
 import org.springframework.boot.actuate.elasticsearch.ElasticsearchHealthIndicator;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
 
 /**
  * External configuration properties for {@link ElasticsearchHealthIndicator}.
  *
  * @author Binwei Yang
  * @author Andy Wilkinson
  * @since 2.0.0
+ * @deprecated since 2.2.0 as {@literal org.elasticsearch.client:transport} has been
+ * deprecated upstream
  */
 @ConfigurationProperties(prefix = "management.health.elasticsearch",
 		ignoreUnknownFields = false)
+@Deprecated
 public class ElasticsearchHealthIndicatorProperties {
 
 	/**
@@ -44,6 +48,8 @@ public class ElasticsearchHealthIndicatorProperties {
 	 */
 	private Duration responseTimeout = Duration.ofMillis(100);
 
+	@DeprecatedConfigurationProperty(
+			reason = "Upstream elasticsearch transport is deprected")
 	public List<String> getIndices() {
 		return this.indices;
 	}
@@ -52,6 +58,8 @@ public void setIndices(List<String> indices) {
 		this.indices = indices;
 	}
 
+	@DeprecatedConfigurationProperty(
+			reason = "Upstream elasticsearch transport is deprected")
 	public Duration getResponseTimeout() {
 		return this.responseTimeout;
 	}

Diff for: spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticsearchHealthIndicatorAutoConfigurationTests.java

@@ -36,6 +36,7 @@
  *
  * @author Phillip Webb
  */
+@Deprecated
 public class ElasticsearchHealthIndicatorAutoConfigurationTests {
 
 	private ApplicationContextRunner contextRunner = new ApplicationContextRunner()

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -25,7 +25,6 @@
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration;
 import org.springframework.boot.autoconfigure.data.cassandra.CassandraDataAutoConfiguration;
-import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchAutoConfiguration;
 import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration;
 import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration;
 import org.springframework.boot.autoconfigure.data.mongo.MongoReactiveDataAutoConfiguration;
@@ -35,7 +34,6 @@
 import org.springframework.boot.autoconfigure.data.redis.RedisRepositoriesAutoConfiguration;
 import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
 import org.springframework.boot.autoconfigure.data.solr.SolrRepositoriesAutoConfiguration;
-import org.springframework.boot.autoconfigure.elasticsearch.jest.JestAutoConfiguration;
 import org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration;
 import org.springframework.boot.autoconfigure.hazelcast.HazelcastAutoConfiguration;
 import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
@@ -86,12 +84,14 @@ private ReactiveWebApplicationContextRunner reactiveWebRunner() {
 			MongoDataAutoConfiguration.class, MongoReactiveAutoConfiguration.class,
 			MongoReactiveDataAutoConfiguration.class,
 			RepositoryRestMvcAutoConfiguration.class, HazelcastAutoConfiguration.class,
-			ElasticsearchAutoConfiguration.class,
-			ElasticsearchDataAutoConfiguration.class, JestAutoConfiguration.class,
+			org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchAutoConfiguration.class,
+			ElasticsearchDataAutoConfiguration.class,
+			org.springframework.boot.autoconfigure.elasticsearch.jest.JestAutoConfiguration.class,
 			SolrRepositoriesAutoConfiguration.class, SolrAutoConfiguration.class,
 			RedisAutoConfiguration.class, RedisRepositoriesAutoConfiguration.class,
 			MetricsAutoConfiguration.class })
 	@SpringBootConfiguration
+	@SuppressWarnings("deprecation")
 	public static class WebEndpointTestApplication {
 
 	}

Diff for: spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MeterRegistryConfigurerIntegrationTests.java

@@ -84,7 +84,6 @@ public void counterIsIncrementedOncePerEventWithoutCompositeMeterRegistry() {
 					Logger logger = ((LoggerContext) StaticLoggerBinder.getSingleton()
 							.getLoggerFactory()).getLogger("test-logger");
 					logger.error("Error.");
-
 					Map<String, MeterRegistry> registriesByName = context
 							.getBeansOfType(MeterRegistry.class);
 					assertThat(registriesByName).hasSize(1);

Diff for: spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/elasticsearch/ElasticsearchHealthIndicator.java

@@ -35,7 +35,8 @@
  * @author Binwei Yang
  * @author Andy Wilkinson
  * @since 2.0.0
- * @deprecated the transport client support is deprecated in favor of other clients
+ * @deprecated since 2.2.0 as {@literal org.elasticsearch.client:transport} has been
+ * deprecated upstream
  */
 @Deprecated
 public class ElasticsearchHealthIndicator extends AbstractHealthIndicator {

Diff for: spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/elasticsearch/ElasticsearchHealthIndicatorTests.java

@@ -49,6 +49,7 @@
  *
  * @author Andy Wilkinson
  */
+@Deprecated
 public class ElasticsearchHealthIndicatorTests {
 
 	@Mock

Diff for: spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/BaseConfiguration.java

@@ -20,14 +20,14 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
 import org.springframework.boot.actuate.endpoint.invoke.ParameterValueMapper;
 import org.springframework.boot.actuate.endpoint.invoke.convert.ConversionServiceParameterValueMapper;
 import org.springframework.boot.actuate.endpoint.web.EndpointMediaTypes;
 import org.springframework.boot.web.embedded.tomcat.TomcatEmbeddedWebappClassLoader;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.core.convert.support.DefaultConversionService;
 
 import static org.mockito.Mockito.mock;
@@ -73,8 +73,8 @@ public WebEndpointDiscoverer webEndpointDiscoverer(
 	}
 
 	@Bean
-	public PropertyPlaceholderConfigurer propertyPlaceholderConfigurer() {
-		return new PropertyPlaceholderConfigurer();
+	public PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() {
+		return new PropertySourcesPlaceholderConfigurer();
 	}
 
 }

Diff for: spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/AbstractRepositoryConfigurationSourceSupport.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -22,6 +22,7 @@
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.beans.factory.support.BeanNameGenerator;
 import org.springframework.boot.autoconfigure.AutoConfigurationPackages;
 import org.springframework.context.EnvironmentAware;
 import org.springframework.context.ResourceLoaderAware;
@@ -45,7 +46,7 @@
  * @author Oliver Gierke
  */
 public abstract class AbstractRepositoryConfigurationSourceSupport
-		implements BeanFactoryAware, ImportBeanDefinitionRegistrar, ResourceLoaderAware,
+		implements ImportBeanDefinitionRegistrar, BeanFactoryAware, ResourceLoaderAware,
 		EnvironmentAware {
 
 	private ResourceLoader resourceLoader;
@@ -56,30 +57,20 @@ public abstract class AbstractRepositoryConfigurationSourceSupport
 
 	@Override
 	public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata,
-			BeanDefinitionRegistry registry) {
-		new RepositoryConfigurationDelegate(getConfigurationSource(registry),
-				this.resourceLoader, this.environment).registerRepositoriesIn(registry,
-						getRepositoryConfigurationExtension());
+			BeanDefinitionRegistry registry, BeanNameGenerator importBeanNameGenerator) {
+		RepositoryConfigurationDelegate delegate = new RepositoryConfigurationDelegate(
+				getConfigurationSource(registry, importBeanNameGenerator),
+				this.resourceLoader, this.environment);
+		delegate.registerRepositoriesIn(registry, getRepositoryConfigurationExtension());
 	}
 
 	private AnnotationRepositoryConfigurationSource getConfigurationSource(
-			BeanDefinitionRegistry beanDefinitionRegistry) {
+			BeanDefinitionRegistry registry, BeanNameGenerator importBeanNameGenerator) {
 		StandardAnnotationMetadata metadata = new StandardAnnotationMetadata(
 				getConfiguration(), true);
-		return new AnnotationRepositoryConfigurationSource(metadata, getAnnotation(),
-				this.resourceLoader, this.environment, beanDefinitionRegistry) {
-			@Override
-			public Streamable<String> getBasePackages() {
-				return AbstractRepositoryConfigurationSourceSupport.this
-						.getBasePackages();
-			}
-
-			@Override
-			public BootstrapMode getBootstrapMode() {
-				return AbstractRepositoryConfigurationSourceSupport.this
-						.getBootstrapMode();
-			}
-
+		return new AutoConfiguredAnnotationRepositoryConfigurationSource(metadata,
+				getAnnotation(), this.resourceLoader, this.environment, registry,
+				importBeanNameGenerator) {
 		};
 	}
 
@@ -129,4 +120,29 @@ public void setEnvironment(Environment environment) {
 		this.environment = environment;
 	}
 
+	/**
+	 * An auto-configured {@link AnnotationRepositoryConfigurationSource}.
+	 */
+	private class AutoConfiguredAnnotationRepositoryConfigurationSource
+			extends AnnotationRepositoryConfigurationSource {
+
+		AutoConfiguredAnnotationRepositoryConfigurationSource(AnnotationMetadata metadata,
+				Class<? extends Annotation> annotation, ResourceLoader resourceLoader,
+				Environment environment, BeanDefinitionRegistry registry,
+				BeanNameGenerator generator) {
+			super(metadata, annotation, resourceLoader, environment, registry, generator);
+		}
+
+		@Override
+		public Streamable<String> getBasePackages() {
+			return AbstractRepositoryConfigurationSourceSupport.this.getBasePackages();
+		}
+
+		@Override
+		public BootstrapMode getBootstrapMode() {
+			return AbstractRepositoryConfigurationSourceSupport.this.getBootstrapMode();
+		}
+
+	}
+
 }

Diff for: spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveRepositoriesAutoConfiguration.java

@@ -42,7 +42,7 @@
 @ConditionalOnClass({ ReactiveSession.class, ReactiveCassandraRepository.class })
 @ConditionalOnRepositoryType(store = "cassandra", type = RepositoryType.REACTIVE)
 @ConditionalOnMissingBean(ReactiveCassandraRepositoryFactoryBean.class)
-@Import(CassandraReactiveRepositoriesAutoConfigureRegistrar.class)
+@Import(CassandraReactiveRepositoriesRegistrar.class)
 @AutoConfigureAfter(CassandraReactiveDataAutoConfiguration.class)
 public class CassandraReactiveRepositoriesAutoConfiguration {
 

Diff for: spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveRepositoriesAutoConfigureRegistrar.java renamed to spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveRepositoriesRegistrar.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -31,7 +31,7 @@
  * @author Eddú Meléndez
  * @since 2.0.0
  */
-class CassandraReactiveRepositoriesAutoConfigureRegistrar
+class CassandraReactiveRepositoriesRegistrar
 		extends AbstractRepositoryConfigurationSourceSupport {
 
 	@Override

Diff for: spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraRepositoriesAutoConfiguration.java

@@ -41,7 +41,7 @@
 @ConditionalOnClass({ Session.class, CassandraRepository.class })
 @ConditionalOnRepositoryType(store = "cassandra", type = RepositoryType.IMPERATIVE)
 @ConditionalOnMissingBean(CassandraRepositoryFactoryBean.class)
-@Import(CassandraRepositoriesAutoConfigureRegistrar.class)
+@Import(CassandraRepositoriesRegistrar.class)
 public class CassandraRepositoriesAutoConfiguration {
 
 }

Diff for: spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraRepositoriesAutoConfigureRegistrar.java renamed to spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraRepositoriesRegistrar.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -31,7 +31,7 @@
  * @author Eddú Meléndez
  * @since 1.3.0
  */
-class CassandraRepositoriesAutoConfigureRegistrar
+class CassandraRepositoriesRegistrar
 		extends AbstractRepositoryConfigurationSourceSupport {
 
 	@Override

Diff for: spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfiguration.java

@@ -46,6 +46,7 @@
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnClass({ Client.class, ElasticsearchTemplate.class })
 @AutoConfigureAfter(ElasticsearchAutoConfiguration.class)
+@SuppressWarnings("deprecation")
 public class ElasticsearchDataAutoConfiguration {
 
 	@Bean

Diff for: spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfiguration.java

@@ -54,7 +54,7 @@ public class JdbcRepositoriesAutoConfiguration {
 
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnMissingBean(JdbcRepositoryConfigExtension.class)
-	@Import(JdbcRepositoriesAutoConfigureRegistrar.class)
+	@Import(JdbcRepositoriesRegistrar.class)
 	static class JdbcRepositoriesConfiguration {
 
 	}

Diff for: spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfigureRegistrar.java renamed to spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesRegistrar.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -30,7 +30,7 @@
  *
  * @author Andy Wilkinson
  */
-class JdbcRepositoriesAutoConfigureRegistrar
+class JdbcRepositoriesRegistrar
 		extends AbstractRepositoryConfigurationSourceSupport {
 
 	@Override

Diff for: spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfiguration.java

@@ -66,7 +66,7 @@
 		JpaRepositoryConfigExtension.class })
 @ConditionalOnProperty(prefix = "spring.data.jpa.repositories", name = "enabled",
 		havingValue = "true", matchIfMissing = true)
-@Import(JpaRepositoriesAutoConfigureRegistrar.class)
+@Import(JpaRepositoriesRegistrar.class)
 @AutoConfigureAfter({ HibernateJpaAutoConfiguration.class,
 		TaskExecutionAutoConfiguration.class })
 public class JpaRepositoriesAutoConfiguration {

Diff for: spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfigureRegistrar.java renamed to spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesRegistrar.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -35,7 +35,7 @@
  * @author Phillip Webb
  * @author Dave Syer
  */
-class JpaRepositoriesAutoConfigureRegistrar
+class JpaRepositoriesRegistrar
 		extends AbstractRepositoryConfigurationSourceSupport {
 
 	private BootstrapMode bootstrapMode = null;

Diff for: spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveRepositoriesAutoConfiguration.java

@@ -53,7 +53,7 @@
 @ConditionalOnMissingBean({ ReactiveMongoRepositoryFactoryBean.class,
 		ReactiveMongoRepositoryConfigurationExtension.class })
 @ConditionalOnRepositoryType(store = "mongodb", type = RepositoryType.REACTIVE)
-@Import(MongoReactiveRepositoriesAutoConfigureRegistrar.class)
+@Import(MongoReactiveRepositoriesRegistrar.class)
 @AutoConfigureAfter(MongoReactiveDataAutoConfiguration.class)
 public class MongoReactiveRepositoriesAutoConfiguration {
 

Diff for: spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveRepositoriesAutoConfigureRegistrar.java renamed to spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveRepositoriesRegistrar.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -31,7 +31,7 @@
  * @author Mark Paluch
  * @since 2.0.0
  */
-class MongoReactiveRepositoriesAutoConfigureRegistrar
+class MongoReactiveRepositoriesRegistrar
 		extends AbstractRepositoryConfigurationSourceSupport {
 
 	@Override