Merge pull request #25451 from izeye

* pr/25451:
  Upgrade copyright year of changed files
  Polish

Closes gh-25451

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/KafkaMetricsAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -76,7 +76,7 @@ public class KafkaMetricsAutoConfiguration {
 	static class KafkaStreamsMetricsConfiguration {
 
 		@Bean
-		StreamsBuilderFactoryBeanCustomizer kafkaStreamsProducerMetrics(MeterRegistry meterRegistry) {
+		StreamsBuilderFactoryBeanCustomizer kafkaStreamsMetrics(MeterRegistry meterRegistry) {
 			return (factoryBean) -> factoryBean.addListener(new KafkaStreamsMicrometerListener(meterRegistry));
 		}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ConditionalOnEnabledMetricsExportAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -50,7 +50,7 @@ class ConditionalOnEnabledMetricsExportAutoConfigurationTests {
 	}
 
 	@Test
-	void exporterCanBeGloballyDisabledWitSpecificOverride() {
+	void exporterCanBeGloballyDisabledWithSpecificOverride() {
 		this.contextRunner
 				.withPropertyValues("management.metrics.export.defaults.enabled=false",
 						"management.metrics.export.simple.enabled=true")

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/influx/InfluxDbHealthIndicatorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -42,24 +42,24 @@ class InfluxDbHealthIndicatorTests {
 	void influxDbIsUp() {
 		Pong pong = mock(Pong.class);
 		given(pong.getVersion()).willReturn("0.9");
-		InfluxDB influxDB = mock(InfluxDB.class);
-		given(influxDB.ping()).willReturn(pong);
-		InfluxDbHealthIndicator healthIndicator = new InfluxDbHealthIndicator(influxDB);
+		InfluxDB influxDb = mock(InfluxDB.class);
+		given(influxDb.ping()).willReturn(pong);
+		InfluxDbHealthIndicator healthIndicator = new InfluxDbHealthIndicator(influxDb);
 		Health health = healthIndicator.health();
 		assertThat(health.getStatus()).isEqualTo(Status.UP);
 		assertThat(health.getDetails().get("version")).isEqualTo("0.9");
-		verify(influxDB).ping();
+		verify(influxDb).ping();
 	}
 
 	@Test
 	void influxDbIsDown() {
-		InfluxDB influxDB = mock(InfluxDB.class);
-		given(influxDB.ping()).willThrow(new InfluxDBException(new IOException("Connection failed")));
-		InfluxDbHealthIndicator healthIndicator = new InfluxDbHealthIndicator(influxDB);
+		InfluxDB influxDb = mock(InfluxDB.class);
+		given(influxDb.ping()).willThrow(new InfluxDBException(new IOException("Connection failed")));
+		InfluxDbHealthIndicator healthIndicator = new InfluxDbHealthIndicator(influxDb);
 		Health health = healthIndicator.health();
 		assertThat(health.getStatus()).isEqualTo(Status.DOWN);
 		assertThat((String) health.getDetails().get("error")).contains("Connection failed");
-		verify(influxDB).ping();
+		verify(influxDb).ping();
 	}
 
 }

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/influx/InfluxDbCustomizer.java

@@ -30,8 +30,8 @@ public interface InfluxDbCustomizer {
 
 	/**
 	 * Customize the {@link InfluxDB}.
-	 * @param influxDB the influxDB instance to customize
+	 * @param influxDb the InfluxDB instance to customize
 	 */
-	void customize(InfluxDB influxDB);
+	void customize(InfluxDB influxDb);
 
 }

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/influx/InfluxDbAutoConfigurationTests.java

@@ -87,8 +87,8 @@ class InfluxDbAutoConfigurationTests {
 	}
 
 	private int getReadTimeoutProperty(AssertableApplicationContext context) {
-		InfluxDB influxDB = context.getBean(InfluxDB.class);
-		Retrofit retrofit = (Retrofit) ReflectionTestUtils.getField(influxDB, "retrofit");
+		InfluxDB influxDb = context.getBean(InfluxDB.class);
+		Retrofit retrofit = (Retrofit) ReflectionTestUtils.getField(influxDb, "retrofit");
 		OkHttpClient callFactory = (OkHttpClient) retrofit.callFactory();
 		return callFactory.readTimeoutMillis();
 	}

spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto.adoc

@@ -2349,7 +2349,7 @@ The sensitive portion of the URI is identified using the format `<scheme>://<use
 For example, for the property `myclient.uri=http://user1:password1@localhost:8081`, the resulting sanitized value is
 `++http://user1:******@localhost:8081++`.
 
-The defaults patterns used by the `env` and `configprops` endpoints can be replaced using configprop:management.endpoint.env.keys-to-sanitize[] and configprop:management.endpoint.configprops.keys-to-sanitize[] respectively.
+The default patterns used by the `env` and `configprops` endpoints can be replaced using configprop:management.endpoint.env.keys-to-sanitize[] and configprop:management.endpoint.configprops.keys-to-sanitize[] respectively.
 Alternatively, additional patterns can be configured using configprop:management.endpoint.env.additional-keys-to-sanitize[] and configprop:management.endpoint.configprops.additional-keys-to-sanitize[].
 
 

spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc

@@ -4929,7 +4929,7 @@ If the connection to InfluxDB requires a user and password, you can set the `spr
 InfluxDB relies on OkHttp.
 If you need to tune the http client `InfluxDB` uses behind the scenes, you can register an `InfluxDbOkHttpClientBuilderProvider` bean.
 
-If you need more control over the configuration, consider registering a `InfluxDbCustomizer` bean.
+If you need more control over the configuration, consider registering an `InfluxDbCustomizer` bean.
 
 
 
@@ -6255,7 +6255,7 @@ The thread pool uses one thread by default and its settings can be fine-tuned us
 	spring:
 	  task:
 	    scheduling:
-          thread-name-prefix: "scheduling-"
+	      thread-name-prefix: "scheduling-"
 	      pool:
 	        size: 2
 ----