Polish "Make auto-config of RestTemplate metrics back off with no builder bean"

Closes gh-15842

Author: wilkinsona

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/HttpClientMetricsAutoConfiguration.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.
@@ -39,6 +39,7 @@
  * @author Jon Schneider
  * @author Phillip Webb
  * @author Stephane Nicoll
+ * @author Raheela Aslam
  * @since 2.1.0
  */
 @Configuration

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/RestTemplateMetricsConfiguration.java

@@ -35,7 +35,7 @@
  *
  * @author Jon Schneider
  * @author Phillip Webb
- * @author raheela.aslam
+ * @author Raheela Aslam
  */
 @Configuration
 @ConditionalOnClass(RestTemplate.class)

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/RestTemplateMetricsConfigurationTests.java

@@ -42,7 +42,7 @@
  *
  * @author Stephane Nicoll
  * @author Jon Schneider
- * @author raheela.aslam
+ * @author Raheela Aslam
  */
 public class RestTemplateMetricsConfigurationTests {
 
@@ -100,6 +100,16 @@ public void shouldNotDenyNorLogIfMaxUrisIsNotReached() {
 				});
 	}
 
+	@Test
+	public void backsOffWhenRestTemplateBuilderIsMissing() {
+		new ApplicationContextRunner().with(MetricsRun.simple())
+				.withConfiguration(
+						AutoConfigurations.of(HttpClientMetricsAutoConfiguration.class))
+				.run((context) -> assertThat(context)
+						.doesNotHaveBean(DefaultRestTemplateExchangeTagsProvider.class)
+						.doesNotHaveBean(MetricsRestTemplateCustomizer.class));
+	}
+
 	private MeterRegistry getInitializedMeterRegistry(
 			AssertableApplicationContext context) {
 		MeterRegistry registry = context.getBean(MeterRegistry.class);
@@ -133,14 +143,4 @@ private RestTemplate mockRestTemplate(RestTemplateBuilder builder) {
 		return restTemplate;
 	}
 
-	@Test
-	public void backsOffWhenRestTemplateBuilderIsMissing() {
-		new ApplicationContextRunner().with(MetricsRun.simple())
-				.withConfiguration(
-						AutoConfigurations.of(HttpClientMetricsAutoConfiguration.class))
-				.run((context) -> assertThat(context)
-						.doesNotHaveBean(DefaultRestTemplateExchangeTagsProvider.class)
-						.doesNotHaveBean(MetricsRestTemplateCustomizer.class));
-	}
-
 }