Merge branch '1.5.x' into 2.0.x

2.0.x
Phillip Webb 5 years ago
commit cfeb0239b7

@ -27,6 +27,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* Configuration properties for {@link HealthEndpoint}. * Configuration properties for {@link HealthEndpoint}.
* *
* @author Phillip Webb * @author Phillip Webb
* @since 2.0.0
*/ */
@ConfigurationProperties("management.endpoint.health") @ConfigurationProperties("management.endpoint.health")
public class HealthEndpointProperties { public class HealthEndpointProperties {

@ -40,6 +40,7 @@ import org.springframework.util.Assert;
* (wrappers for AuditEvent). * (wrappers for AuditEvent).
* *
* @author Dave Syer * @author Dave Syer
* @since 1.0.0
* @see AuditEventRepository * @see AuditEventRepository
*/ */
@JsonInclude(Include.NON_EMPTY) @JsonInclude(Include.NON_EMPTY)

@ -24,6 +24,7 @@ import java.util.List;
* *
* @author Dave Syer * @author Dave Syer
* @author Vedran Pavic * @author Vedran Pavic
* @since 1.0.0
*/ */
public interface AuditEventRepository { public interface AuditEventRepository {

@ -28,6 +28,7 @@ import org.springframework.util.Assert;
* @author Dave Syer * @author Dave Syer
* @author Phillip Webb * @author Phillip Webb
* @author Vedran Pavic * @author Vedran Pavic
* @since 1.0.0
*/ */
public class InMemoryAuditEventRepository implements AuditEventRepository { public class InMemoryAuditEventRepository implements AuditEventRepository {

@ -27,6 +27,7 @@ import org.springframework.util.Assert;
* Spring {@link ApplicationEvent} to encapsulate {@link AuditEvent}s. * Spring {@link ApplicationEvent} to encapsulate {@link AuditEvent}s.
* *
* @author Dave Syer * @author Dave Syer
* @since 1.0.0
*/ */
public class AuditApplicationEvent extends ApplicationEvent { public class AuditApplicationEvent extends ApplicationEvent {

@ -29,6 +29,7 @@ import org.springframework.boot.actuate.audit.AuditEventRepository;
* @author Dave Syer * @author Dave Syer
* @author Stephane Nicoll * @author Stephane Nicoll
* @author Vedran Pavic * @author Vedran Pavic
* @since 1.0.0
*/ */
public class AuditListener extends AbstractAuditListener { public class AuditListener extends AbstractAuditListener {

@ -24,6 +24,7 @@ import org.springframework.util.Assert;
* the endpoint. * the endpoint.
* *
* @author Phillip Webb * @author Phillip Webb
* @since 2.0.0
*/ */
public abstract class DiscovererEndpointFilter implements EndpointFilter<DiscoveredEndpoint<?>> { public abstract class DiscovererEndpointFilter implements EndpointFilter<DiscoveredEndpoint<?>> {

@ -30,6 +30,7 @@ import org.springframework.util.StringUtils;
* Contains details of a servlet that is exposed as an actuator endpoint. * Contains details of a servlet that is exposed as an actuator endpoint.
* *
* @author Phillip Webb * @author Phillip Webb
* @since 2.0.0
*/ */
public final class EndpointServlet { public final class EndpointServlet {

@ -33,6 +33,7 @@ import org.springframework.util.Assert;
* A collection of {@link PathMappedEndpoint path mapped endpoints}. * A collection of {@link PathMappedEndpoint path mapped endpoints}.
* *
* @author Phillip Webb * @author Phillip Webb
* @since 2.0.0
*/ */
public class PathMappedEndpoints implements Iterable<PathMappedEndpoint> { public class PathMappedEndpoints implements Iterable<PathMappedEndpoint> {

@ -21,6 +21,7 @@ package org.springframework.boot.actuate.health;
* *
* @author Dave Syer * @author Dave Syer
* @author Christian Dupuis * @author Christian Dupuis
* @since 1.2.0
* @see Status#UP * @see Status#UP
*/ */
public class ApplicationHealthIndicator extends AbstractHealthIndicator { public class ApplicationHealthIndicator extends AbstractHealthIndicator {

@ -20,6 +20,7 @@ package org.springframework.boot.actuate.health;
* Strategy interface used to provide an indication of application health. * Strategy interface used to provide an indication of application health.
* *
* @author Dave Syer * @author Dave Syer
* @since 1.0.0
* @see ApplicationHealthIndicator * @see ApplicationHealthIndicator
*/ */
@FunctionalInterface @FunctionalInterface

@ -31,7 +31,7 @@ import org.springframework.util.Assert;
* *
* @author Eddú Meléndez * @author Eddú Meléndez
* @author Stephane Nicoll * @author Stephane Nicoll
* @version 2.0.0 * @since 2.0.0
*/ */
public class LdapHealthIndicator extends AbstractHealthIndicator { public class LdapHealthIndicator extends AbstractHealthIndicator {

@ -37,7 +37,6 @@ import org.springframework.web.util.UriTemplateHandler;
* *
* @author Jon Schneider * @author Jon Schneider
* @author Phillip Webb * @author Phillip Webb
* @since 2.0.0
*/ */
class MetricsClientHttpRequestInterceptor implements ClientHttpRequestInterceptor { class MetricsClientHttpRequestInterceptor implements ClientHttpRequestInterceptor {

@ -31,6 +31,7 @@ import org.springframework.util.ClassUtils;
* *
* @author Dave Syer * @author Dave Syer
* @author Vedran Pavic * @author Vedran Pavic
* @since 1.0.0
*/ */
public class AuthenticationAuditListener extends AbstractAuthenticationAuditListener { public class AuthenticationAuditListener extends AbstractAuthenticationAuditListener {

@ -29,6 +29,7 @@ import org.springframework.security.access.event.AuthorizationFailureEvent;
* *
* @author Dave Syer * @author Dave Syer
* @author Vedran Pavic * @author Vedran Pavic
* @since 1.0.0
*/ */
public class AuthorizationAuditListener extends AbstractAuthorizationAuditListener { public class AuthorizationAuditListener extends AbstractAuthorizationAuditListener {

@ -32,7 +32,7 @@ import org.springframework.web.context.WebApplicationContext;
* Servlets} registered with a {@link ServletContext}. * Servlets} registered with a {@link ServletContext}.
* *
* @author Andy Wilkinson * @author Andy Wilkinson
* @since 2.0 * @since 2.0.0
*/ */
public class ServletsMappingDescriptionProvider implements MappingDescriptionProvider { public class ServletsMappingDescriptionProvider implements MappingDescriptionProvider {

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2018 the original author or authors. * Copyright 2012-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

@ -45,6 +45,7 @@ import org.springframework.util.StringUtils;
* @author Phillip Webb * @author Phillip Webb
* @author Dave Syer * @author Dave Syer
* @author Oliver Gierke * @author Oliver Gierke
* @since 1.0.0
*/ */
public abstract class AutoConfigurationPackages { public abstract class AutoConfigurationPackages {

@ -27,6 +27,7 @@ import java.lang.annotation.Target;
* after other specified auto-configuration classes. * after other specified auto-configuration classes.
* *
* @author Phillip Webb * @author Phillip Webb
* @since 1.0.0
*/ */
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Target({ ElementType.TYPE }) @Target({ ElementType.TYPE })

@ -27,6 +27,7 @@ import java.lang.annotation.Target;
* before other specified auto-configuration classes. * before other specified auto-configuration classes.
* *
* @author Phillip Webb * @author Phillip Webb
* @since 1.0.0
*/ */
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Target({ ElementType.TYPE }) @Target({ ElementType.TYPE })

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2017 the original author or authors. * Copyright 2012-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -66,6 +66,7 @@ import org.springframework.core.io.support.SpringFactoriesLoader;
* *
* @author Phillip Webb * @author Phillip Webb
* @author Stephane Nicoll * @author Stephane Nicoll
* @since 1.0.0
* @see ConditionalOnBean * @see ConditionalOnBean
* @see ConditionalOnMissingBean * @see ConditionalOnMissingBean
* @see ConditionalOnClass * @see ConditionalOnClass

@ -44,7 +44,6 @@ import org.springframework.core.type.classreading.MetadataReaderFactory;
* {@link ConfigurationClassPostProcessor} and Spring Boot. * {@link ConfigurationClassPostProcessor} and Spring Boot.
* *
* @author Phillip Webb * @author Phillip Webb
* @since 1.4.0
*/ */
class SharedMetadataReaderFactoryContextInitializer class SharedMetadataReaderFactoryContextInitializer
implements ApplicationContextInitializer<ConfigurableApplicationContext> { implements ApplicationContextInitializer<ConfigurableApplicationContext> {

@ -26,7 +26,7 @@ import org.springframework.boot.context.properties.PropertyMapper;
* *
* @author Gary Russell * @author Gary Russell
* @author Stephane Nicoll * @author Stephane Nicoll
* @since 2.0 * @since 2.0.0
*/ */
public final class DirectRabbitListenerContainerFactoryConfigurer public final class DirectRabbitListenerContainerFactoryConfigurer
extends AbstractRabbitListenerContainerFactoryConfigurer<DirectRabbitListenerContainerFactory> { extends AbstractRabbitListenerContainerFactoryConfigurer<DirectRabbitListenerContainerFactory> {

@ -35,7 +35,6 @@ import org.springframework.context.annotation.Configuration;
* *
* @author Stephane Nicoll * @author Stephane Nicoll
* @author Josh Thornhill * @author Josh Thornhill
* @since 1.2.0
*/ */
@Configuration @Configuration
@ConditionalOnClass(EnableRabbit.class) @ConditionalOnClass(EnableRabbit.class)

@ -83,6 +83,7 @@ import org.springframework.util.ReflectionUtils;
* @author Stephane Nicoll * @author Stephane Nicoll
* @author Gary Russell * @author Gary Russell
* @author Phillip Webb * @author Phillip Webb
* @since 1.0.0
*/ */
@Configuration @Configuration
@ConditionalOnClass({ RabbitTemplate.class, Channel.class }) @ConditionalOnClass({ RabbitTemplate.class, Channel.class })

@ -37,6 +37,7 @@ import org.springframework.util.StringUtils;
* @author Andy Wilkinson * @author Andy Wilkinson
* @author Josh Thornhill * @author Josh Thornhill
* @author Gary Russell * @author Gary Russell
* @since 1.0.0
*/ */
@ConfigurationProperties(prefix = "spring.rabbitmq") @ConfigurationProperties(prefix = "spring.rabbitmq")
public class RabbitProperties { public class RabbitProperties {

@ -37,6 +37,7 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy;
* *
* @author Dave Syer * @author Dave Syer
* @author Josh Long * @author Josh Long
* @since 1.0.0
* @see EnableAspectJAutoProxy * @see EnableAspectJAutoProxy
*/ */
@Configuration @Configuration

@ -38,6 +38,7 @@ import org.springframework.transaction.PlatformTransactionManager;
* @author Andy Wilkinson * @author Andy Wilkinson
* @author Kazuki Shimizu * @author Kazuki Shimizu
* @author Stephane Nicoll * @author Stephane Nicoll
* @since 1.0.0
*/ */
public class BasicBatchConfigurer implements BatchConfigurer { public class BasicBatchConfigurer implements BatchConfigurer {

@ -57,6 +57,7 @@ import org.springframework.util.StringUtils;
* @author Eddú Meléndez * @author Eddú Meléndez
* @author Kazuki Shimizu * @author Kazuki Shimizu
* @author Mahmoud Ben Hassine * @author Mahmoud Ben Hassine
* @since 1.0.0
*/ */
@Configuration @Configuration
@ConditionalOnClass({ JobLauncher.class, DataSource.class, JdbcOperations.class }) @ConditionalOnClass({ JobLauncher.class, DataSource.class, JdbcOperations.class })

@ -28,6 +28,7 @@ import org.springframework.util.Assert;
* *
* @author Dave Syer * @author Dave Syer
* @author Vedran Pavic * @author Vedran Pavic
* @since 1.0.0
*/ */
public class BatchDataSourceInitializer extends AbstractDataSourceInitializer { public class BatchDataSourceInitializer extends AbstractDataSourceInitializer {

@ -23,6 +23,7 @@ import org.springframework.context.ApplicationEvent;
* Spring {@link ApplicationEvent} encapsulating a {@link JobExecution}. * Spring {@link ApplicationEvent} encapsulating a {@link JobExecution}.
* *
* @author Dave Syer * @author Dave Syer
* @since 1.0.0
*/ */
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class JobExecutionEvent extends ApplicationEvent { public class JobExecutionEvent extends ApplicationEvent {

@ -27,6 +27,7 @@ import org.springframework.context.ApplicationListener;
* {@link ExitCodeGenerator} for {@link JobExecutionEvent}s. * {@link ExitCodeGenerator} for {@link JobExecutionEvent}s.
* *
* @author Dave Syer * @author Dave Syer
* @since 1.0.0
*/ */
public class JobExecutionExitCodeGenerator implements ApplicationListener<JobExecutionEvent>, ExitCodeGenerator { public class JobExecutionExitCodeGenerator implements ApplicationListener<JobExecutionEvent>, ExitCodeGenerator {

@ -63,6 +63,7 @@ import org.springframework.util.StringUtils;
* @author Dave Syer * @author Dave Syer
* @author Jean-Pierre Bergamin * @author Jean-Pierre Bergamin
* @author Mahmoud Ben Hassine * @author Mahmoud Ben Hassine
* @since 1.0.0
*/ */
public class JobLauncherCommandLineRunner implements CommandLineRunner, Ordered, ApplicationEventPublisherAware { public class JobLauncherCommandLineRunner implements CommandLineRunner, Ordered, ApplicationEventPublisherAware {

@ -30,6 +30,7 @@ import org.springframework.transaction.PlatformTransactionManager;
* A {@link BasicBatchConfigurer} tailored for JPA. * A {@link BasicBatchConfigurer} tailored for JPA.
* *
* @author Stephane Nicoll * @author Stephane Nicoll
* @since 2.0.0
*/ */
public class JpaBatchConfigurer extends BasicBatchConfigurer { public class JpaBatchConfigurer extends BasicBatchConfigurer {

@ -34,7 +34,6 @@ import org.springframework.core.type.ClassMetadata;
* @author Stephane Nicoll * @author Stephane Nicoll
* @author Phillip Webb * @author Phillip Webb
* @author Madhura Bhave * @author Madhura Bhave
* @since 1.3.0
*/ */
class CacheCondition extends SpringBootCondition { class CacheCondition extends SpringBootCondition {

@ -37,7 +37,6 @@ import org.springframework.util.StringUtils;
* Caffeine cache configuration. * Caffeine cache configuration.
* *
* @author Eddú Meléndez * @author Eddú Meléndez
* @since 1.4.0
*/ */
@Configuration @Configuration
@ConditionalOnClass({ Caffeine.class, CaffeineCacheManager.class }) @ConditionalOnClass({ Caffeine.class, CaffeineCacheManager.class })

@ -36,7 +36,6 @@ import org.springframework.core.io.Resource;
* @author Eddú Meléndez * @author Eddú Meléndez
* @author Stephane Nicoll * @author Stephane Nicoll
* @author Madhura Bhave * @author Madhura Bhave
* @since 1.3.0
*/ */
@Configuration @Configuration
@ConditionalOnClass({ Cache.class, EhCacheCacheManager.class }) @ConditionalOnClass({ Cache.class, EhCacheCacheManager.class })

@ -32,7 +32,6 @@ import org.springframework.context.annotation.Configuration;
* context. * context.
* *
* @author Stephane Nicoll * @author Stephane Nicoll
* @since 1.3.0
*/ */
@Configuration @Configuration
@ConditionalOnBean(Cache.class) @ConditionalOnBean(Cache.class)

@ -40,7 +40,6 @@ import org.springframework.context.annotation.Configuration;
* default {@link HazelcastInstance} is still made, using the same defaults. * default {@link HazelcastInstance} is still made, using the same defaults.
* *
* @author Stephane Nicoll * @author Stephane Nicoll
* @since 1.3.0
* @see HazelcastConfigResourceCondition * @see HazelcastConfigResourceCondition
*/ */
@Configuration @Configuration

@ -54,7 +54,6 @@ import org.springframework.util.StringUtils;
* *
* @author Stephane Nicoll * @author Stephane Nicoll
* @author Madhura Bhave * @author Madhura Bhave
* @since 1.3.0
*/ */
@Configuration @Configuration
@ConditionalOnClass({ Caching.class, JCacheCacheManager.class }) @ConditionalOnClass({ Caching.class, JCacheCacheManager.class })

@ -27,7 +27,6 @@ import org.springframework.context.annotation.Configuration;
* No-op cache configuration used to disable caching via configuration. * No-op cache configuration used to disable caching via configuration.
* *
* @author Stephane Nicoll * @author Stephane Nicoll
* @since 1.3.0
*/ */
@Configuration @Configuration
@ConditionalOnMissingBean(CacheManager.class) @ConditionalOnMissingBean(CacheManager.class)

@ -43,7 +43,6 @@ import org.springframework.data.redis.serializer.RedisSerializationContext.Seria
* @author Stephane Nicoll * @author Stephane Nicoll
* @author Mark Paluch * @author Mark Paluch
* @author Ryon Day * @author Ryon Day
* @since 1.3.0
*/ */
@Configuration @Configuration
@ConditionalOnClass(RedisConnectionFactory.class) @ConditionalOnClass(RedisConnectionFactory.class)

@ -29,7 +29,6 @@ import org.springframework.context.annotation.Configuration;
* Simplest cache configuration, usually used as a fallback. * Simplest cache configuration, usually used as a fallback.
* *
* @author Stephane Nicoll * @author Stephane Nicoll
* @since 1.3.0
*/ */
@Configuration @Configuration
@ConditionalOnMissingBean(CacheManager.class) @ConditionalOnMissingBean(CacheManager.class)

@ -62,7 +62,6 @@ import org.springframework.util.StringUtils;
* *
* @author Phillip Webb * @author Phillip Webb
* @author Andy Wilkinson * @author Andy Wilkinson
* @since 1.2.0
*/ */
final class BeanTypeRegistry implements SmartInitializingSingleton { final class BeanTypeRegistry implements SmartInitializingSingleton {

@ -43,6 +43,7 @@ import org.springframework.util.ObjectUtils;
* @author Dave Syer * @author Dave Syer
* @author Phillip Webb * @author Phillip Webb
* @author Andy Wilkinson * @author Andy Wilkinson
* @since 1.0.0
*/ */
public final class ConditionEvaluationReport { public final class ConditionEvaluationReport {

@ -23,6 +23,7 @@ import org.springframework.util.ObjectUtils;
* Outcome for a condition match, including log message. * Outcome for a condition match, including log message.
* *
* @author Phillip Webb * @author Phillip Webb
* @since 1.0.0
* @see ConditionMessage * @see ConditionMessage
*/ */
public class ConditionOutcome { public class ConditionOutcome {

@ -55,6 +55,7 @@ import org.springframework.context.annotation.Conditional;
* another auto-configuration, make sure that the one using this condition runs after. * another auto-configuration, make sure that the one using this condition runs after.
* *
* @author Phillip Webb * @author Phillip Webb
* @since 1.0.0
*/ */
@Target({ ElementType.TYPE, ElementType.METHOD }) @Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)

@ -34,6 +34,7 @@ import org.springframework.context.annotation.Conditional;
* matches the {@link #value target of the condition}. * matches the {@link #value target of the condition}.
* *
* @author Phillip Webb * @author Phillip Webb
* @since 1.0.0
*/ */
@Target({ ElementType.TYPE, ElementType.METHOD }) @Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)

@ -29,6 +29,7 @@ import org.springframework.context.annotation.Conditional;
* expression. * expression.
* *
* @author Dave Syer * @author Dave Syer
* @since 1.0.0
*/ */
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Target({ ElementType.TYPE, ElementType.METHOD }) @Target({ ElementType.TYPE, ElementType.METHOD })

@ -56,6 +56,7 @@ import org.springframework.context.annotation.Conditional;
* *
* @author Phillip Webb * @author Phillip Webb
* @author Andy Wilkinson * @author Andy Wilkinson
* @since 1.0.0
*/ */
@Target({ ElementType.TYPE, ElementType.METHOD }) @Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)

@ -29,6 +29,7 @@ import org.springframework.context.annotation.Conditional;
* classpath. * classpath.
* *
* @author Dave Syer * @author Dave Syer
* @since 1.0.0
*/ */
@Target({ ElementType.TYPE, ElementType.METHOD }) @Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)

@ -29,6 +29,7 @@ import org.springframework.context.annotation.Conditional;
* application context. * application context.
* *
* @author Dave Syer * @author Dave Syer
* @since 1.0.0
*/ */
@Target({ ElementType.TYPE, ElementType.METHOD }) @Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)

@ -29,6 +29,7 @@ import org.springframework.context.annotation.Conditional;
* classpath. * classpath.
* *
* @author Dave Syer * @author Dave Syer
* @since 1.0.0
*/ */
@Target({ ElementType.TYPE, ElementType.METHOD }) @Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)

@ -31,6 +31,7 @@ import org.springframework.context.annotation.Conditional;
* *
* @author Dave Syer * @author Dave Syer
* @author Stephane Nicoll * @author Stephane Nicoll
* @since 1.0.0
*/ */
@Target({ ElementType.TYPE, ElementType.METHOD }) @Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)

@ -32,7 +32,6 @@ import org.springframework.core.type.AnnotatedTypeMetadata;
* @author Oliver Gierke * @author Oliver Gierke
* @author Phillip Webb * @author Phillip Webb
* @see ConditionalOnJava * @see ConditionalOnJava
* @since 1.1.0
*/ */
@Order(Ordered.HIGHEST_PRECEDENCE + 20) @Order(Ordered.HIGHEST_PRECEDENCE + 20)
class OnJavaCondition extends SpringBootCondition { class OnJavaCondition extends SpringBootCondition {

@ -32,7 +32,6 @@ import org.springframework.util.StringUtils;
* {@link Condition} that checks for JNDI locations. * {@link Condition} that checks for JNDI locations.
* *
* @author Phillip Webb * @author Phillip Webb
* @since 1.2.0
* @see ConditionalOnJndi * @see ConditionalOnJndi
*/ */
@Order(Ordered.LOWEST_PRECEDENCE - 20) @Order(Ordered.LOWEST_PRECEDENCE - 20)

@ -40,7 +40,6 @@ import org.springframework.util.StringUtils;
* @author Phillip Webb * @author Phillip Webb
* @author Stephane Nicoll * @author Stephane Nicoll
* @author Andy Wilkinson * @author Andy Wilkinson
* @since 1.1.0
* @see ConditionalOnProperty * @see ConditionalOnProperty
*/ */
@Order(Ordered.HIGHEST_PRECEDENCE + 40) @Order(Ordered.HIGHEST_PRECEDENCE + 40)

@ -20,6 +20,7 @@ package org.springframework.boot.autoconfigure.condition;
* Some named search strategies for beans in the bean factory hierarchy. * Some named search strategies for beans in the bean factory hierarchy.
* *
* @author Dave Syer * @author Dave Syer
* @since 1.0.0
*/ */
public enum SearchStrategy { public enum SearchStrategy {

@ -34,6 +34,7 @@ import org.springframework.util.StringUtils;
* *
* @author Phillip Webb * @author Phillip Webb
* @author Greg Turnquist * @author Greg Turnquist
* @since 1.0.0
*/ */
public abstract class SpringBootCondition implements Condition { public abstract class SpringBootCondition implements Condition {

@ -47,6 +47,7 @@ import org.springframework.util.StringUtils;
* @author Dave Syer * @author Dave Syer
* @author Phillip Webb * @author Phillip Webb
* @author Eddú Meléndez * @author Eddú Meléndez
* @since 1.5.0
*/ */
@Configuration @Configuration
@ConditionalOnMissingBean(value = MessageSource.class, search = SearchStrategy.CURRENT) @ConditionalOnMissingBean(value = MessageSource.class, search = SearchStrategy.CURRENT)

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2017 the original author or authors. * Copyright 2012-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -31,6 +31,7 @@ import org.springframework.core.Ordered;
* *
* @author Phillip Webb * @author Phillip Webb
* @author Dave Syer * @author Dave Syer
* @since 1.5.0
*/ */
@Configuration @Configuration
@AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE) @AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE)

@ -42,6 +42,7 @@ import org.springframework.data.util.Streamable;
* @author Phillip Webb * @author Phillip Webb
* @author Dave Syer * @author Dave Syer
* @author Oliver Gierke * @author Oliver Gierke
* @since 1.0.0
*/ */
public abstract class AbstractRepositoryConfigurationSourceSupport public abstract class AbstractRepositoryConfigurationSourceSupport
implements BeanFactoryAware, ImportBeanDefinitionRegistrar, ResourceLoaderAware, EnvironmentAware { implements BeanFactoryAware, ImportBeanDefinitionRegistrar, ResourceLoaderAware, EnvironmentAware {

@ -29,7 +29,6 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi
* Reactive Repositories. * Reactive Repositories.
* *
* @author Eddú Meléndez * @author Eddú Meléndez
* @since 2.0.0
*/ */
class CassandraReactiveRepositoriesAutoConfigureRegistrar extends AbstractRepositoryConfigurationSourceSupport { class CassandraReactiveRepositoriesAutoConfigureRegistrar extends AbstractRepositoryConfigurationSourceSupport {

@ -29,7 +29,6 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi
* Repositories. * Repositories.
* *
* @author Eddú Meléndez * @author Eddú Meléndez
* @since 1.3.0
*/ */
class CassandraRepositoriesAutoConfigureRegistrar extends AbstractRepositoryConfigurationSourceSupport { class CassandraRepositoriesAutoConfigureRegistrar extends AbstractRepositoryConfigurationSourceSupport {

@ -30,7 +30,6 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi
* *
* @author Artur Konczak * @author Artur Konczak
* @author Mohsin Husen * @author Mohsin Husen
* @since 1.1.0
*/ */
class ElasticsearchRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport { class ElasticsearchRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {

@ -49,6 +49,7 @@ import org.springframework.data.jpa.repository.support.JpaRepositoryFactoryBean;
* *
* @author Phillip Webb * @author Phillip Webb
* @author Josh Long * @author Josh Long
* @since 1.0.0
* @see EnableJpaRepositories * @see EnableJpaRepositories
*/ */
@Configuration @Configuration

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2017 the original author or authors. * Copyright 2012-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -29,7 +29,6 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi
* Repositories. * Repositories.
* *
* @author Eddú Meléndez * @author Eddú Meléndez
* @since 1.5.0
*/ */
class LdapRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport { class LdapRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {

@ -29,7 +29,6 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi
* Repositories. * Repositories.
* *
* @author Mark Paluch * @author Mark Paluch
* @since 2.0.0
*/ */
class MongoReactiveRepositoriesAutoConfigureRegistrar extends AbstractRepositoryConfigurationSourceSupport { class MongoReactiveRepositoriesAutoConfigureRegistrar extends AbstractRepositoryConfigurationSourceSupport {

@ -50,6 +50,7 @@ import org.springframework.data.mongodb.repository.support.MongoRepositoryFactor
* @author Dave Syer * @author Dave Syer
* @author Oliver Gierke * @author Oliver Gierke
* @author Josh Long * @author Josh Long
* @since 1.0.0
* @see EnableMongoRepositories * @see EnableMongoRepositories
*/ */
@Configuration @Configuration

@ -42,6 +42,7 @@ import org.springframework.data.redis.core.StringRedisTemplate;
* @author Stephane Nicoll * @author Stephane Nicoll
* @author Marco Aust * @author Marco Aust
* @author Mark Paluch * @author Mark Paluch
* @since 1.0.0
*/ */
@Configuration @Configuration
@ConditionalOnClass(RedisOperations.class) @ConditionalOnClass(RedisOperations.class)

@ -30,6 +30,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* @author Marco Aust * @author Marco Aust
* @author Mark Paluch * @author Mark Paluch
* @author Stephane Nicoll * @author Stephane Nicoll
* @since 1.0.0
*/ */
@ConfigurationProperties(prefix = "spring.redis") @ConfigurationProperties(prefix = "spring.redis")
public class RedisProperties { public class RedisProperties {

@ -29,7 +29,6 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi
* Repositories. * Repositories.
* *
* @author Eddú Meléndez * @author Eddú Meléndez
* @since 1.4.0
*/ */
class RedisRepositoriesAutoConfigureRegistrar extends AbstractRepositoryConfigurationSourceSupport { class RedisRepositoriesAutoConfigureRegistrar extends AbstractRepositoryConfigurationSourceSupport {

@ -29,7 +29,6 @@ import org.springframework.data.solr.repository.config.SolrRepositoryConfigExten
* repositories. * repositories.
* *
* @author Christoph Strobl * @author Christoph Strobl
* @since 1.1.0
*/ */
class SolrRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport { class SolrRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {

@ -24,6 +24,7 @@ import org.flywaydb.core.Flyway;
* *
* @author Andreas Ahlenstorf * @author Andreas Ahlenstorf
* @author Phillip Webb * @author Phillip Webb
* @since 1.3.0
*/ */
@FunctionalInterface @FunctionalInterface
public interface FlywayMigrationStrategy { public interface FlywayMigrationStrategy {

@ -41,6 +41,7 @@ import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandl
* enabled. * enabled.
* *
* @author Andy Wilkinson * @author Andy Wilkinson
* @since 1.3.0
*/ */
@Configuration @Configuration
public class HypermediaHttpMessageConverterConfiguration { public class HypermediaHttpMessageConverterConfiguration {

@ -35,7 +35,6 @@ import org.springframework.http.converter.json.MappingJackson2HttpMessageConvert
* *
* @author Andy Wilkinson * @author Andy Wilkinson
* @author Eddú Meléndez * @author Eddú Meléndez
* @since 1.2.2
*/ */
@Configuration @Configuration
@ConditionalOnClass(Gson.class) @ConditionalOnClass(Gson.class)

@ -28,7 +28,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* *
* @author Stephane Nicoll * @author Stephane Nicoll
* @author Brian Clozel * @author Brian Clozel
* @since 1.2.0 * @since 2.0.0
*/ */
@ConfigurationProperties(prefix = "spring.http.encoding") @ConfigurationProperties(prefix = "spring.http.encoding")
public class HttpEncodingProperties { public class HttpEncodingProperties {

@ -50,6 +50,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupp
* @author Dave Syer * @author Dave Syer
* @author Phillip Webb * @author Phillip Webb
* @author Andy Wilkinson * @author Andy Wilkinson
* @since 2.0.0
* @see #HttpMessageConverters(HttpMessageConverter...) * @see #HttpMessageConverters(HttpMessageConverter...)
* @see #HttpMessageConverters(Collection) * @see #HttpMessageConverters(Collection)
* @see #getConverters() * @see #getConverters()

@ -46,6 +46,7 @@ import org.springframework.http.converter.StringHttpMessageConverter;
* @author Sebastien Deleuze * @author Sebastien Deleuze
* @author Stephane Nicoll * @author Stephane Nicoll
* @author Eddú Meléndez * @author Eddú Meléndez
* @since 2.0.0
*/ */
@Configuration @Configuration
@ConditionalOnClass(HttpMessageConverter.class) @ConditionalOnClass(HttpMessageConverter.class)

@ -33,7 +33,6 @@ import org.springframework.http.converter.xml.MappingJackson2XmlHttpMessageConve
* Configuration for HTTP message converters that use Jackson. * Configuration for HTTP message converters that use Jackson.
* *
* @author Andy Wilkinson * @author Andy Wilkinson
* @since 1.2.2
*/ */
@Configuration @Configuration
class JacksonHttpMessageConvertersConfiguration { class JacksonHttpMessageConvertersConfiguration {

@ -34,7 +34,6 @@ import org.springframework.http.converter.json.MappingJackson2HttpMessageConvert
* Configuration for HTTP Message converters that use JSON-B. * Configuration for HTTP Message converters that use JSON-B.
* *
* @author Eddú Meléndez * @author Eddú Meléndez
* @since 2.0.0
*/ */
@Configuration @Configuration
@ConditionalOnClass(Jsonb.class) @ConditionalOnClass(Jsonb.class)

@ -46,6 +46,7 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
* @author Phillip Webb * @author Phillip Webb
* @author Stephane Nicoll * @author Stephane Nicoll
* @author Kazuki Shimizu * @author Kazuki Shimizu
* @since 1.0.0
*/ */
@Configuration @Configuration
@ConditionalOnClass({ DataSource.class, EmbeddedDatabaseType.class }) @ConditionalOnClass({ DataSource.class, EmbeddedDatabaseType.class })

@ -29,7 +29,6 @@ import org.springframework.core.Ordered;
* initialized as soon as a {@link DataSource} is. * initialized as soon as a {@link DataSource} is.
* *
* @author Dave Syer * @author Dave Syer
* @since 1.1.2
*/ */
class DataSourceInitializerPostProcessor implements BeanPostProcessor, Ordered { class DataSourceInitializerPostProcessor implements BeanPostProcessor, Ordered {

@ -41,6 +41,7 @@ import org.springframework.transaction.PlatformTransactionManager;
* @author Stephane Nicoll * @author Stephane Nicoll
* @author Andy Wilkinson * @author Andy Wilkinson
* @author Kazuki Shimizu * @author Kazuki Shimizu
* @since 1.0.0
*/ */
@Configuration @Configuration
@ConditionalOnClass({ JdbcTemplate.class, PlatformTransactionManager.class }) @ConditionalOnClass({ JdbcTemplate.class, PlatformTransactionManager.class })

@ -31,6 +31,7 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
* *
* @author Phillip Webb * @author Phillip Webb
* @author Stephane Nicoll * @author Stephane Nicoll
* @since 1.0.0
* @see DataSourceAutoConfiguration * @see DataSourceAutoConfiguration
*/ */
@Configuration @Configuration

@ -77,6 +77,7 @@ import org.springframework.web.filter.RequestContextFilter;
* @author Andy Wilkinson * @author Andy Wilkinson
* @author Eddú Meléndez * @author Eddú Meléndez
* @author Stephane Nicoll * @author Stephane Nicoll
* @since 1.2.0
*/ */
@Configuration @Configuration
@ConditionalOnClass( @ConditionalOnClass(

@ -37,7 +37,6 @@ import org.springframework.transaction.jta.JtaTransactionManager;
* *
* @author Phillip Webb * @author Phillip Webb
* @author Stephane Nicoll * @author Stephane Nicoll
* @since 1.2.0
*/ */
@Configuration @Configuration
@ConditionalOnClass(EnableJms.class) @ConditionalOnClass(EnableJms.class)

@ -44,6 +44,7 @@ import org.springframework.jms.support.destination.DestinationResolver;
* *
* @author Greg Turnquist * @author Greg Turnquist
* @author Stephane Nicoll * @author Stephane Nicoll
* @since 1.0.0
*/ */
@Configuration @Configuration
@ConditionalOnClass({ Message.class, JmsTemplate.class }) @ConditionalOnClass({ Message.class, JmsTemplate.class })

@ -26,6 +26,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* @author Greg Turnquist * @author Greg Turnquist
* @author Phillip Webb * @author Phillip Webb
* @author Stephane Nicoll * @author Stephane Nicoll
* @since 1.0.0
*/ */
@ConfigurationProperties(prefix = "spring.jms") @ConfigurationProperties(prefix = "spring.jms")
public class JmsProperties { public class JmsProperties {

@ -38,7 +38,6 @@ import org.springframework.context.annotation.Configuration;
* @author Phillip Webb * @author Phillip Webb
* @author Andy Wilkinson * @author Andy Wilkinson
* @author Aurélien Leboulanger * @author Aurélien Leboulanger
* @since 1.1.0
*/ */
@Configuration @Configuration
@ConditionalOnMissingBean(ConnectionFactory.class) @ConditionalOnMissingBean(ConnectionFactory.class)

@ -32,7 +32,6 @@ import org.springframework.util.StringUtils;
* *
* @author Phillip Webb * @author Phillip Webb
* @author Venil Noronha * @author Venil Noronha
* @since 1.2.0
*/ */
class ActiveMQConnectionFactoryFactory { class ActiveMQConnectionFactoryFactory {

@ -30,6 +30,7 @@ import org.springframework.boot.context.properties.DeprecatedConfigurationProper
* @author Stephane Nicoll * @author Stephane Nicoll
* @author Aurélien Leboulanger * @author Aurélien Leboulanger
* @author Venil Noronha * @author Venil Noronha
* @since 1.0.0
*/ */
@ConfigurationProperties(prefix = "spring.activemq") @ConfigurationProperties(prefix = "spring.activemq")
public class ActiveMQProperties { public class ActiveMQProperties {

@ -39,7 +39,6 @@ import org.springframework.context.annotation.Primary;
* *
* @author Phillip Webb * @author Phillip Webb
* @author Aurélien Leboulanger * @author Aurélien Leboulanger
* @since 1.2.0
*/ */
@Configuration @Configuration
@ConditionalOnClass(TransactionManager.class) @ConditionalOnClass(TransactionManager.class)

@ -35,7 +35,6 @@ import org.springframework.context.annotation.Primary;
* *
* @author Eddú Meléndez * @author Eddú Meléndez
* @author Phillip Webb * @author Phillip Webb
* @since 1.3.0
*/ */
@Configuration @Configuration
@ConditionalOnMissingBean(ConnectionFactory.class) @ConditionalOnMissingBean(ConnectionFactory.class)

@ -49,6 +49,7 @@ import org.springframework.util.StringUtils;
* *
* @author Christian Dupuis * @author Christian Dupuis
* @author Madhura Bhave * @author Madhura Bhave
* @since 1.0.0
*/ */
@Configuration @Configuration
@ConditionalOnClass({ MBeanExporter.class }) @ConditionalOnClass({ MBeanExporter.class })

@ -33,7 +33,6 @@ import org.springframework.kafka.support.converter.RecordMessageConverter;
* *
* @author Gary Russell * @author Gary Russell
* @author Eddú Meléndez * @author Eddú Meléndez
* @since 1.5.0
*/ */
@Configuration @Configuration
@ConditionalOnClass(EnableKafka.class) @ConditionalOnClass(EnableKafka.class)

@ -47,6 +47,7 @@ import org.springframework.util.Assert;
* @author Phillip Webb * @author Phillip Webb
* @author Andy Wilkinson * @author Andy Wilkinson
* @author Madhura Bhave * @author Madhura Bhave
* @since 2.0.0
*/ */
public class ConditionEvaluationReportLoggingListener public class ConditionEvaluationReportLoggingListener
implements ApplicationContextInitializer<ConfigurableApplicationContext> { implements ApplicationContextInitializer<ConfigurableApplicationContext> {

@ -38,6 +38,7 @@ import org.springframework.core.env.Environment;
* @author Phillip Webb * @author Phillip Webb
* @author Mark Paluch * @author Mark Paluch
* @author Stephane Nicoll * @author Stephane Nicoll
* @since 1.0.0
*/ */
@Configuration @Configuration
@ConditionalOnClass(MongoClient.class) @ConditionalOnClass(MongoClient.class)

@ -31,6 +31,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* @author Stephane Nicoll * @author Stephane Nicoll
* @author Nasko Vasilev * @author Nasko Vasilev
* @author Mark Paluch * @author Mark Paluch
* @since 1.0.0
*/ */
@ConfigurationProperties(prefix = "spring.data.mongodb") @ConfigurationProperties(prefix = "spring.data.mongodb")
public class MongoProperties { public class MongoProperties {

@ -39,7 +39,6 @@ import org.springframework.core.type.AnnotationMetadata;
* only be registered via the inner {@link Registrar} class. * only be registered via the inner {@link Registrar} class.
* *
* @author Dave Syer * @author Dave Syer
* @since 1.1.0
*/ */
class DataSourceInitializedPublisher implements BeanPostProcessor { class DataSourceInitializedPublisher implements BeanPostProcessor {

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save