Replace 'via' with 'over' or 'through' in the documentation
Closes gh-33878
This commit is contained in:
@@ -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.
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
*/
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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.
|
||||
*
|
||||
|
||||
@@ -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.
|
||||
*
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
*/
|
||||
|
||||
@@ -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
|
||||
*/
|
||||
|
||||
@@ -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"));
|
||||
});
|
||||
}
|
||||
|
||||
@@ -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"));
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user