root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Replace 'via' with 'over' or 'through' in the documentation

Browse Source 
Closes gh-33878
pull/33914/head
Moritz Halbritter 2 years ago
parent b5cebed120
commit e8d809fe65
99 changed files with 146 additions and 135 deletions
Show Stats Download Patch File Download Diff File

4
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/OnEndpointElementCondition.java
Unescape Escape View File

@ -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

6
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/expose/EndpointExposure.java
Unescape Escape View File

@ -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("*");

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusProperties.java
Unescape Escape View File

@ -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;

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/client/MetricsClientHttpRequestInterceptor.java
Unescape Escape View File

@ -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

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/client/MetricsWebClientFilterFunction.java
Unescape Escape View File

@ -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

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/MappingDescriptionProvider.java
Unescape Escape View File

@ -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

2
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LoggersEndpointWebIntegrationTests.java
Unescape Escape View File

@ -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

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfiguration.java
Unescape Escape View File

@ -68,7 +68,7 @@ public @interface AutoConfiguration {
* name will be automatically generated.
* <p>
* 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.

12
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/EnableAutoConfiguration.java
Unescape Escape View File

@ -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.
* <p>
* 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.
* <p>
* Auto-configuration classes are regular Spring {@link Configuration @Configuration}
* beans. They are located using {@link ImportCandidates} and the

3
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/Cache2kBuilderCustomizer.java vendored
Unescape Escape View File

@ -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

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfiguration.java vendored
Unescape Escape View File

@ -49,7 +49,7 @@ import org.springframework.util.Assert;
* {@link CacheManager} if necessary when caching is enabled via
* {@link EnableCaching @EnableCaching}.
* <p>
* 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

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/NoOpCacheConfiguration.java vendored
Unescape Escape View File

@ -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
*/

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CqlSessionBuilderCustomizer.java
Unescape Escape View File

@ -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

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/DriverConfigLoaderBuilderCustomizer.java
Unescape Escape View File

@ -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

9
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/ClusterEnvironmentBuilderCustomizer.java
Unescape Escape View File

@ -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);

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/ClientResourcesBuilderCustomizer.java
Unescape Escape View File

@ -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

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/JedisClientConfigurationBuilderCustomizer.java
Unescape Escape View File

@ -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.
*

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceClientConfigurationBuilderCustomizer.java
Unescape Escape View File

@ -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.
*

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/RestClientBuilderCustomizer.java
Unescape Escape View File

@ -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

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayMigrationInitializer.java
Unescape Escape View File

@ -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

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/ConditionalOnGraphQlSchema.java
Unescape Escape View File

@ -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

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/gson/GsonBuilderCustomizer.java
Unescape Escape View File

@ -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

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationProperties.java
Unescape Escape View File

@ -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;

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/Jackson2ObjectMapperBuilderCustomizer.java
Unescape Escape View File

@ -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

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java
Unescape Escape View File

@ -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

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java
Unescape Escape View File

@ -324,7 +324,7 @@ public class JmsProperties {
*
* <p>
* {@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 {

6
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapProperties.java
Unescape Escape View File

@ -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;

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoClientSettingsBuilderCustomizer.java
Unescape Escape View File

@ -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

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/DownloadConfigBuilderCustomizer.java
Unescape Escape View File

@ -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

3
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/neo4j/ConfigBuilderCustomizer.java
Unescape Escape View File

@ -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

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/r2dbc/ConnectionFactoryConfigurations.java
Unescape Escape View File

@ -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.

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/r2dbc/ConnectionFactoryOptionsBuilderCustomizer.java
Unescape Escape View File

@ -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

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sql/init/R2dbcInitializationConfiguration.java
Unescape Escape View File

@ -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

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/ErrorWebFluxAutoConfiguration.java
Unescape Escape View File

@ -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

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/ConditionalOnMissingFilterBean.java
Unescape Escape View File

@ -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}.
* <p>
* When placed on a {@code @Bean} method, the bean class defaults to the return type of

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/ErrorMvcAutoConfiguration.java
Unescape Escape View File

@ -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

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/scan/ScannedFactoryBeanConfiguration.java
Unescape Escape View File

@ -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
*/

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/scan/ScannedFactoryBeanWithBeanMethodArgumentsConfiguration.java
Unescape Escape View File

@ -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
*/

3
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java
Unescape Escape View File

@ -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"));
});
}

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java
Unescape Escape View File

