diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/OnEndpointElementCondition.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/OnEndpointElementCondition.java index ff0cb0e655c..774eb929aec 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/OnEndpointElementCondition.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/OnEndpointElementCondition.java @@ -27,8 +27,8 @@ import org.springframework.core.env.Environment; import org.springframework.core.type.AnnotatedTypeMetadata; /** - * Base endpoint element condition. An element can be disabled globally via the - * {@code defaults} name or individually via the name of the element. + * Base endpoint element condition. An element can be disabled globally through the + * {@code defaults} name or individually through the name of the element. * * @author Stephane Nicoll * @author Madhura Bhave diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/expose/EndpointExposure.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/expose/EndpointExposure.java index 82c27c853ae..dbf9d5d6489 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/expose/EndpointExposure.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/expose/EndpointExposure.java @@ -25,17 +25,17 @@ package org.springframework.boot.actuate.autoconfigure.endpoint.expose; public enum EndpointExposure { /** - * Exposed via JMX endpoint. + * Exposed over a JMX endpoint. */ JMX("*"), /** - * Exposed via a web endpoint. + * Exposed over a web endpoint. */ WEB("health"), /** - * Exposed on Cloud Foundry via `/cloudfoundryapplication`. + * Exposed on Cloud Foundry over `/cloudfoundryapplication`. * @since 2.6.4 */ CLOUD_FOUNDRY("*"); diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusProperties.java index 41b7845f62e..d3e88d1a6b8 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusProperties.java @@ -105,7 +105,7 @@ public class PrometheusProperties { public static class Pushgateway { /** - * Enable publishing via a Prometheus Pushgateway. + * Enable publishing over a Prometheus Pushgateway. */ private Boolean enabled = false; diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/client/MetricsClientHttpRequestInterceptor.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/client/MetricsClientHttpRequestInterceptor.java index 8da5d69a484..09ba3ab80a9 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/client/MetricsClientHttpRequestInterceptor.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/client/MetricsClientHttpRequestInterceptor.java @@ -38,7 +38,7 @@ import org.springframework.http.client.ClientHttpResponse; import org.springframework.web.util.UriTemplateHandler; /** - * {@link ClientHttpRequestInterceptor} applied via a + * {@link ClientHttpRequestInterceptor} applied through a * {@link MetricsRestTemplateCustomizer} to record metrics. * * @author Jon Schneider diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/client/MetricsWebClientFilterFunction.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/client/MetricsWebClientFilterFunction.java index 17f258ffb56..af7d0978818 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/client/MetricsWebClientFilterFunction.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/client/MetricsWebClientFilterFunction.java @@ -35,7 +35,7 @@ import org.springframework.web.reactive.function.client.ExchangeFilterFunction; import org.springframework.web.reactive.function.client.ExchangeFunction; /** - * {@link ExchangeFilterFunction} applied via a {@link MetricsWebClientCustomizer} to + * {@link ExchangeFilterFunction} applied through a {@link MetricsWebClientCustomizer} to * record metrics. * * @author Brian Clozel diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/MappingDescriptionProvider.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/MappingDescriptionProvider.java index 80d4ba5c526..0b9c2e559ee 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/MappingDescriptionProvider.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/MappingDescriptionProvider.java @@ -22,7 +22,7 @@ import org.springframework.context.ApplicationContext; /** * A {@link MappingDescriptionProvider} provides a {@link List} of mapping descriptions - * via implementation-specific introspection of an application context. + * through implementation-specific introspection of an application context. * * @author Andy Wilkinson * @since 2.0.0 diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LoggersEndpointWebIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LoggersEndpointWebIntegrationTests.java index 254df61e227..c65436151c8 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LoggersEndpointWebIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LoggersEndpointWebIntegrationTests.java @@ -47,7 +47,7 @@ import static org.mockito.BDDMockito.then; import static org.mockito.Mockito.mock; /** - * Integration tests for {@link LoggersEndpoint} when exposed via Jersey, Spring MVC, and + * Integration tests for {@link LoggersEndpoint} when exposed over Jersey, Spring MVC, and * WebFlux. * * @author Ben Hale diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfiguration.java index a8ad538d823..5b505042502 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfiguration.java @@ -68,7 +68,7 @@ public @interface AutoConfiguration { * name will be automatically generated. *

* The custom name applies only if the {@code @AutoConfiguration} class is picked up - * via component scanning or supplied directly to an + * through component scanning or supplied directly to an * {@link AnnotationConfigApplicationContext}. If the {@code @AutoConfiguration} class * is registered as a traditional XML bean definition, the name/id of the bean element * will take precedence. diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/EnableAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/EnableAutoConfiguration.java index 4030ef5e8c4..fa8d1064c8d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/EnableAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/EnableAutoConfiguration.java @@ -49,16 +49,16 @@ import org.springframework.core.io.support.SpringFactoriesLoader; * Auto-configuration tries to be as intelligent as possible and will back-away as you * define more of your own configuration. You can always manually {@link #exclude()} any * configuration that you never want to apply (use {@link #excludeName()} if you don't - * have access to them). You can also exclude them via the + * have access to them). You can also exclude them through the * {@code spring.autoconfigure.exclude} property. Auto-configuration is always applied * after user-defined beans have been registered. *

* The package of the class that is annotated with {@code @EnableAutoConfiguration}, - * usually via {@code @SpringBootApplication}, has specific significance and is often used - * as a 'default'. For example, it will be used when scanning for {@code @Entity} classes. - * It is generally recommended that you place {@code @EnableAutoConfiguration} (if you're - * not using {@code @SpringBootApplication}) in a root package so that all sub-packages - * and classes can be searched. + * usually through {@code @SpringBootApplication}, has specific significance and is often + * used as a 'default'. For example, it will be used when scanning for {@code @Entity} + * classes. It is generally recommended that you place {@code @EnableAutoConfiguration} + * (if you're not using {@code @SpringBootApplication}) in a root package so that all + * sub-packages and classes can be searched. *

* Auto-configuration classes are regular Spring {@link Configuration @Configuration} * beans. They are located using {@link ImportCandidates} and the diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/Cache2kBuilderCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/Cache2kBuilderCustomizer.java index 954d1fa5bff..d7ae68583de 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/Cache2kBuilderCustomizer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/Cache2kBuilderCustomizer.java @@ -20,7 +20,8 @@ import org.cache2k.Cache2kBuilder; /** * Callback interface that can be implemented by beans wishing to customize the default - * setup for caches added to the manager via addCaches and for dynamically created caches. + * setup for caches added to the manager through addCaches and for dynamically created + * caches. * * @author Jens Wilke * @author Stephane Nicoll diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfiguration.java index 5804dec8de3..f23ac2df2a0 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfiguration.java @@ -49,7 +49,7 @@ import org.springframework.util.Assert; * {@link CacheManager} if necessary when caching is enabled via * {@link EnableCaching @EnableCaching}. *

- * Cache store can be auto-detected or specified explicitly via configuration. + * Cache store can be auto-detected or specified explicitly through configuration. * * @author Stephane Nicoll * @since 1.3.0 diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/NoOpCacheConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/NoOpCacheConfiguration.java index 62c1c7da40c..a5730f61748 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/NoOpCacheConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/NoOpCacheConfiguration.java @@ -24,7 +24,7 @@ import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; /** - * No-op cache configuration used to disable caching via configuration. + * No-op cache configuration used to disable caching through configuration. * * @author Stephane Nicoll */ diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CqlSessionBuilderCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CqlSessionBuilderCustomizer.java index 70d48f50314..5b5fc1bb7b8 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CqlSessionBuilderCustomizer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CqlSessionBuilderCustomizer.java @@ -21,7 +21,7 @@ import com.datastax.oss.driver.api.core.CqlSessionBuilder; /** * Callback interface that can be implemented by beans wishing to customize the - * {@link CqlSession} via a {@link CqlSessionBuilder} whilst retaining default + * {@link CqlSession} through a {@link CqlSessionBuilder} whilst retaining default * auto-configuration. * * @author Stephane Nicoll diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/DriverConfigLoaderBuilderCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/DriverConfigLoaderBuilderCustomizer.java index 020191e6731..0d5bf5e218f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/DriverConfigLoaderBuilderCustomizer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/DriverConfigLoaderBuilderCustomizer.java @@ -21,7 +21,7 @@ import com.datastax.oss.driver.api.core.config.ProgrammaticDriverConfigLoaderBui /** * Callback interface that can be implemented by beans wishing to customize the - * {@link DriverConfigLoader} via a {@link DriverConfigLoaderBuilderCustomizer} whilst + * {@link DriverConfigLoader} through a {@link DriverConfigLoaderBuilderCustomizer} whilst * retaining default auto-configuration. * * @author Stephane Nicoll diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/ClusterEnvironmentBuilderCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/ClusterEnvironmentBuilderCustomizer.java index 9597db1c2a1..fcfb92f8965 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/ClusterEnvironmentBuilderCustomizer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/ClusterEnvironmentBuilderCustomizer.java @@ -17,12 +17,12 @@ package org.springframework.boot.autoconfigure.couchbase; import com.couchbase.client.java.env.ClusterEnvironment; +import com.couchbase.client.java.env.ClusterEnvironment.Builder; /** * Callback interface that can be implemented by beans wishing to customize the - * {@link ClusterEnvironment} via a - * {@link com.couchbase.client.java.env.ClusterEnvironment.Builder - * ClusterEnvironment.Builder} whilst retaining default auto-configuration. + * {@link ClusterEnvironment} through a {@link Builder ClusterEnvironment.Builder} whilst + * retaining default auto-configuration. * * @author Stephane Nicoll * @since 2.3.0 @@ -31,8 +31,7 @@ import com.couchbase.client.java.env.ClusterEnvironment; public interface ClusterEnvironmentBuilderCustomizer { /** - * Customize the {@link com.couchbase.client.java.env.ClusterEnvironment.Builder - * ClusterEnvironment.Builder}. + * Customize the {@link Builder ClusterEnvironment.Builder}. * @param builder the builder to customize */ void customize(ClusterEnvironment.Builder builder); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/ClientResourcesBuilderCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/ClientResourcesBuilderCustomizer.java index d81b3eceb0c..ff2ec178541 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/ClientResourcesBuilderCustomizer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/ClientResourcesBuilderCustomizer.java @@ -21,7 +21,7 @@ import io.lettuce.core.resource.ClientResources.Builder; /** * Callback interface that can be implemented by beans wishing to customize the - * {@link ClientResources} via a {@link Builder} whilst retaining default + * {@link ClientResources} through a {@link Builder} whilst retaining default * auto-configuration. * * @author Stephane Nicoll diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/JedisClientConfigurationBuilderCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/JedisClientConfigurationBuilderCustomizer.java index 62d5fdd2072..637febbbec0 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/JedisClientConfigurationBuilderCustomizer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/JedisClientConfigurationBuilderCustomizer.java @@ -21,7 +21,7 @@ import org.springframework.data.redis.connection.jedis.JedisClientConfiguration. /** * Callback interface that can be implemented by beans wishing to customize the - * {@link JedisClientConfiguration} via a {@link JedisClientConfigurationBuilder + * {@link JedisClientConfiguration} through a {@link JedisClientConfigurationBuilder * JedisClientConfiguration.JedisClientConfigurationBuilder} whilst retaining default * auto-configuration. * diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceClientConfigurationBuilderCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceClientConfigurationBuilderCustomizer.java index 387e5383e64..722246834c4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceClientConfigurationBuilderCustomizer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceClientConfigurationBuilderCustomizer.java @@ -21,7 +21,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceClientConfigurat /** * Callback interface that can be implemented by beans wishing to customize the - * {@link LettuceClientConfiguration} via a {@link LettuceClientConfigurationBuilder + * {@link LettuceClientConfiguration} through a {@link LettuceClientConfigurationBuilder * LettuceClientConfiguration.LettuceClientConfigurationBuilder} whilst retaining default * auto-configuration. * diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/RestClientBuilderCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/RestClientBuilderCustomizer.java index 712166f2f2c..a6a52348a57 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/RestClientBuilderCustomizer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/RestClientBuilderCustomizer.java @@ -23,7 +23,7 @@ import org.elasticsearch.client.RestClientBuilder; /** * Callback interface that can be implemented by beans wishing to further customize the - * {@link org.elasticsearch.client.RestClient} via a {@link RestClientBuilder} whilst + * {@link org.elasticsearch.client.RestClient} through a {@link RestClientBuilder} whilst * retaining default auto-configuration. * * @author Brian Clozel diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayMigrationInitializer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayMigrationInitializer.java index 6f864abb5ed..8ed1c32f532 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayMigrationInitializer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayMigrationInitializer.java @@ -23,7 +23,7 @@ import org.springframework.core.Ordered; import org.springframework.util.Assert; /** - * {@link InitializingBean} used to trigger {@link Flyway} migration via the + * {@link InitializingBean} used to trigger {@link Flyway} migration through the * {@link FlywayMigrationStrategy}. * * @author Phillip Webb diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/ConditionalOnGraphQlSchema.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/ConditionalOnGraphQlSchema.java index 205a81ac933..59faab27da7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/ConditionalOnGraphQlSchema.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/ConditionalOnGraphQlSchema.java @@ -26,7 +26,7 @@ import org.springframework.context.annotation.Conditional; /** * {@link Conditional @Conditional} that only matches when a GraphQL schema is defined for - * the application, via schema files or infrastructure beans. + * the application, through schema files or infrastructure beans. * * @author Brian Clozel * @since 2.7.0 diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/gson/GsonBuilderCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/gson/GsonBuilderCustomizer.java index c62191097a0..26d3d2f0930 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/gson/GsonBuilderCustomizer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/gson/GsonBuilderCustomizer.java @@ -21,7 +21,7 @@ import com.google.gson.GsonBuilder; /** * Callback interface that can be implemented by beans wishing to further customize the - * {@link Gson} via {@link GsonBuilder} retaining its default auto-configuration. + * {@link Gson} through {@link GsonBuilder} retaining its default auto-configuration. * * @author Ivan Golovko * @since 2.0.0 diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationProperties.java index 65ace115b14..447029f3a81 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationProperties.java @@ -306,7 +306,7 @@ public class IntegrationProperties { public static class Server { /** - * Whether to handle message mapping for RSocket via Spring Integration. + * Whether to handle message mapping for RSocket through Spring Integration. */ private boolean messageMappingEnabled; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/Jackson2ObjectMapperBuilderCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/Jackson2ObjectMapperBuilderCustomizer.java index adf630e3971..ff6c8744d66 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/Jackson2ObjectMapperBuilderCustomizer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/Jackson2ObjectMapperBuilderCustomizer.java @@ -22,7 +22,7 @@ import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; /** * Callback interface that can be implemented by beans wishing to further customize the - * {@link ObjectMapper} via {@link Jackson2ObjectMapperBuilder} retaining its default + * {@link ObjectMapper} through {@link Jackson2ObjectMapperBuilder} retaining its default * auto-configuration. * * @author Grzegorz Poznachowski diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java index 0cbc87f222a..ae195a07e59 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java @@ -312,7 +312,7 @@ public class DataSourceProperties implements BeanClassLoaderAware, InitializingB } /** - * Allows the DataSource to be managed by the container and obtained via JNDI. The + * Allows the DataSource to be managed by the container and obtained through JNDI. The * {@code URL}, {@code driverClassName}, {@code username} and {@code password} fields * will be ignored when using JNDI lookups. * @param jndiName the JNDI name diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java index aafab7c8fdb..f0cb489fb7c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java @@ -324,7 +324,7 @@ public class JmsProperties { * *

* {@link javax.jms.Session#SESSION_TRANSACTED} is not defined as we take care of this - * already via a call to {@code setSessionTransacted}. + * already through a call to {@code setSessionTransacted}. */ public enum AcknowledgeMode { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapProperties.java index 239e97f32b5..159f76c7ce6 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapProperties.java @@ -139,19 +139,19 @@ public class LdapProperties { public static class Template { /** - * Whether PartialResultException should be ignored in searches via the + * Whether PartialResultException should be ignored in searches through the * LdapTemplate. */ private boolean ignorePartialResultException = false; /** - * Whether NameNotFoundException should be ignored in searches via the + * Whether NameNotFoundException should be ignored in searches through the * LdapTemplate. */ private boolean ignoreNameNotFoundException = false; /** - * Whether SizeLimitExceededException should be ignored in searches via the + * Whether SizeLimitExceededException should be ignored in searches through the * LdapTemplate. */ private boolean ignoreSizeLimitExceededException = true; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoClientSettingsBuilderCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoClientSettingsBuilderCustomizer.java index 1dce0872d6c..1a86be4d4b8 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoClientSettingsBuilderCustomizer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoClientSettingsBuilderCustomizer.java @@ -20,7 +20,7 @@ import com.mongodb.MongoClientSettings.Builder; /** * Callback interface that can be implemented by beans wishing to customize the - * {@link com.mongodb.MongoClientSettings} via a {@link Builder + * {@link com.mongodb.MongoClientSettings} through a {@link Builder * MongoClientSettings.Builder} whilst retaining default auto-configuration. * * @author Mark Paluch diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/DownloadConfigBuilderCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/DownloadConfigBuilderCustomizer.java index bb2fb2e83e3..f7565d92663 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/DownloadConfigBuilderCustomizer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/DownloadConfigBuilderCustomizer.java @@ -22,7 +22,7 @@ import de.flapdoodle.embed.process.config.store.ImmutableDownloadConfig.Builder; /** * Callback interface that can be implemented by beans wishing to customize the - * {@link DownloadConfig} via a {@link Builder} whilst retaining default + * {@link DownloadConfig} through a {@link Builder} whilst retaining default * auto-configuration. * * @author Michael Gmeiner diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/neo4j/ConfigBuilderCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/neo4j/ConfigBuilderCustomizer.java index 10885b17f25..52eb184e572 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/neo4j/ConfigBuilderCustomizer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/neo4j/ConfigBuilderCustomizer.java @@ -21,7 +21,8 @@ import org.neo4j.driver.Config.ConfigBuilder; /** * Callback interface that can be implemented by beans wishing to customize the - * {@link Config} via a {@link ConfigBuilder} whilst retaining default auto-configuration. + * {@link Config} through a {@link ConfigBuilder} whilst retaining default + * auto-configuration. * * @author Stephane Nicoll * @since 2.4.0 diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/r2dbc/ConnectionFactoryConfigurations.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/r2dbc/ConnectionFactoryConfigurations.java index e0c271a555e..4c000974f0f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/r2dbc/ConnectionFactoryConfigurations.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/r2dbc/ConnectionFactoryConfigurations.java @@ -126,7 +126,7 @@ abstract class ConnectionFactoryConfigurations { /** * {@link Condition} that checks that a {@link ConnectionPool} is requested. The - * condition matches if pooling was opt-in via configuration. If any of the + * condition matches if pooling was opt-in through configuration. If any of the * spring.r2dbc.pool.* properties have been configured, an exception is thrown if the * URL also contains pooling-related options or io.r2dbc.pool.ConnectionPool is not on * the class path. diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/r2dbc/ConnectionFactoryOptionsBuilderCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/r2dbc/ConnectionFactoryOptionsBuilderCustomizer.java index 4f110f18e56..86b1fd2e690 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/r2dbc/ConnectionFactoryOptionsBuilderCustomizer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/r2dbc/ConnectionFactoryOptionsBuilderCustomizer.java @@ -21,7 +21,7 @@ import io.r2dbc.spi.ConnectionFactoryOptions.Builder; /** * Callback interface that can be implemented by beans wishing to customize the - * {@link ConnectionFactoryOptions} via a {@link Builder} whilst retaining default + * {@link ConnectionFactoryOptions} through a {@link Builder} whilst retaining default * auto-configuration. * * @author Mark Paluch diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sql/init/R2dbcInitializationConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sql/init/R2dbcInitializationConfiguration.java index 8b4bbbf0e70..a7110b2c984 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sql/init/R2dbcInitializationConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sql/init/R2dbcInitializationConfiguration.java @@ -28,7 +28,7 @@ import org.springframework.r2dbc.connection.init.DatabasePopulator; import org.springframework.util.StringUtils; /** - * Configuration for initializing an SQL database accessed via an R2DBC + * Configuration for initializing an SQL database accessed through an R2DBC * {@link ConnectionFactory}. * * @author Andy Wilkinson diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/ErrorWebFluxAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/ErrorWebFluxAutoConfiguration.java index 7044688ab7c..2dc432e84f7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/ErrorWebFluxAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/ErrorWebFluxAutoConfiguration.java @@ -40,7 +40,7 @@ import org.springframework.web.reactive.config.WebFluxConfigurer; import org.springframework.web.reactive.result.view.ViewResolver; /** - * {@link EnableAutoConfiguration Auto-configuration} to render errors via a WebFlux + * {@link EnableAutoConfiguration Auto-configuration} to render errors through a WebFlux * {@link org.springframework.web.server.WebExceptionHandler}. * * @author Brian Clozel diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/ConditionalOnMissingFilterBean.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/ConditionalOnMissingFilterBean.java index d7f9d6ebb00..6d4b9a165aa 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/ConditionalOnMissingFilterBean.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/ConditionalOnMissingFilterBean.java @@ -33,7 +33,7 @@ import org.springframework.core.annotation.AliasFor; /** * {@link Conditional @Conditional} that only matches when no {@link Filter} beans of the * specified type are contained in the {@link BeanFactory}. This condition will detect - * both directly registered {@link Filter} beans as well as those registered via a + * both directly registered {@link Filter} beans as well as those registered through a * {@link FilterRegistrationBean}. *

* When placed on a {@code @Bean} method, the bean class defaults to the return type of diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/ErrorMvcAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/ErrorMvcAutoConfiguration.java index 6ffd246a4f6..acf78c671a7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/ErrorMvcAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/ErrorMvcAutoConfiguration.java @@ -74,8 +74,8 @@ import org.springframework.web.servlet.view.BeanNameViewResolver; import org.springframework.web.util.HtmlUtils; /** - * {@link EnableAutoConfiguration Auto-configuration} to render errors via an MVC error - * controller. + * {@link EnableAutoConfiguration Auto-configuration} to render errors through an MVC + * error controller. * * @author Dave Syer * @author Andy Wilkinson diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/scan/ScannedFactoryBeanConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/scan/ScannedFactoryBeanConfiguration.java index 0feab301afa..23dd5a86571 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/scan/ScannedFactoryBeanConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/scan/ScannedFactoryBeanConfiguration.java @@ -22,7 +22,7 @@ import org.springframework.context.annotation.Configuration; /** * Configuration for a factory bean produced by a bean method on a configuration class - * found via component scanning. + * found through component scanning. * * @author Andy Wilkinson */ diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/scan/ScannedFactoryBeanWithBeanMethodArgumentsConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/scan/ScannedFactoryBeanWithBeanMethodArgumentsConfiguration.java index 5cbed4c436b..f6a23e52d66 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/scan/ScannedFactoryBeanWithBeanMethodArgumentsConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/scan/ScannedFactoryBeanWithBeanMethodArgumentsConfiguration.java @@ -21,7 +21,7 @@ import org.springframework.context.annotation.Configuration; /** * Configuration for a factory bean produced by a bean method with arguments on a - * configuration class found via component scanning. + * configuration class found through component scanning. * * @author Andy Wilkinson */ diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java index 36b333f1400..9167514e935 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java @@ -337,8 +337,7 @@ class WebFluxAutoConfigurationTests { assertThat(context.getBean("webFluxValidator")) .isSameAs(context.getBean(ValidatorWebFluxConfigurer.class).validator); // Primary Spring validator is the auto-configured one as the WebFlux - // one has been - // customized via a WebFluxConfigurer + // one has been customized through a WebFluxConfigurer assertThat(context.getBean(Validator.class)).isEqualTo(context.getBean("defaultValidator")); }); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java index d75d235df2c..f1f4e6e1525 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java @@ -760,7 +760,7 @@ class WebMvcAutoConfigurationTests { assertThat(context).getBeanNames(Validator.class).containsOnly("defaultValidator", "mvcValidator"); assertThat(context.getBean("mvcValidator")).isSameAs(context.getBean(MvcValidator.class).validator); // Primary Spring validator is the auto-configured one as the MVC one - // has been customized via a WebMvcConfigurer + // has been customized through a WebMvcConfigurer assertThat(context.getBean(Validator.class)).isEqualTo(context.getBean("defaultValidator")); }); } diff --git a/spring-boot-project/spring-boot-cli/samples/rabbit.groovy b/spring-boot-project/spring-boot-cli/samples/rabbit.groovy index 82757ddb3ab..38dca9ce7b8 100644 --- a/spring-boot-project/spring-boot-cli/samples/rabbit.groovy +++ b/spring-boot-project/spring-boot-cli/samples/rabbit.groovy @@ -29,4 +29,4 @@ class RabbitExample implements CommandLineRunner { new org.springframework.amqp.core.Queue("spring-boot", false) } -} \ No newline at end of file +} diff --git a/spring-boot-project/spring-boot-cli/src/intTest/java/org/springframework/boot/cli/infrastructure/CommandLineInvoker.java b/spring-boot-project/spring-boot-cli/src/intTest/java/org/springframework/boot/cli/infrastructure/CommandLineInvoker.java index f6b56eb015b..313c32bb1ca 100644 --- a/spring-boot-project/spring-boot-cli/src/intTest/java/org/springframework/boot/cli/infrastructure/CommandLineInvoker.java +++ b/spring-boot-project/spring-boot-cli/src/intTest/java/org/springframework/boot/cli/infrastructure/CommandLineInvoker.java @@ -41,8 +41,8 @@ import org.springframework.util.Assert; import org.springframework.util.StreamUtils; /** - * Utility to invoke the command line in the same way as a user would, i.e. via the shell - * script in the package's bin directory. + * Utility to invoke the command line in the same way as a user would, i.e. through the + * shell script in the package's bin directory. * * @author Andy Wilkinson * @author Phillip Webb diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyBeansTransformation.java b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyBeansTransformation.java index f286a273848..e082012c17f 100644 --- a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyBeansTransformation.java +++ b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyBeansTransformation.java @@ -35,8 +35,8 @@ import org.springframework.core.annotation.Order; /** * {@link ASTTransformation} to resolve beans declarations inside application source * files. Users only need to define a beans{} DSL element, and this - * transformation will remove it and make it accessible to the Spring application via an - * interface. + * transformation will remove it and make it accessible to the Spring application through + * an interface. * * @author Dave Syer * @since 1.0.0 diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompilerScope.java b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompilerScope.java index adf22b2cb7f..8a5a085804e 100644 --- a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompilerScope.java +++ b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompilerScope.java @@ -26,7 +26,7 @@ public enum GroovyCompilerScope { /** * Default scope, exposes groovy.jar (loaded from the parent) and the shared cli - * package (loaded via groovy classloader). + * package (loaded through groovy classloader). */ DEFAULT, diff --git a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayload.java b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayload.java index 4bd12c08ad1..10efd02efc3 100644 --- a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayload.java +++ b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayload.java @@ -34,7 +34,7 @@ import org.springframework.util.Assert; import org.springframework.util.StringUtils; /** - * Encapsulates a payload data sent via a HTTP tunnel. + * Encapsulates a payload data sent over a HTTP tunnel. * * @author Phillip Webb * @since 1.3.0 diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc index 13cade03b2e..761ac0e033e 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc @@ -818,7 +818,7 @@ Alternatively, additional auto-configurations can be added for any use of a slic In this example, the `com.example.IntegrationAutoConfiguration` is enabled on every test annotated with `@JdbcTest`. -TIP: You can use comments via `#` in this file. +TIP: You can use comments with `#` in this file. TIP: A slice or `@AutoConfigure...` annotation can be customized this way as long as it is meta-annotated with `@ImportAutoConfiguration`. diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/testing.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/testing.adoc index 60d1f824f75..882d9c14bc4 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/testing.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/testing.adoc @@ -42,7 +42,7 @@ The above configuration allows Neo4j-related beans in the application to communi [[howto.testing.slice-tests]] === Structure `@Configuration` classes for inclusion in slice tests Slice tests work by restricting Spring Framework's component scanning to a limited set of components based on their type. -For any beans that are not created via component scanning, for example, beans that are created using the `@Bean` annotation, slice tests will not be able to include/exclude them from the application context. +For any beans that are not created through component scanning, for example, beans that are created using the `@Bean` annotation, slice tests will not be able to include/exclude them from the application context. Consider this example: [source,java,indent=0,subs="verbatim"] diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/io/whats-next.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/io/whats-next.adoc index 2a6434165c9..442122c6664 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/io/whats-next.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/io/whats-next.adoc @@ -1,6 +1,6 @@ [[io.whats-next]] == What to Read Next -You should now have a good understanding of Spring Boot's <> and the various technologies that Spring Boot provides support for via auto-configuration. +You should now have a good understanding of Spring Boot's <> and the various technologies that Spring Boot provides support for through auto-configuration. The next few sections go into detail about deploying applications to cloud platforms. You can read about <> in the next section or skip to the <> section. diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/traditionaldeployment/convertexistingapplication/MyApplication.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/traditionaldeployment/convertexistingapplication/MyApplication.java index d3fb91e99ca..fa537973f8e 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/traditionaldeployment/convertexistingapplication/MyApplication.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/traditionaldeployment/convertexistingapplication/MyApplication.java @@ -27,7 +27,8 @@ public class MyApplication extends SpringBootServletInitializer { @Override protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { // Customize the application or call application.sources(...) to add sources - // Since our example is itself a @Configuration class (via @SpringBootApplication) + // Since our example is itself a @Configuration class (through + // @SpringBootApplication) // we actually do not need to override this method. return application; } diff --git a/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/traditionaldeployment/convertexistingapplication/MyApplication.kt b/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/traditionaldeployment/convertexistingapplication/MyApplication.kt index 4c84f470be4..62f3b7085e1 100644 --- a/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/traditionaldeployment/convertexistingapplication/MyApplication.kt +++ b/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/traditionaldeployment/convertexistingapplication/MyApplication.kt @@ -26,7 +26,7 @@ class MyApplication : SpringBootServletInitializer() { override fun configure(application: SpringApplicationBuilder): SpringApplicationBuilder { // Customize the application or call application.sources(...) to add sources - // Since our example is itself a @Configuration class (via @SpringBootApplication) + // Since our example is itself a @Configuration class (through @SpringBootApplication) // we actually do not need to override this method. return application } diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTest.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTest.java index a2730b8f5e8..40ba0f9ef17 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTest.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTest.java @@ -48,7 +48,7 @@ import org.springframework.test.context.junit.jupiter.SpringExtension; *

* By default, tests annotated with {@code JsonTest} will also initialize * {@link JacksonTester}, {@link JsonbTester} and {@link GsonTester} fields. More - * fine-grained control can be provided via the + * fine-grained control can be provided through the * {@link AutoConfigureJsonTesters @AutoConfigureJsonTesters} annotation. *

* When using JUnit 4, this annotation should be used in combination with diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/SpringBootMockMvcBuilderCustomizer.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/SpringBootMockMvcBuilderCustomizer.java index 20d4e0e6d04..04117b71198 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/SpringBootMockMvcBuilderCustomizer.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/SpringBootMockMvcBuilderCustomizer.java @@ -48,8 +48,8 @@ import org.springframework.web.context.WebApplicationContext; /** * {@link MockMvcBuilderCustomizer} for a typical Spring Boot application. Usually applied - * automatically via {@link AutoConfigureMockMvc @AutoConfigureMockMvc}, but may also be - * used directly. + * automatically through {@link AutoConfigureMockMvc @AutoConfigureMockMvc}, but may also + * be used directly. * * @author Phillip Webb * @author Andy Wilkinson diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/json/app/ExampleCustomObject.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/json/app/ExampleCustomObject.java index cc9b68901c9..ce102284905 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/json/app/ExampleCustomObject.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/json/app/ExampleCustomObject.java @@ -17,7 +17,7 @@ package org.springframework.boot.test.autoconfigure.json.app; /** - * Example object to read/write as JSON via {@link ExampleJsonComponent}. + * Example object to read/write as JSON through {@link ExampleJsonComponent}. * * @author Phillip Webb */ diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestWithWebAppConfigurationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestWithWebAppConfigurationTests.java index a3d447d4a8b..018edb973ec 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestWithWebAppConfigurationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestWithWebAppConfigurationTests.java @@ -30,7 +30,7 @@ import org.springframework.test.context.web.WebAppConfiguration; import static org.assertj.core.api.Assertions.assertThat; /** - * Tests for {@link WebMvcTest @WebMvcTest} when loading resources via the + * Tests for {@link WebMvcTest @WebMvcTest} when loading resources through the * {@link ServletContext} with {@link WebAppConfiguration @WebAppConfiguration}. * * @author Lorenzo Dee diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java index 447364eb39d..b7068549ba5 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java @@ -311,7 +311,7 @@ public class SpringBootContextLoader extends AbstractContextLoader { /** * Adapts a {@link ContextCustomizer} to a {@link ApplicationContextInitializer} so - * that it can be triggered via {@link SpringApplication}. + * that it can be triggered through {@link SpringApplication}. */ private static class ContextCustomizerAdapter implements ApplicationContextInitializer { diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockReset.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockReset.java index afccd5926cf..984e0f0e5ac 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockReset.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockReset.java @@ -28,7 +28,7 @@ import org.mockito.mock.MockCreationSettings; import org.springframework.util.Assert; /** - * Reset strategy used on a mock bean. Usually applied to a mock via the + * Reset strategy used on a mock bean. Usually applied to a mock through the * {@link MockBean @MockBean} annotation but can also be directly applied to any mock in * the {@code ApplicationContext} using the static methods. * diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCaptureExtension.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCaptureExtension.java index 235b7720def..0270dab4964 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCaptureExtension.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCaptureExtension.java @@ -31,7 +31,7 @@ import org.junit.jupiter.api.extension.ParameterResolver; /** * JUnit Jupiter {@code @Extension} to capture {@link System#out System.out} and * {@link System#err System.err}. Can be registered for an entire test class or for an - * individual test method via {@link ExtendWith @ExtendWith}. This extension provides + * individual test method through {@link ExtendWith @ExtendWith}. This extension provides * {@linkplain ParameterResolver parameter resolution} for a {@link CapturedOutput} * instance which can be used to assert that the correct output was written. *

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 6b4acc454f3..b7ebf7d35f9 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 @@ -57,8 +57,9 @@ import org.springframework.web.util.UriTemplateHandler; /** * Convenient alternative of {@link RestTemplate} that is suitable for integration tests. * {@code TestRestTemplate} is fault-tolerant. This means that 4xx and 5xx do not result - * in an exception being thrown and can instead be detected via the {@link ResponseEntity - * response entity} and its {@link ResponseEntity#getStatusCode() status code}. + * in an exception being thrown and can instead be detected through the + * {@link ResponseEntity response entity} and its {@link ResponseEntity#getStatusCode() + * status code}. *

* A {@code TestRestTemplate} can optionally carry Basic authentication headers. If Apache * Http Client 4.3.2 or better is available (recommended) it will be used as the client, diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/json/JacksonTesterIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/json/JacksonTesterIntegrationTests.java index e3c78cf5e16..7565cad3046 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/json/JacksonTesterIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/json/JacksonTesterIntegrationTests.java @@ -88,9 +88,9 @@ class JacksonTesterIntegrationTests { void parseSpecialCharactersTest() throws Exception { JacksonTester.initFields(this, new ObjectMapper()); // Confirms that the handling of special characters is symmetrical between - // the serialization (via the JacksonTester) and the parsing (via json-path). By - // default json-path uses SimpleJson as its parser, which has a slightly different - // behavior to Jackson and breaks the symmetry. JacksonTester + // the serialization (through the JacksonTester) and the parsing (through + // json-path). By default json-path uses SimpleJson as its parser, which has a + // slightly different behavior to Jackson and breaks the symmetry. JacksonTester // configures json-path to use Jackson for evaluating the path expressions and // restores the symmetry. See gh-15727 String stringWithSpecialCharacters = "\u0006\u007F"; diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/system/OutputExtensionExtendWithTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/system/OutputExtensionExtendWithTests.java index 901d044e73c..b85e184a6e0 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/system/OutputExtensionExtendWithTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/system/OutputExtensionExtendWithTests.java @@ -25,7 +25,8 @@ import org.junit.jupiter.api.extension.ExtensionContext; import static org.assertj.core.api.Assertions.assertThat; /** - * Tests for {@link OutputCaptureExtension} when used via {@link ExtendWith @ExtendWith}. + * Tests for {@link OutputCaptureExtension} when used through + * {@link ExtendWith @ExtendWith}. * * @author Madhura Bhave */ diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSONObject.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSONObject.java index 3f100dc4846..bb1cdfcf07a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSONObject.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSONObject.java @@ -507,7 +507,7 @@ public class JSONObject { /** * Returns the value mapped by {@code name} if it exists and is a long or can be * coerced to a long. Note that JSON represents numbers as doubles, so this is - * lossy; use strings to transfer numbers via JSON. + * lossy; use strings to transfer numbers over JSON. * @param name the name of the property * @return the value * @throws JSONException if the mapping doesn't exist or cannot be coerced to a long. @@ -537,7 +537,7 @@ public class JSONObject { * Returns the value mapped by {@code name} if it exists and is a long or can be * coerced to a long. Returns {@code fallback} otherwise. Note that JSON represents * numbers as doubles, so this is lossy; use strings to transfer - * numbers via JSON. + * numbers over JSON. * @param name the name of the property * @param fallback a fallback value * @return the value or {@code fallback} diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/ImmutableSimpleProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/ImmutableSimpleProperties.java index bdd154f27cb..eeaf517a52b 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/ImmutableSimpleProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/ImmutableSimpleProperties.java @@ -43,8 +43,8 @@ public class ImmutableSimpleProperties { // An interface can still be injected because it might have a converter private final Comparator comparator; - // Even if it is not exposed, we're still offering a way to bind the value via the - // constructor so it should be present in the metadata + // Even if it is not exposed, we're still offering a way to bind the value through the + // constructor, so it should be present in the metadata @SuppressWarnings("unused") private final Long counter; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/asciidoc/integrating-with-actuator.adoc b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/asciidoc/integrating-with-actuator.adoc index 535e7948e0f..a3a39ceeb37 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/asciidoc/integrating-with-actuator.adoc +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/asciidoc/integrating-with-actuator.adoc @@ -7,7 +7,7 @@ == Generating Build Information Spring Boot Actuator's `info` endpoint automatically publishes information about your build in the presence of a `META-INF/build-info.properties` file. A {build-info-javadoc}[`BuildInfo`] task is provided to generate this file. -The easiest way to use the task is via the plugin's DSL: +The easiest way to use the task is through the plugin's DSL: [source,groovy,indent=0,subs="verbatim,attributes",role="primary"] .Groovy diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java index a9390eb60bb..3a95735e170 100755 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java @@ -46,7 +46,7 @@ import org.springframework.boot.loader.archive.JarFileArchive; import org.springframework.boot.loader.util.SystemPropertyUtils; /** - * {@link Launcher} for archives with user-configured classpath and main class via a + * {@link Launcher} for archives with user-configured classpath and main class through a * properties file. This model is often more flexible and more amenable to creating * well-behaved OS-level services than a model based on executable jars. *

diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/running.adoc b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/running.adoc index 369b633ff25..34495df5b03 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/running.adoc +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/running.adoc @@ -102,7 +102,7 @@ include::../maven/running/system-properties-pom.xml[tags=system-properties] ---- If the value is empty or not defined (that is `), the system property is set with an empty String as the value. -Maven trims values specified in the pom so it is not possible to specify a System property which needs to start or end with a space via this mechanism: consider using `jvmArguments` instead. +Maven trims values specified in the pom, so it is not possible to specify a System property which needs to start or end with a space through this mechanism: consider using `jvmArguments` instead. Any String typed Maven variable can be passed as system properties. Any attempt to pass any other Maven variable type (for example a `List` or a `URL` variable) will cause the variable expression to be passed literally (unevaluated). diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageMojo.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageMojo.java index c70ef3e8d47..1fab6023e1a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageMojo.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageMojo.java @@ -112,21 +112,23 @@ public class BuildImageMojo extends AbstractPackagerMojo { private Image image; /** - * Alias for {@link Image#name} to support configuration via command-line property. + * Alias for {@link Image#name} to support configuration through command-line + * property. * @since 2.3.0 */ @Parameter(property = "spring-boot.build-image.imageName", readonly = true) String imageName; /** - * Alias for {@link Image#builder} to support configuration via command-line property. + * Alias for {@link Image#builder} to support configuration through command-line + * property. * @since 2.3.0 */ @Parameter(property = "spring-boot.build-image.builder", readonly = true) String imageBuilder; /** - * Alias for {@link Image#runImage} to support configuration via command-line + * Alias for {@link Image#runImage} to support configuration through command-line * property. * @since 2.3.1 */ @@ -134,7 +136,7 @@ public class BuildImageMojo extends AbstractPackagerMojo { String runImage; /** - * Alias for {@link Image#cleanCache} to support configuration via command-line + * Alias for {@link Image#cleanCache} to support configuration through command-line * property. * @since 2.4.0 */ @@ -142,20 +144,22 @@ public class BuildImageMojo extends AbstractPackagerMojo { Boolean cleanCache; /** - * Alias for {@link Image#pullPolicy} to support configuration via command-line + * Alias for {@link Image#pullPolicy} to support configuration through command-line * property. */ @Parameter(property = "spring-boot.build-image.pullPolicy", readonly = true) PullPolicy pullPolicy; /** - * Alias for {@link Image#publish} to support configuration via command-line property. + * Alias for {@link Image#publish} to support configuration through command-line + * property. */ @Parameter(property = "spring-boot.build-image.publish", readonly = true) Boolean publish; /** - * Alias for {@link Image#network} to support configuration via command-line property. + * Alias for {@link Image#network} to support configuration through command-line + * property. * @since 2.6.0 */ @Parameter(property = "spring-boot.build-image.network", readonly = true) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/StartMojo.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/StartMojo.java index c4f2b3a52f6..f202a082733 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/StartMojo.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/StartMojo.java @@ -185,7 +185,7 @@ public class StartMojo extends AbstractRunMojo { } } catch (IOException ex) { - throw new MojoFailureException("Could not contact Spring Boot application via JMX on port " + this.jmxPort + throw new MojoFailureException("Could not contact Spring Boot application over JMX on port " + this.jmxPort + ". Please make sure that no other process is using that port", ex); } catch (Exception ex) { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/system/OutputCaptureExtension.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/system/OutputCaptureExtension.java index 462eb4f9bdf..6f95d279662 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/system/OutputCaptureExtension.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/system/OutputCaptureExtension.java @@ -31,7 +31,7 @@ import org.junit.jupiter.api.extension.ParameterResolver; /** * JUnit Jupiter {@code @Extension} to capture {@link System#out System.out} and * {@link System#err System.err}. Can be registered for an entire test class or for an - * individual test method via {@link ExtendWith @ExtendWith}. This extension provides + * individual test method through {@link ExtendWith @ExtendWith}. This extension provides * {@linkplain ParameterResolver parameter resolution} for a {@link CapturedOutput} * instance which can be used to assert that the correct output was written. *

diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ApplicationContextFactory.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ApplicationContextFactory.java index 7d0a5172291..bf8305d0511 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ApplicationContextFactory.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ApplicationContextFactory.java @@ -77,7 +77,7 @@ public interface ApplicationContextFactory { /** * Creates an {@code ApplicationContextFactory} that will create contexts by - * instantiating the given {@code contextClass} via its primary constructor. + * instantiating the given {@code contextClass} through its primary constructor. * @param contextClass the context class * @return the factory that will instantiate the context class * @see BeanUtils#instantiateClass(Class) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ConfigurableBootstrapContext.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ConfigurableBootstrapContext.java index 432c1a70784..876d076eb33 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ConfigurableBootstrapContext.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ConfigurableBootstrapContext.java @@ -17,7 +17,7 @@ package org.springframework.boot; /** - * A {@link BootstrapContext} that also provides configuration methods via the + * A {@link BootstrapContext} that also provides configuration methods through the * {@link BootstrapRegistry} interface. * * @author Phillip Webb 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 de4efa08b0a..e9b0bbd15c2 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 @@ -513,7 +513,7 @@ public class SpringApplication { /** * Configure which profiles are active (or active by default) for this application * environment. Additional profiles may be activated during configuration file - * processing via the {@code spring.profiles.active} property. + * processing through the {@code spring.profiles.active} property. * @param environment this application's environment * @param args arguments passed to the {@code run} method * @see #configureEnvironment(ConfigurableEnvironment, String[]) @@ -1305,8 +1305,8 @@ public class SpringApplication { /** * A basic main that can be used to launch an application. This method is useful when - * application sources are defined via a {@literal --spring.main.sources} command line - * argument. + * application sources are defined through a {@literal --spring.main.sources} command + * line argument. *

* Most developers will want to define their own main method and call the * {@link #run(Class, String...) run} method instead. diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplicationRunListener.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplicationRunListener.java index 7b8df166509..98e24971de9 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplicationRunListener.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplicationRunListener.java @@ -25,9 +25,9 @@ import org.springframework.core.io.support.SpringFactoriesLoader; /** * Listener for the {@link SpringApplication} {@code run} method. - * {@link SpringApplicationRunListener}s are loaded via the {@link SpringFactoriesLoader} - * and should declare a public constructor that accepts a {@link SpringApplication} - * instance and a {@code String[]} of arguments. A new + * {@link SpringApplicationRunListener}s are loaded through the + * {@link SpringFactoriesLoader} and should declare a public constructor that accepts a + * {@link SpringApplication} instance and a {@code String[]} of arguments. A new * {@link SpringApplicationRunListener} instance will be created for each run. * * @author Phillip Webb diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringBootExceptionReporter.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringBootExceptionReporter.java index 8369d71fbb8..222f2dc04a4 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringBootExceptionReporter.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringBootExceptionReporter.java @@ -22,7 +22,7 @@ import org.springframework.core.io.support.SpringFactoriesLoader; /** * Callback interface used to support custom reporting of {@link SpringApplication} - * startup errors. {@link SpringBootExceptionReporter reporters} are loaded via the + * startup errors. {@link SpringBootExceptionReporter reporters} are loaded through the * {@link SpringFactoriesLoader} and must declare a public constructor with a single * {@link ConfigurableApplicationContext} parameter. * diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/admin/SpringApplicationAdminMXBean.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/admin/SpringApplicationAdminMXBean.java index 3bc93ec7b50..41cb83f9ee8 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/admin/SpringApplicationAdminMXBean.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/admin/SpringApplicationAdminMXBean.java @@ -17,7 +17,7 @@ package org.springframework.boot.admin; /** - * An MBean contract to control and monitor a running {@code SpringApplication} via JMX. + * An MBean contract to control and monitor a running {@code SpringApplication} over JMX. * Intended for internal use only. * * @author Stephane Nicoll 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 31ec87d61f2..732f36a25ce 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 @@ -24,7 +24,7 @@ import org.springframework.context.ApplicationContext; * Components can inject this class to get the current state information. To update the * state of the application an {@link AvailabilityChangeEvent} should be * {@link ApplicationContext#publishEvent published} to the application context with - * directly or via {@link AvailabilityChangeEvent#publish}. + * directly or through {@link AvailabilityChangeEvent#publish}. * * @author Brian Clozel * @author Phillip Webb 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 792a1569f41..d34f88f5050 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 @@ -50,7 +50,7 @@ import org.springframework.util.StringUtils; * {@link ConfigDataEnvironmentContributors} by wrapping property sources from the Spring * {@link Environment} and adding the initial set of locations. *

- * The initial locations can be influenced via the {@link #LOCATION_PROPERTY}, + * The initial locations can be influenced through the {@link #LOCATION_PROPERTY}, * {@value #ADDITIONAL_LOCATION_PROPERTY} and {@value #IMPORT_PROPERTY} properties. If no * explicit properties are set, the {@link #DEFAULT_SEARCH_LOCATIONS} will be used. * 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 c9636ed4ccb..7966fa927b0 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 @@ -34,7 +34,8 @@ import org.springframework.core.log.LogMessage; import org.springframework.util.Assert; /** - * A collection of {@link ConfigDataLoader} instances loaded via {@code spring.factories}. + * A collection of {@link ConfigDataLoader} instances loaded through + * {@code spring.factories}. * * @author Phillip Webb * @author Madhura Bhave 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 4a36b384655..03be5e3a50f 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 @@ -357,7 +357,7 @@ public class ConfigFileApplicationListener implements EnvironmentPostProcessor, Set includedViaProperty = getProfiles(binder, INCLUDE_PROFILES_PROPERTY); List otherActiveProfiles = getOtherActiveProfiles(activatedViaProperty, includedViaProperty); this.profiles.addAll(otherActiveProfiles); - // Any pre-existing active profiles set via property sources (e.g. + // Any pre-existing active profiles set through property sources (e.g. // System properties) take precedence over those added in config files. this.profiles.addAll(includedViaProperty); addActiveProfiles(activatedViaProperty); diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesScanRegistrar.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesScanRegistrar.java index b93101c21a7..13d00af7667 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesScanRegistrar.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesScanRegistrar.java @@ -39,7 +39,8 @@ import org.springframework.util.StringUtils; /** * {@link ImportBeanDefinitionRegistrar} for registering - * {@link ConfigurationProperties @ConfigurationProperties} bean definitions via scanning. + * {@link ConfigurationProperties @ConfigurationProperties} bean definitions through + * scanning. * * @author Madhura Bhave * @author Phillip Webb diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/PropertyMapper.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/PropertyMapper.java index 7fc758eea40..4d8b0df5257 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/PropertyMapper.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/PropertyMapper.java @@ -181,7 +181,8 @@ public final class PropertyMapper { } /** - * Return an adapted version of the source changed via the given adapter function. + * Return an adapted version of the source changed through the given adapter + * function. * @param the resulting type * @param adapter the adapter to apply * @return a new adapted source instance diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/convert/ApplicationConversionService.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/convert/ApplicationConversionService.java index 06f49fe4daa..4163fd958b7 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/convert/ApplicationConversionService.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/convert/ApplicationConversionService.java @@ -153,7 +153,7 @@ public class ApplicationConversionService extends FormattingConversionService { * type. * @param sourceType the source type to test * @param targetType the target type to test - * @return if conversion happens via an {@code ObjectTo...} converter + * @return if conversion happens through an {@code ObjectTo...} converter * @since 2.4.3 */ public boolean isConvertViaObjectSourceType(TypeDescriptor sourceType, TypeDescriptor targetType) { diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/EnvironmentPostProcessorApplicationListener.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/EnvironmentPostProcessorApplicationListener.java index e43a39fe549..c9684f3dcee 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/EnvironmentPostProcessorApplicationListener.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/EnvironmentPostProcessorApplicationListener.java @@ -53,7 +53,7 @@ public class EnvironmentPostProcessorApplicationListener implements SmartApplica /** * Create a new {@link EnvironmentPostProcessorApplicationListener} with - * {@link EnvironmentPostProcessor} classes loaded via {@code spring.factories}. + * {@link EnvironmentPostProcessor} classes loaded through {@code spring.factories}. */ public EnvironmentPostProcessorApplicationListener() { this(EnvironmentPostProcessorsFactory::fromSpringFactories, new DeferredLogs()); diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/PropertySourceLoader.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/PropertySourceLoader.java index c3740c1728d..7ee59c71aa3 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/PropertySourceLoader.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/PropertySourceLoader.java @@ -24,7 +24,7 @@ import org.springframework.core.io.Resource; import org.springframework.core.io.support.SpringFactoriesLoader; /** - * Strategy interface located via {@link SpringFactoriesLoader} and used to load a + * Strategy interface located through {@link SpringFactoriesLoader} and used to load a * {@link PropertySource}. * * @author Dave Syer diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/LoggerGroups.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/LoggerGroups.java index a0790c8ea2f..50a4dc0a04d 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/LoggerGroups.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/LoggerGroups.java @@ -22,7 +22,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; /** - * Logger groups configured via the Spring Environment. + * Logger groups configured through the Spring Environment. * * @author HaiTao Zhang * @author Phillip Webb diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/context/RSocketPortInfoApplicationContextInitializer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/context/RSocketPortInfoApplicationContextInitializer.java index aede35e6770..522d2f8482e 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/context/RSocketPortInfoApplicationContextInitializer.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/context/RSocketPortInfoApplicationContextInitializer.java @@ -35,7 +35,7 @@ import org.springframework.core.env.PropertySource; * {@link ApplicationContextInitializer} that sets {@link Environment} properties for the * ports that {@link RSocketServer} servers are actually listening on. The property * {@literal "local.rsocket.server.port"} can be injected directly into tests using - * {@link Value @Value} or obtained via the {@link Environment}. + * {@link Value @Value} or obtained through the {@link Environment}. *

* Properties are automatically propagated up to any parent context. * diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/validation/MessageSourceMessageInterpolator.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/validation/MessageSourceMessageInterpolator.java index 36342c8653e..4f233739a1a 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/validation/MessageSourceMessageInterpolator.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/validation/MessageSourceMessageInterpolator.java @@ -26,7 +26,7 @@ import org.springframework.context.MessageSource; import org.springframework.context.i18n.LocaleContextHolder; /** - * Resolves any message parameters via {@link MessageSource} and then interpolates a + * Resolves any message parameters through {@link MessageSource} and then interpolates a * message using the underlying {@link MessageInterpolator}. * * @author Dmytro Nosan diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/context/ServerPortInfoApplicationContextInitializer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/context/ServerPortInfoApplicationContextInitializer.java index 3914964b25f..0d0c2540322 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/context/ServerPortInfoApplicationContextInitializer.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/context/ServerPortInfoApplicationContextInitializer.java @@ -36,7 +36,7 @@ import org.springframework.util.StringUtils; * {@link ApplicationContextInitializer} that sets {@link Environment} properties for the * ports that {@link WebServer} servers are actually listening on. The property * {@literal "local.server.port"} can be injected directly into tests using - * {@link Value @Value} or obtained via the {@link Environment}. + * {@link Value @Value} or obtained through the {@link Environment}. *

* If the {@link WebServerInitializedEvent} has a * {@link WebServerApplicationContext#getServerNamespace() server namespace} , it will be diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/context/AnnotationConfigReactiveWebApplicationContext.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/context/AnnotationConfigReactiveWebApplicationContext.java index 03797d49481..62c2dec6d86 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/context/AnnotationConfigReactiveWebApplicationContext.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/context/AnnotationConfigReactiveWebApplicationContext.java @@ -33,7 +33,7 @@ import org.springframework.stereotype.Component; *

* Note: In case of multiple {@code @Configuration} classes, later {@code @Bean} * definitions will override ones defined in earlier loaded files. This can be leveraged - * to deliberately override certain bean definitions via an extra Configuration class. + * to deliberately override certain bean definitions through an extra Configuration class. * * @author Phillip Webb * @author Stephane Nicoll diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/context/AnnotationConfigReactiveWebServerApplicationContext.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/context/AnnotationConfigReactiveWebServerApplicationContext.java index 42e342088aa..2b19bfc651e 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/context/AnnotationConfigReactiveWebServerApplicationContext.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/context/AnnotationConfigReactiveWebServerApplicationContext.java @@ -50,7 +50,7 @@ import org.springframework.util.ObjectUtils; *

* Note: In case of multiple {@code @Configuration} classes, later {@code @Bean} * definitions will override ones defined in earlier loaded files. This can be leveraged - * to deliberately override certain bean definitions via an extra Configuration class. + * to deliberately override certain bean definitions through an extra Configuration class. * * @author Phillip Webb * @since 2.0.0 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 ba45a596271..b09a34ce451 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 @@ -39,7 +39,7 @@ import org.springframework.web.filter.DelegatingFilterProxy; * marked {@code @Lazy} it won't be instantiated at all until the filter is called. *

* Registrations can be associated with {@link #setUrlPatterns URL patterns} and/or - * servlets (either by {@link #setServletNames name} or via a + * servlets (either by {@link #setServletNames name} or through a * {@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 48e86aeb18f..47638397c26 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 @@ -29,9 +29,9 @@ 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 - * URL pattern or servlets are specified the filter will be associated to '/*'. The filter - * name will be deduced if not specified. + * name} or through 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. * * @param the type of {@link Filter} to register * @author Phillip Webb diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletComponentHandler.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletComponentHandler.java index f886120cb0b..642ef8e31e1 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletComponentHandler.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletComponentHandler.java @@ -28,7 +28,7 @@ import org.springframework.core.type.filter.TypeFilter; import org.springframework.util.Assert; /** - * Abstract base class for handlers of Servlet components discovered via classpath + * Abstract base class for handlers of Servlet components discovered through classpath * scanning. * * @author Andy Wilkinson diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/AnnotationConfigServletWebApplicationContext.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/AnnotationConfigServletWebApplicationContext.java index b9a5ff0bd67..493271b4db2 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/AnnotationConfigServletWebApplicationContext.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/AnnotationConfigServletWebApplicationContext.java @@ -49,7 +49,7 @@ import org.springframework.web.context.support.GenericWebApplicationContext; *

* Note: In case of multiple {@code @Configuration} classes, later {@code @Bean} * definitions will override ones defined in earlier loaded files. This can be leveraged - * to deliberately override certain bean definitions via an extra Configuration class. + * to deliberately override certain bean definitions through an extra Configuration class. * * @author Stephane Nicoll * @since 2.2.0 diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/AnnotationConfigServletWebServerApplicationContext.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/AnnotationConfigServletWebServerApplicationContext.java index cc908d8b3a9..997930a40fd 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/AnnotationConfigServletWebServerApplicationContext.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/AnnotationConfigServletWebServerApplicationContext.java @@ -47,7 +47,7 @@ import org.springframework.util.ClassUtils; *

* Note: In case of multiple {@code @Configuration} classes, later {@code @Bean} * definitions will override ones defined in earlier loaded files. This can be leveraged - * to deliberately override certain bean definitions via an extra Configuration class. + * to deliberately override certain bean definitions through an extra Configuration class. * * @author Phillip Webb * @since 1.0.0 diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/XmlServletWebServerApplicationContext.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/XmlServletWebServerApplicationContext.java index 3543e19e145..beeb5455cd7 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/XmlServletWebServerApplicationContext.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/XmlServletWebServerApplicationContext.java @@ -29,7 +29,7 @@ import org.springframework.web.context.support.XmlWebApplicationContext; *

* Note: In case of multiple config locations, later bean definitions will override ones * defined in earlier loaded files. This can be leveraged to deliberately override certain - * bean definitions via an extra XML file. + * bean definitions through an extra XML file. * * @author Phillip Webb * @since 1.0.0 diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/support/SpringBootServletInitializer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/support/SpringBootServletInitializer.java index 61d4595fa91..45de1b0f5fa 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/support/SpringBootServletInitializer.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/support/SpringBootServletInitializer.java @@ -81,7 +81,7 @@ public abstract class SpringBootServletInitializer implements WebApplicationInit /** * Set if the {@link ErrorPageFilter} should be registered. Set to {@code false} if - * error page mappings should be handled via the server and not Spring Boot. + * error page mappings should be handled through the server and not Spring Boot. * @param registerErrorPageFilter if the {@link ErrorPageFilter} should be registered. */ protected final void setRegisterErrorPageFilter(boolean registerErrorPageFilter) { 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 550866d93ec..5e3c134b033 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 @@ -440,7 +440,7 @@ class ConfigFileApplicationListenerTests { @Test void profilesAddedToEnvironmentAndViaProperty(CapturedOutput output) { - // External profile takes precedence over profile added via the environment + // External profile takes precedence over profile added through the environment TestPropertySourceUtils.addInlinedPropertiesToEnvironment(this.environment, "spring.profiles.active=other"); this.environment.addActiveProfile("dev"); this.initializer.postProcessEnvironment(this.environment, this.application); diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerMvcIntegrationTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerMvcIntegrationTests.java index 5eb240f7f98..e8240fd90d1 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerMvcIntegrationTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerMvcIntegrationTests.java @@ -184,7 +184,8 @@ class ServletWebServerMvcIntegrationTests { @Bean DispatcherServlet dispatcherServlet() { - // Can configure dispatcher servlet here as would usually do via init-params + // Can configure dispatcher servlet here as would usually do through + // init-params return new DispatcherServlet(); } diff --git a/src/spring-boot-builder/README.adoc b/src/spring-boot-builder/README.adoc index 21a8202851d..35de5526521 100644 --- a/src/spring-boot-builder/README.adoc +++ b/src/spring-boot-builder/README.adoc @@ -5,6 +5,6 @@ This directory contains a Cloud Native Buildpacks https://buildpacks.io/docs/con == Creating the builder * Install the https://buildpacks.io/docs/install-pack/[pack CLI] -* Authenticate to projects.registry.vmware.com via `docker login` +* Authenticate to projects.registry.vmware.com through `docker login` * Use the `build.sh` create the necessary images and push them to the registry