Merge pull request #15695 from izeye

* pr/15695:
  Polish contribution
  Polish

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/RestTemplateMetricsConfiguration.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.
@@ -46,15 +46,16 @@ class RestTemplateMetricsConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean(RestTemplateExchangeTagsProvider.class)
-	public DefaultRestTemplateExchangeTagsProvider restTemplateTagConfigurer() {
+	public DefaultRestTemplateExchangeTagsProvider restTemplateExchangeTagsProvider() {
 		return new DefaultRestTemplateExchangeTagsProvider();
 	}
 
 	@Bean
 	public MetricsRestTemplateCustomizer metricsRestTemplateCustomizer(
 			MeterRegistry meterRegistry,
-			RestTemplateExchangeTagsProvider restTemplateTagConfigurer) {
-		return new MetricsRestTemplateCustomizer(meterRegistry, restTemplateTagConfigurer,
+			RestTemplateExchangeTagsProvider restTemplateExchangeTagsProvider) {
+		return new MetricsRestTemplateCustomizer(meterRegistry,
+				restTemplateExchangeTagsProvider,
 				this.properties.getWeb().getClient().getRequestsMetricName());
 	}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/RestTemplateMetricsConfigurationTests.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.
@@ -80,8 +80,7 @@ public class RestTemplateMetricsConfigurationTests {
 					MeterRegistry registry = getInitializedMeterRegistry(context);
 					assertThat(registry.get("http.client.requests").meters()).hasSize(2);
 					assertThat(this.output.toString()).contains(
-							"Reached the maximum number of URI tags for 'http.client.requests'.");
-					assertThat(this.output.toString())
+							"Reached the maximum number of URI tags for 'http.client.requests'.")
 							.contains("Are you using 'uriVariables'?");
 				});
 	}
@@ -94,8 +93,7 @@ public class RestTemplateMetricsConfigurationTests {
 					MeterRegistry registry = getInitializedMeterRegistry(context);
 					assertThat(registry.get("http.client.requests").meters()).hasSize(3);
 					assertThat(this.output.toString()).doesNotContain(
-							"Reached the maximum number of URI tags for 'http.client.requests'.");
-					assertThat(this.output.toString())
+							"Reached the maximum number of URI tags for 'http.client.requests'.")
 							.doesNotContain("Are you using 'uriVariables'?");
 				});
 	}

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/WebClientMetricsConfigurationTests.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.
@@ -83,8 +83,7 @@ public class WebClientMetricsConfigurationTests {
 					MeterRegistry registry = getInitializedMeterRegistry(context);
 					assertThat(registry.get("http.client.requests").meters()).hasSize(2);
 					assertThat(this.output.toString()).contains(
-							"Reached the maximum number of URI tags for 'http.client.requests'.");
-					assertThat(this.output.toString())
+							"Reached the maximum number of URI tags for 'http.client.requests'.")
 							.contains("Are you using 'uriVariables'?");
 				});
 	}
