From b01fb63de6468bba9d924d17b1fe5b29da895d04 Mon Sep 17 00:00:00 2001 From: dreis2211 Date: Thu, 23 Jul 2020 08:49:44 +0200 Subject: [PATCH] Polish See gh-22524 --- .../src/docs/asciidoc/spring-boot-features.adoc | 4 ++-- .../boot/context/config/ConfigDataEnvironment.java | 4 ++-- .../boot/context/config/ConfigDataImporter.java | 4 ++-- .../boot/context/config/ConfigDataLoaders.java | 2 +- .../boot/context/config/ConfigFileApplicationListener.java | 2 +- .../springframework/boot/context/config/Instantiator.java | 2 +- .../boot/env/OriginTrackedPropertiesLoaderTests.java | 6 +++--- .../boot/env/OriginTrackedYamlLoaderTests.java | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc index d3fe2dff5c..df30061a95 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc @@ -759,7 +759,7 @@ For example, the following file has two logical documents: spring.application.name: MyCloudApp ---- -For `appliation.properties` files a special `#---` comment is used to mark the document splits: +For `application.properties` files a special `#---` comment is used to mark the document splits: [source,properties,indent=0] ---- @@ -3148,7 +3148,7 @@ If a Servlet filter wraps the request, it should be configured with an order tha TIP: To see the order of every `Filter` in your application, enable debug level logging for the `web` <> (`logging.level.web=debug`). Details of the registered filters, including their order and URL patterns, will then be logged at startup. -WARNING: Take care when registering `Filter` beans since they are initialized very early in the application lifectyle. +WARNING: Take care when registering `Filter` beans since they are initialized very early in the application lifecycle. If you need to register a `Filter` that interacts with other beans, consider using a {spring-boot-module-api}/web/servlet/DelegatingFilterProxyRegistrationBean.html[`DelegatingFilterProxyRegistrationBean`] instead. diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataEnvironment.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataEnvironment.java index 457d5b9e8e..73af332ba8 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataEnvironment.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataEnvironment.java @@ -198,7 +198,7 @@ class ConfigDataEnvironment { private ConfigDataEnvironmentContributors processWithoutProfiles(ConfigDataEnvironmentContributors contributors, ConfigDataImporter importer, ConfigDataActivationContext activationContext) { - this.logger.trace("Processing config data environment contributors with intial activation context"); + this.logger.trace("Processing config data environment contributors with initial activation context"); return contributors.withProcessedImports(importer, activationContext); } @@ -245,7 +245,7 @@ class ConfigDataEnvironment { } DefaultPropertiesPropertySource.moveToEnd(propertySources); Profiles profiles = activationContext.getProfiles(); - this.logger.trace(LogMessage.format("Setting default profies: %s", profiles.getDefault())); + this.logger.trace(LogMessage.format("Setting default profiles: %s", profiles.getDefault())); this.environment.setDefaultProfiles(StringUtils.toStringArray(profiles.getDefault())); this.logger.trace(LogMessage.format("Setting active profiles: %s", profiles.getActive())); this.environment.setActiveProfiles(StringUtils.toStringArray(profiles.getActive())); diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataImporter.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataImporter.java index b7d3cefdae..73e46a2159 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataImporter.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataImporter.java @@ -43,7 +43,7 @@ class ConfigDataImporter { /** * Create a new {@link ConfigDataImporter} instance. * @param resolvers the config data location resolvers - * @param loaders the condif data loaders + * @param loaders the config data loaders */ ConfigDataImporter(ConfigDataLocationResolvers resolvers, ConfigDataLoaders loaders) { this.resolvers = resolvers; @@ -65,7 +65,7 @@ class ConfigDataImporter { return load(this.resolvers.resolveAll(locationResolverContext, locations, profiles)); } catch (IOException ex) { - throw new IllegalStateException("IO errorload imports from " + locations, ex); + throw new IllegalStateException("IO error on loading imports from " + locations, ex); } } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataLoaders.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataLoaders.java index f970ec8e40..bc5c964303 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataLoaders.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataLoaders.java @@ -78,7 +78,7 @@ class ConfigDataLoaders { /** * Load {@link ConfigData} using the first appropriate {@link ConfigDataLoader}. - * @param the condig data location type + * @param the config data location type * @param location the location to load * @return the loaded {@link ConfigData} * @throws IOException on IO error diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java index 7eb98ca5d7..bc20ee1f2b 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java @@ -193,7 +193,7 @@ public class ConfigFileApplicationListener implements EnvironmentPostProcessor, @Override public void onApplicationEvent(ApplicationEvent event) { throw new IllegalStateException( - "ConfigFileApplicationListener is deprected and can only be used as an EnvironmentPostProcessor"); + "ConfigFileApplicationListener is deprecated and can only be used as an EnvironmentPostProcessor"); } @Override diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/Instantiator.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/Instantiator.java index 7b46a85139..0575d173dd 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/Instantiator.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/Instantiator.java @@ -51,7 +51,7 @@ class Instantiator { /** * Create a new {@link Instantiator} instance for the given type. * @param type the type to instantiate - * @param availableParameters consumer used to register avaiable parameters + * @param availableParameters consumer used to register available parameters */ Instantiator(Class type, Consumer availableParameters) { this.type = type; diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedPropertiesLoaderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedPropertiesLoaderTests.java index ccc316c06f..8055942000 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedPropertiesLoaderTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedPropertiesLoaderTests.java @@ -41,13 +41,13 @@ class OriginTrackedPropertiesLoaderTests { private ClassPathResource resource; - private List documentes; + private List documents; @BeforeEach void setUp() throws Exception { String path = "test-properties.properties"; this.resource = new ClassPathResource(path, getClass()); - this.documentes = new OriginTrackedPropertiesLoader(this.resource).load(); + this.documents = new OriginTrackedPropertiesLoader(this.resource).load(); } @Test @@ -257,7 +257,7 @@ class OriginTrackedPropertiesLoaderTests { } private OriginTrackedValue getFromFirst(String key) { - return this.documentes.get(0).asMap().get(key); + return this.documents.get(0).asMap().get(key); } private Object getValue(OriginTrackedValue value) { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedYamlLoaderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedYamlLoaderTests.java index b26cb73866..bd39af6e0c 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedYamlLoaderTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedYamlLoaderTests.java @@ -129,7 +129,7 @@ class OriginTrackedYamlLoaderTests { } @Test - void emptyDocumentes() { + void emptyDocuments() { this.loader = new OriginTrackedYamlLoader(new ClassPathResource("test-empty-yaml.yml", getClass())); List> loaded = this.loader.load(); assertThat(loaded).isEmpty();