@ -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"));
});
}

2
spring-boot-project/spring-boot-cli/samples/rabbit.groovy
Unescape Escape View File

@ -29,4 +29,4 @@ class RabbitExample implements CommandLineRunner {
new org.springframework.amqp.core.Queue("spring-boot", false)
}
}
}

4
spring-boot-project/spring-boot-cli/src/intTest/java/org/springframework/boot/cli/infrastructure/CommandLineInvoker.java
Unescape Escape View File

@ -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

4
spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyBeansTransformation.java
Unescape Escape View File

@ -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 <code>beans{}</code> 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

2
spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompilerScope.java
Unescape Escape View File

@ -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,

2
spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayload.java
Unescape Escape View File

@ -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

2
spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc
Unescape Escape View File

@ -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`.

2
spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/testing.adoc
Unescape Escape View File

@ -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"]

2
spring-boot-project/spring-boot-docs/src/docs/asciidoc/io/whats-next.adoc
Unescape Escape View File

@ -1,6 +1,6 @@
[[io.whats-next]]
== What to Read Next
You should now have a good understanding of Spring Boot's <<features#features, core features>> and the various technologies that Spring Boot provides support for via auto-configuration.
You should now have a good understanding of Spring Boot's <<features#features, core features>> 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 <<container-images#container-images, building container images>> in the next section or skip to the <<actuator#actuator, production-ready features>> section.

3
spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/traditionaldeployment/convertexistingapplication/MyApplication.java
Unescape Escape View File

@ -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;
}

2
spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/traditionaldeployment/convertexistingapplication/MyApplication.kt
Unescape Escape View File

@ -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
}

2
spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTest.java
Unescape Escape View File

@ -48,7 +48,7 @@ import org.springframework.test.context.junit.jupiter.SpringExtension;
* <p>
* 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.
* <p>
* When using JUnit 4, this annotation should be used in combination with

4
spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/SpringBootMockMvcBuilderCustomizer.java
Unescape Escape View File

@ -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

2
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/json/app/ExampleCustomObject.java
Unescape Escape View File

@ -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
*/

2
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestWithWebAppConfigurationTests.java
Unescape Escape View File

@ -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

2
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java
Unescape Escape View File

@ -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<ConfigurableApplicationContext> {

2
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockReset.java
Unescape Escape View File

@ -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.
*

2
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCaptureExtension.java
Unescape Escape View File

@ -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.
* <p>

5
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java
Unescape Escape View File

@ -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}.
* <p>
* 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,

6
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/json/JacksonTesterIntegrationTests.java
Unescape Escape View File

@ -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";

3
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/system/OutputExtensionExtendWithTests.java
Unescape Escape View File

@ -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
*/

4
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSONObject.java
Unescape Escape View File

@ -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
* <a href="#lossy">lossy</a>; use strings to transfer numbers via JSON.
* <a href="#lossy">lossy</a>; 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 <a href="#lossy">lossy</a>; 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}

4
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/ImmutableSimpleProperties.java
Unescape Escape View File

@ -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;

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/asciidoc/integrating-with-actuator.adoc
Unescape Escape View File

@ -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

2
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java
Unescape Escape View File

@ -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.
* <p>

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/running.adoc
Unescape Escape View File

@ -102,7 +102,7 @@ include::../maven/running/system-properties-pom.xml[tags=system-properties]
----
If the value is empty or not defined (that is `<my-property/`>), 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).

18
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageMojo.java
Unescape Escape View File

@ -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)

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/StartMojo.java
Unescape Escape View File

@ -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) {

2
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/system/OutputCaptureExtension.java
Unescape Escape View File

@ -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.
* <p>

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ApplicationContextFactory.java
Unescape Escape View File

@ -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)

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ConfigurableBootstrapContext.java
Unescape Escape View File

@ -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

6
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
Unescape Escape View File

@ -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.
* <p>
* Most developers will want to define their own main method and call the
* {@link #run(Class, String...) run} method instead.

6
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplicationRunListener.java
Unescape Escape View File

@ -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

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringBootExceptionReporter.java
Unescape Escape View File

@ -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.
*

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/admin/SpringApplicationAdminMXBean.java
Unescape Escape View File

@ -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

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/availability/ApplicationAvailability.java
Unescape Escape View File

@ -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

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataEnvironment.java
Unescape Escape View File

@ -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.
* <p>
* 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.
*

3
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataLoaders.java
Unescape Escape View File

@ -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

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java
Unescape Escape View File

@ -357,7 +357,7 @@ public class ConfigFileApplicationListener implements EnvironmentPostProcessor,
Set<Profile> includedViaProperty = getProfiles(binder, INCLUDE_PROFILES_PROPERTY);
List<Profile> 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);

3
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesScanRegistrar.java
Unescape Escape View File

@ -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

3
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/PropertyMapper.java
Unescape Escape View File

@ -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 <R> the resulting type
* @param adapter the adapter to apply
* @return a new adapted source instance

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/convert/ApplicationConversionService.java
Unescape Escape View File

@ -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) {

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/EnvironmentPostProcessorApplicationListener.java vendored
Unescape Escape View File

@ -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());

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/PropertySourceLoader.java vendored
Unescape Escape View File

@ -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

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/LoggerGroups.java
Unescape Escape View File

@ -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

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/context/RSocketPortInfoApplicationContextInitializer.java
Unescape Escape View File

@ -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}.
* <p>
* Properties are automatically propagated up to any parent context.
*

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/validation/MessageSourceMessageInterpolator.java
Unescape Escape View File

@ -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

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/context/ServerPortInfoApplicationContextInitializer.java
Unescape Escape View File

@ -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}.
* <p>
* If the {@link WebServerInitializedEvent} has a
* {@link WebServerApplicationContext#getServerNamespace() server namespace} , it will be

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/context/AnnotationConfigReactiveWebApplicationContext.java
Unescape Escape View File

@ -33,7 +33,7 @@ import org.springframework.stereotype.Component;
* <p>
* 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

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/context/AnnotationConfigReactiveWebServerApplicationContext.java
Unescape Escape View File

@ -50,7 +50,7 @@ import org.springframework.util.ObjectUtils;
* <p>
* 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

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/DelegatingFilterProxyRegistrationBean.java
Unescape Escape View File

@ -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.
* <p>
* 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.

6
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/FilterRegistrationBean.java
Unescape Escape View File

@ -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 <T> the type of {@link Filter} to register
* @author Phillip Webb

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletComponentHandler.java
Unescape Escape View File

@ -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

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/AnnotationConfigServletWebApplicationContext.java
Unescape Escape View File

@ -49,7 +49,7 @@ import org.springframework.web.context.support.GenericWebApplicationContext;
* <p>
* 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

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/AnnotationConfigServletWebServerApplicationContext.java
Unescape Escape View File

@ -47,7 +47,7 @@ import org.springframework.util.ClassUtils;
* <p>
* 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

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/XmlServletWebServerApplicationContext.java
Unescape Escape View File

@ -29,7 +29,7 @@ import org.springframework.web.context.support.XmlWebApplicationContext;
* <p>
* 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

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/support/SpringBootServletInitializer.java
Unescape Escape View File

@ -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) {

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java
Unescape Escape View File

@ -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);

3
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerMvcIntegrationTests.java
Unescape Escape View File

@ -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();
}

2
src/spring-boot-builder/README.adoc
Unescape Escape View File

@ -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

Write Preview
Loading…
Cancel
Save