@@ -97,8 +96,7 @@ public class WebClientMetricsConfigurationTests {
 					MeterRegistry registry = getInitializedMeterRegistry(context);
 					assertThat(registry.get("http.client.requests").meters()).hasSize(3);
 					assertThat(this.output.toString()).doesNotContain(
-							"Reached the maximum number of URI tags for 'http.client.requests'.");
-					assertThat(this.output.toString())
+							"Reached the maximum number of URI tags for 'http.client.requests'.")
 							.doesNotContain("Are you using 'uriVariables'?");
 				});
 	}

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/EndpointId.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.
@@ -38,7 +38,7 @@ public final class EndpointId {
 
 	private static final Log logger = LogFactory.getLog(EndpointId.class);
 
-	private static Set<String> loggedWarnings = new HashSet<>();
+	private static final Set<String> loggedWarnings = new HashSet<>();
 
 	private static final Pattern VALID_PATTERN = Pattern.compile("[a-zA-Z0-9\\.\\-]+");
 

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/elasticsearch/ElasticsearchJestHealthIndicatorTests.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.
@@ -138,8 +138,8 @@ public class ElasticsearchJestHealthIndicatorTests {
 					status);
 		}
 		else {
-			json = "{\n" + "  \"error\": \"Server Error\",\n" + "  \"status\": "
-					+ responseCode + "\n" + "}";
+			json = "{\n" + "  \"error\": \"Server Error\",\n" + "  \"status\": \""
+					+ status + "\"\n" + "}";
 		}
 		searchResult.setJsonString(json);
 		searchResult.setJsonObject(new JsonParser().parse(json).getAsJsonObject());

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/HttpMessageConverters.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.
@@ -72,7 +72,7 @@ public class HttpMessageConverters implements Iterable<HttpMessageConverter<?>>
 	 * converters.
 	 * @param additionalConverters additional converters to be added. Items are added just
 	 * before any default converter of the same type (or at the front of the list if no
-	 * default converter is found) The {@link #postProcessConverters(List)} method can be
+	 * default converter is found). The {@link #postProcessConverters(List)} method can be
 	 * used for further converter manipulation.
 	 */
 	public HttpMessageConverters(HttpMessageConverter<?>... additionalConverters) {
@@ -84,7 +84,7 @@ public class HttpMessageConverters implements Iterable<HttpMessageConverter<?>>
 	 * converters.
 	 * @param additionalConverters additional converters to be added. Items are added just
 	 * before any default converter of the same type (or at the front of the list if no
-	 * default converter is found) The {@link #postProcessConverters(List)} method can be
+	 * default converter is found). The {@link #postProcessConverters(List)} method can be
 	 * used for further converter manipulation.
 	 */
 	public HttpMessageConverters(
@@ -97,7 +97,7 @@ public class HttpMessageConverters implements Iterable<HttpMessageConverter<?>>
 	 * @param addDefaultConverters if default converters should be added
 	 * @param converters converters to be added. Items are added just before any default
 	 * converter of the same type (or at the front of the list if no default converter is
-	 * found) The {@link #postProcessConverters(List)} method can be used for further
+	 * found). The {@link #postProcessConverters(List)} method can be used for further
 	 * converter manipulation.
 	 */
 	public HttpMessageConverters(boolean addDefaultConverters,

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfigurationTests.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.
@@ -46,8 +46,7 @@ public class LdapAutoConfigurationTests {
 	public void contextSourceWithDefaultUrl() {
 		this.contextRunner.run((context) -> {
 			LdapContextSource contextSource = context.getBean(LdapContextSource.class);
-			String[] urls = getUrls(contextSource);
-			assertThat(urls).containsExactly("ldap://localhost:389");
+			assertThat(contextSource.getUrls()).containsExactly("ldap://localhost:389");
 			assertThat(contextSource.isAnonymousReadOnly()).isFalse();
 		});
 	}
@@ -58,8 +57,8 @@ public class LdapAutoConfigurationTests {
 				.run((context) -> {
 					LdapContextSource contextSource = context
 							.getBean(LdapContextSource.class);
-					String[] urls = getUrls(contextSource);
-					assertThat(urls).containsExactly("ldap://localhost:123");
+					assertThat(contextSource.getUrls())
+							.containsExactly("ldap://localhost:123");
 				});
 	}
 
@@ -72,9 +71,8 @@ public class LdapAutoConfigurationTests {
 					LdapContextSource contextSource = context
 							.getBean(LdapContextSource.class);
 					LdapProperties ldapProperties = context.getBean(LdapProperties.class);
-					String[] urls = getUrls(contextSource);
-					assertThat(urls).containsExactly("ldap://localhost:123",
-							"ldap://mycompany:123");
+					assertThat(contextSource.getUrls()).containsExactly(
+							"ldap://localhost:123", "ldap://mycompany:123");
 					assertThat(ldapProperties.getUrls()).hasSize(2);
 				});
 	}
@@ -112,16 +110,12 @@ public class LdapAutoConfigurationTests {
 				.run((context) -> {
 					LdapContextSource contextSource = context
 							.getBean(LdapContextSource.class);
-					String[] urls = getUrls(contextSource);
-					assertThat(urls).containsExactly("ldap://localhost:389");
+					assertThat(contextSource.getUrls())
+							.containsExactly("ldap://localhost:389");
 					assertThat(contextSource.isAnonymousReadOnly()).isFalse();
 				});
 	}
 
-	private String[] getUrls(LdapContextSource contextSource) {
-		return contextSource.getUrls();
-	}
-
 	@Configuration
 	static class PooledContextSourceConfig {
 

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/SpringBootTestRandomPortEnvironmentPostProcessor.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.
@@ -97,7 +97,7 @@ class SpringBootTestRandomPortEnvironmentPostProcessor
 			return environment.getConversionService().convert(value, Integer.class);
 		}
 		catch (ConversionFailedException ex) {
-			if (ClassUtils.isAssignable(value.getClass(), String.class)) {
+			if (value instanceof String) {
 				return getResolvedValueIfPossible(environment, (String) value);
 			}
 			throw ex;

spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFileEntries.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.
@@ -63,7 +63,7 @@ class JarFileEntries implements CentralDirectoryVisitor, Iterable<JarEntry> {
 					.invoke(runtimeVersion);
 		}
 		catch (Throwable ex) {
-			version = 8;
+			version = BASE_VERSION;
 		}
 		RUNTIME_VERSION = version;
 	}

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DataSourceUnwrapperTests.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.
@@ -77,8 +77,8 @@ public class DataSourceUnwrapperTests {
 	@Test
 	public void unwrapWithSeveralLevelOfWrapping() {
 		DataSource dataSource = new HikariDataSource();
-		DataSource actual = wrapInProxy(wrapInDelegate(
-				wrapInDelegate((wrapInProxy(wrapInDelegate(dataSource))))));
+		DataSource actual = wrapInProxy(
+				wrapInDelegate(wrapInDelegate(wrapInProxy(wrapInDelegate(dataSource)))));
 		assertThat(DataSourceUnwrapper.unwrap(actual, HikariDataSource.class))
 				.isSameAs(dataSource);
 	}