From 1770f065a5428f059b9659545e4ecbcdf7baa9bd Mon Sep 17 00:00:00 2001 From: Leo Li <269739606@qq.com> Date: Tue, 28 Sep 2021 13:30:11 +0800 Subject: [PATCH 1/2] Polish See gh-28239 --- .../endpoint/web/ExposableServletEndpoint.java | 4 ++-- .../cli/command/options/SourceOptions.java | 4 ++-- .../livereload/ConnectionInputStream.java | 4 ++-- .../client/DelayedLiveReloadTrigger.java | 4 ++-- ...rviceServerWithRootUriIntegrationTests.java | 2 +- .../boot/test/json/JsonContent.java | 4 ++-- .../boot/test/web/client/TestRestTemplate.java | 18 +++++++++--------- ...AccessLevelOverwriteExplicitProperties.java | 4 ++-- .../boot/loader/data/package-info.java | 4 ++-- .../boot/maven/RepackageMojo.java | 2 +- .../boot/SpringApplication.java | 6 +++--- .../SpringApplicationShutdownHandlers.java | 2 +- .../availability/ApplicationAvailability.java | 4 ++-- .../ConfigDataEnvironmentContributors.java | 2 +- .../context/config/ConfigDataLocation.java | 2 +- .../source/ConfigurationPropertyName.java | 2 +- .../netty/NettyReactiveWebServerFactory.java | 2 +- .../DelegatingFilterProxyRegistrationBean.java | 4 ++-- .../web/servlet/FilterRegistrationBean.java | 4 ++-- .../ConfigFileApplicationListenerTests.java | 2 +- ...pringConfigurationPropertySourcesTests.java | 2 +- ...taSourceScriptDatabaseInitializerTests.java | 8 ++++---- .../origin/OriginTrackedResourceTests.java | 4 ++-- 23 files changed, 47 insertions(+), 47 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/ExposableServletEndpoint.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/ExposableServletEndpoint.java index 29bcf6175f..2a8db4a7d7 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/ExposableServletEndpoint.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/ExposableServletEndpoint.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. @@ -28,7 +28,7 @@ import org.springframework.boot.actuate.endpoint.Operation; public interface ExposableServletEndpoint extends ExposableEndpoint, PathMappedEndpoint { /** - * Return details of the servlet that should registered. + * Return details of the servlet that should register. * @return the endpoint servlet */ EndpointServlet getEndpointServlet(); diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/SourceOptions.java b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/SourceOptions.java index 9e854238ac..29b0e07bb2 100644 --- a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/SourceOptions.java +++ b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/SourceOptions.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. @@ -63,7 +63,7 @@ public class SourceOptions { * specify non-existent sources, but the default paths are allowed not to exist (the * paths are tested before use). If default paths are provided and the option set * contains no source file arguments it is not an error even if none of the default - * paths exist). + * paths exist. * @param optionSet the source option set * @param classLoader an optional classloader used to try and load files that are not * found in the local filesystem diff --git a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/ConnectionInputStream.java b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/ConnectionInputStream.java index e7520655c9..137e8b8552 100644 --- a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/ConnectionInputStream.java +++ b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/ConnectionInputStream.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. @@ -70,7 +70,7 @@ class ConnectionInputStream extends FilterInputStream { /** * Read a single byte from the stream (checking that the end of the stream hasn't been - * reached. + * reached). * @return the content * @throws IOException in case of I/O errors */ diff --git a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/DelayedLiveReloadTrigger.java b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/DelayedLiveReloadTrigger.java index 231f0bb607..1328b18328 100644 --- a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/DelayedLiveReloadTrigger.java +++ b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/DelayedLiveReloadTrigger.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. @@ -32,7 +32,7 @@ import org.springframework.http.client.ClientHttpResponse; import org.springframework.util.Assert; /** - * {@link Runnable} that waits to triggers live reload until the remote server has + * {@link Runnable} that waits to trigger live reload until the remote server has * restarted. * * @author Phillip Webb diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/AutoConfigureMockRestServiceServerWithRootUriIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/AutoConfigureMockRestServiceServerWithRootUriIntegrationTests.java index 8021d1f7c0..e27f8f77b9 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/AutoConfigureMockRestServiceServerWithRootUriIntegrationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/AutoConfigureMockRestServiceServerWithRootUriIntegrationTests.java @@ -56,7 +56,7 @@ class AutoConfigureMockRestServiceServerWithRootUriIntegrationTests { MeterRegistry meterRegistry; @Test - void whenRestTemplateAppliesARootUriThenMockServerExpecationsAreStillMatched() { + void whenRestTemplateAppliesARootUriThenMockServerExpectationsAreStillMatched() { this.server.expect(requestTo("/test")).andRespond(withSuccess("hello", MediaType.TEXT_HTML)); ResponseEntity entity = this.restTemplate.getForEntity("/test", String.class); assertThat(entity.getBody()).isEqualTo("hello"); diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContent.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContent.java index 735f808a49..cda1bd9d04 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContent.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContent.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. @@ -23,7 +23,7 @@ import org.springframework.core.ResolvableType; import org.springframework.util.Assert; /** - * JSON content created usually from a JSON tester. Generally used only to + * JSON content usually created from a JSON tester. Generally used only to * {@link AssertProvider provide} {@link JsonContentAssert} to AssertJ {@code assertThat} * calls. * diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java index 065d9c8301..15193399bb 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java @@ -682,7 +682,7 @@ public class TestRestTemplate { *

* URI Template variables are expanded using the given URI variables, if any. * @param url the URL - * @param method the HTTP method (GET, POST, etc) + * @param method the HTTP method (GET, POST, etc.) * @param requestEntity the entity (headers and/or body) to write to the request, may * be {@code null} * @param responseType the type of the return value @@ -703,7 +703,7 @@ public class TestRestTemplate { *

* URI Template variables are expanded using the given URI variables, if any. * @param url the URL - * @param method the HTTP method (GET, POST, etc) + * @param method the HTTP method (GET, POST, etc.) * @param requestEntity the entity (headers and/or body) to write to the request, may * be {@code null} * @param responseType the type of the return value @@ -722,7 +722,7 @@ public class TestRestTemplate { * Execute the HTTP method to the given URI template, writing the given request entity * to the request, and returns the response as {@link ResponseEntity}. * @param url the URL - * @param method the HTTP method (GET, POST, etc) + * @param method the HTTP method (GET, POST, etc.) * @param requestEntity the entity (headers and/or body) to write to the request, may * be {@code null} * @param responseType the type of the return value @@ -745,7 +745,7 @@ public class TestRestTemplate { * ResponseEntity<List<MyBean>> response = template.exchange("https://example.com",HttpMethod.GET, null, myBean); * * @param url the URL - * @param method the HTTP method (GET, POST, etc) + * @param method the HTTP method (GET, POST, etc.) * @param requestEntity the entity (headers and/or body) to write to the request, may * be {@code null} * @param responseType the type of the return value @@ -770,7 +770,7 @@ public class TestRestTemplate { * ResponseEntity<List<MyBean>> response = template.exchange("https://example.com",HttpMethod.GET, null, myBean); * * @param url the URL - * @param method the HTTP method (GET, POST, etc) + * @param method the HTTP method (GET, POST, etc.) * @param requestEntity the entity (headers and/or body) to write to the request, may * be {@code null} * @param responseType the type of the return value @@ -795,7 +795,7 @@ public class TestRestTemplate { * ResponseEntity<List<MyBean>> response = template.exchange("https://example.com",HttpMethod.GET, null, myBean); * * @param url the URL - * @param method the HTTP method (GET, POST, etc) + * @param method the HTTP method (GET, POST, etc.) * @param requestEntity the entity (headers and/or body) to write to the request, may * be {@code null} * @param responseType the type of the return value @@ -854,7 +854,7 @@ public class TestRestTemplate { *

* URI Template variables are expanded using the given URI variables, if any. * @param url the URL - * @param method the HTTP method (GET, POST, etc) + * @param method the HTTP method (GET, POST, etc.) * @param requestCallback object that prepares the request * @param responseExtractor object that extracts the return value from the response * @param urlVariables the variables to expand in the template @@ -875,7 +875,7 @@ public class TestRestTemplate { *

* URI Template variables are expanded using the given URI variables map. * @param url the URL - * @param method the HTTP method (GET, POST, etc) + * @param method the HTTP method (GET, POST, etc.) * @param requestCallback object that prepares the request * @param responseExtractor object that extracts the return value from the response * @param urlVariables the variables to expand in the template @@ -894,7 +894,7 @@ public class TestRestTemplate { * Execute the HTTP method to the given URL, preparing the request with the * {@link RequestCallback}, and reading the response with a {@link ResponseExtractor}. * @param url the URL - * @param method the HTTP method (GET, POST, etc) + * @param method the HTTP method (GET, POST, etc.) * @param requestCallback object that prepares the request * @param responseExtractor object that extracts the return value from the response * @param the type of the return value diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokAccessLevelOverwriteExplicitProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokAccessLevelOverwriteExplicitProperties.java index 62a7257b63..51a2a8c642 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokAccessLevelOverwriteExplicitProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokAccessLevelOverwriteExplicitProperties.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. @@ -24,7 +24,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; /** * Configuration properties using lombok @Getter and @Setter with explicitly defining - * AccessLevel.PUBLIC on element level and overwriting behaviour at field level. + * AccessLevel. PUBLIC on element level and overwriting behaviour at field level. * * @author Jonas Keßler */ diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/package-info.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/package-info.java index 137f6dae73..8f456bd685 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/package-info.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/package-info.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. @@ -15,7 +15,7 @@ */ /** - * Classes and interfaces to allows random access to a block of data. + * Classes and interfaces to allow random access to a block of data. * * @see org.springframework.boot.loader.data.RandomAccessData */ diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java index 2e77b5eb81..03364c4561 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java @@ -222,7 +222,7 @@ public class RepackageMojo extends AbstractPackagerMojo { } private FileTime parseOutputTimestamp() { - // Maven ignore a single-character timestamp as it is "useful to override a full + // Maven ignores a single-character timestamp as it is "useful to override a full // value during pom inheritance" if (this.outputTimestamp == null || this.outputTimestamp.length() < 2) { return null; diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java index d71e17678a..2f3f19ba92 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java @@ -229,7 +229,7 @@ public class SpringApplication { /** * Create a new {@link SpringApplication} instance. The application context will load * beans from the specified primary sources (see {@link SpringApplication class-level} - * documentation for details. The instance can be customized before calling + * documentation for details). The instance can be customized before calling * {@link #run(String...)}. * @param primarySources the primary bean sources * @see #run(Class, String[]) @@ -243,7 +243,7 @@ public class SpringApplication { /** * Create a new {@link SpringApplication} instance. The application context will load * beans from the specified primary sources (see {@link SpringApplication class-level} - * documentation for details. The instance can be customized before calling + * documentation for details). The instance can be customized before calling * {@link #run(String...)}. * @param resourceLoader the resource loader to use * @param primarySources the primary bean sources @@ -675,7 +675,7 @@ public class SpringApplication { /** * Either the ClassLoader that will be used in the ApplicationContext (if - * {@link #setResourceLoader(ResourceLoader) resourceLoader} is set, or the context + * {@link #setResourceLoader(ResourceLoader) resourceLoader} is set), or the context * class loader (if not null), or the loader of the Spring {@link ClassUtils} class. * @return a ClassLoader (never null) */ diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplicationShutdownHandlers.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplicationShutdownHandlers.java index 882d1debf1..f54858c9a1 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplicationShutdownHandlers.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplicationShutdownHandlers.java @@ -20,7 +20,7 @@ import org.springframework.context.ApplicationContext; /** * Interface that can be used to add or remove code that should run when the JVM is - * shutdown. Shutdown handers are similar to JVM {@link Runtime#addShutdownHook(Thread) + * shutdown. Shutdown handlers are similar to JVM {@link Runtime#addShutdownHook(Thread) * shutdown hooks} except that they run sequentially rather than concurrently. *

* Shutdown handlers are guaranteed to be called only after registered diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/availability/ApplicationAvailability.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/availability/ApplicationAvailability.java index 3ab16c164e..31ec87d61f 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/availability/ApplicationAvailability.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/availability/ApplicationAvailability.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. @@ -53,7 +53,7 @@ public interface ApplicationAvailability { * @param the state type * @param stateType the state type * @param defaultState the default state to return if no event of the given type has - * been published yet (must not be {@code null}. + * been published yet (must not be {@code null}). * @return the readiness state * @see #getState(Class) */ diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataEnvironmentContributors.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataEnvironmentContributors.java index 0c66cf078a..f032a4b0cf 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataEnvironmentContributors.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataEnvironmentContributors.java @@ -85,7 +85,7 @@ class ConfigDataEnvironmentContributors implements Iterable * The "{@code [}" and "{@code ]}" characters may be used to indicate an associative - * index(i.e. a {@link Map} key or a {@link Collection} index. Indexes names are not + * index(i.e. a {@link Map} key or a {@link Collection} index). Indexes names are not * restricted and are considered case-sensitive. *

* Here are some typical examples: diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/NettyReactiveWebServerFactory.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/NettyReactiveWebServerFactory.java index ba797507da..d1432632b3 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/NettyReactiveWebServerFactory.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/NettyReactiveWebServerFactory.java @@ -100,7 +100,7 @@ public class NettyReactiveWebServerFactory extends AbstractReactiveWebServerFact } /** - * Add {@link NettyServerCustomizer}s that should applied while building the server. + * Add {@link NettyServerCustomizer}s that should apply while building the server. * @param serverCustomizers the customizers to add */ public void addServerCustomizers(NettyServerCustomizer... serverCustomizers) { diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/DelegatingFilterProxyRegistrationBean.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/DelegatingFilterProxyRegistrationBean.java index 9c1bceacfd..ba45a59627 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/DelegatingFilterProxyRegistrationBean.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/DelegatingFilterProxyRegistrationBean.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. @@ -40,7 +40,7 @@ import org.springframework.web.filter.DelegatingFilterProxy; *

* Registrations can be associated with {@link #setUrlPatterns URL patterns} and/or * servlets (either by {@link #setServletNames name} or via a - * {@link #setServletRegistrationBeans ServletRegistrationBean}s. When no URL pattern or + * {@link #setServletRegistrationBeans ServletRegistrationBean}s). When no URL pattern or * servlets are specified the filter will be associated to '/*'. The targetBeanName will * be used as the filter name if not otherwise specified. * diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/FilterRegistrationBean.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/FilterRegistrationBean.java index 8a84b63dfb..48e86aeb18 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/FilterRegistrationBean.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/FilterRegistrationBean.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. @@ -29,7 +29,7 @@ import org.springframework.util.Assert; * The {@link #setFilter(Filter) Filter} must be specified before calling * {@link #onStartup(ServletContext)}. Registrations can be associated with * {@link #setUrlPatterns URL patterns} and/or servlets (either by {@link #setServletNames - * name} or via a {@link #setServletRegistrationBeans ServletRegistrationBean}s. When no + * name} or via a {@link #setServletRegistrationBeans ServletRegistrationBean}s). When no * URL pattern or servlets are specified the filter will be associated to '/*'. The filter * name will be deduced if not specified. * diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java index 9040a27782..21ccfdae1f 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java @@ -251,7 +251,7 @@ class ConfigFileApplicationListenerTests { @Test void randomValue() { - // dont need + // don't need this.initializer.postProcessEnvironment(this.environment, this.application); String property = this.environment.getProperty("random.value"); assertThat(property).isNotNull(); diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/source/SpringConfigurationPropertySourcesTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/source/SpringConfigurationPropertySourcesTests.java index ad47ad8bb9..759721ba1a 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/source/SpringConfigurationPropertySourcesTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/source/SpringConfigurationPropertySourcesTests.java @@ -163,7 +163,7 @@ class SpringConfigurationPropertySourcesTests { } @Test // gh-21659 - void shouldAdaptRandomePropertySource() { + void shouldAdaptRandomPropertySource() { MutablePropertySources sources = new MutablePropertySources(); sources.addFirst(new RandomValuePropertySource()); Iterator iterator = new SpringConfigurationPropertySources(sources).iterator(); diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/init/DataSourceScriptDatabaseInitializerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/init/DataSourceScriptDatabaseInitializerTests.java index 26a86fe6e0..38b8f3694c 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/init/DataSourceScriptDatabaseInitializerTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/init/DataSourceScriptDatabaseInitializerTests.java @@ -43,7 +43,7 @@ class DataSourceScriptDatabaseInitializerTests private final HikariDataSource embeddedDataSource = DataSourceBuilder.create().type(HikariDataSource.class) .url("jdbc:h2:mem:" + UUID.randomUUID()).build(); - private final HikariDataSource standloneDataSource = DataSourceBuilder.create().type(HikariDataSource.class) + private final HikariDataSource standaloneDataSource = DataSourceBuilder.create().type(HikariDataSource.class) .url("jdbc:h2:file:" + new BuildOutput(DataSourceScriptDatabaseInitializerTests.class).getRootLocation() .getAbsolutePath() + "/" + UUID.randomUUID()) .build(); @@ -51,7 +51,7 @@ class DataSourceScriptDatabaseInitializerTests @AfterEach void closeDataSource() { this.embeddedDataSource.close(); - this.standloneDataSource.close(); + this.standaloneDataSource.close(); } @Test @@ -70,7 +70,7 @@ class DataSourceScriptDatabaseInitializerTests @Override protected DataSourceScriptDatabaseInitializer createStandaloneDatabaseInitializer( DatabaseInitializationSettings settings) { - return new DataSourceScriptDatabaseInitializer(this.standloneDataSource, settings); + return new DataSourceScriptDatabaseInitializer(this.standaloneDataSource, settings); } @Override @@ -80,7 +80,7 @@ class DataSourceScriptDatabaseInitializerTests @Override protected int numberOfStandaloneRows(String sql) { - return numberOfRows(this.standloneDataSource, sql); + return numberOfRows(this.standaloneDataSource, sql); } private int numberOfRows(DataSource dataSource, String sql) { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/origin/OriginTrackedResourceTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/origin/OriginTrackedResourceTests.java index 7ebc7abd70..ab8ed4a51c 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/origin/OriginTrackedResourceTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/origin/OriginTrackedResourceTests.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. @@ -180,7 +180,7 @@ class OriginTrackedResourceTests { } @Test - void ofWhenWritableReturnsOriginTrackedWrtiableResource() { + void ofWhenWritableReturnsOriginTrackedWritableResource() { Resource resource = mock(WritableResource.class); Resource tracked = OriginTrackedResource.of(resource, this.origin); assertThat(tracked).isInstanceOf(WritableResource.class) From cc8d7fc605833e18aa1149810071d1ade5e433a9 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 13 Oct 2021 09:07:46 +0200 Subject: [PATCH 2/2] Polish contribution See gh-28239 --- .../boot/actuate/endpoint/web/ExposableServletEndpoint.java | 2 +- .../lombok/LombokAccessLevelOverwriteExplicitProperties.java | 4 ++-- .../context/config/ConfigDataEnvironmentContributors.java | 2 +- .../web/embedded/netty/NettyReactiveWebServerFactory.java | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/ExposableServletEndpoint.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/ExposableServletEndpoint.java index 2a8db4a7d7..bdef98a341 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/ExposableServletEndpoint.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/ExposableServletEndpoint.java @@ -28,7 +28,7 @@ import org.springframework.boot.actuate.endpoint.Operation; public interface ExposableServletEndpoint extends ExposableEndpoint, PathMappedEndpoint { /** - * Return details of the servlet that should register. + * Return details of the servlet that should be registered. * @return the endpoint servlet */ EndpointServlet getEndpointServlet(); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokAccessLevelOverwriteExplicitProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokAccessLevelOverwriteExplicitProperties.java index 51a2a8c642..62a7257b63 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokAccessLevelOverwriteExplicitProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokAccessLevelOverwriteExplicitProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 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. @@ -24,7 +24,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; /** * Configuration properties using lombok @Getter and @Setter with explicitly defining - * AccessLevel. PUBLIC on element level and overwriting behaviour at field level. + * AccessLevel.PUBLIC on element level and overwriting behaviour at field level. * * @author Jonas Keßler */ diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataEnvironmentContributors.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataEnvironmentContributors.java index f032a4b0cf..bc8b15bca1 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataEnvironmentContributors.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataEnvironmentContributors.java @@ -85,7 +85,7 @@ class ConfigDataEnvironmentContributors implements Iterable