From 68bfb020aad3d98fa57de3c2b31addba0f080e6b Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 8 Feb 2019 14:51:38 +0000 Subject: [PATCH] Reduce need for bean method proxying and disable where not needed Closes gh-9068 --- ...abbitHealthIndicatorAutoConfiguration.java | 2 +- .../audit/AuditAutoConfiguration.java | 4 +- .../AuditEventsEndpointAutoConfiguration.java | 2 +- .../beans/BeansEndpointAutoConfiguration.java | 2 +- .../CachesEndpointAutoConfiguration.java | 2 +- ...andraHealthIndicatorAutoConfiguration.java | 2 +- ...ctiveHealthIndicatorAutoConfiguration.java | 2 +- ...CloudFoundryActuatorAutoConfiguration.java | 4 +- ...CloudFoundryActuatorAutoConfiguration.java | 4 +- ...itionsReportEndpointAutoConfiguration.java | 2 +- .../ShutdownEndpointAutoConfiguration.java | 2 +- ...ertiesReportEndpointAutoConfiguration.java | 2 +- ...hbaseHealthIndicatorAutoConfiguration.java | 2 +- ...ctiveHealthIndicatorAutoConfiguration.java | 2 +- ...lientHealthIndicatorAutoConfiguration.java | 2 +- ...hJestHealthIndicatorAutoConfiguration.java | 2 +- ...hRestHealthIndicatorAutoConfiguration.java | 2 +- .../endpoint/EndpointAutoConfiguration.java | 4 +- .../jmx/JmxEndpointAutoConfiguration.java | 2 +- ...ndpointManagementContextConfiguration.java | 6 +- .../web/WebEndpointAutoConfiguration.java | 6 +- ...ndpointManagementContextConfiguration.java | 2 +- ...ndpointManagementContextConfiguration.java | 4 +- ...ndpointManagementContextConfiguration.java | 4 +- .../EnvironmentEndpointAutoConfiguration.java | 2 +- .../FlywayEndpointAutoConfiguration.java | 2 +- .../HealthEndpointAutoConfiguration.java | 4 +- .../health/HealthEndpointConfiguration.java | 2 +- ...althEndpointWebExtensionConfiguration.java | 6 +- .../HealthIndicatorAutoConfiguration.java | 4 +- ...luxDbHealthIndicatorAutoConfiguration.java | 2 +- .../InfoContributorAutoConfiguration.java | 2 +- .../info/InfoEndpointAutoConfiguration.java | 2 +- ...grationGraphEndpointAutoConfiguration.java | 2 +- ...ourceHealthIndicatorAutoConfiguration.java | 2 +- .../JmsHealthIndicatorAutoConfiguration.java | 2 +- .../JolokiaEndpointAutoConfiguration.java | 2 +- .../LdapHealthIndicatorAutoConfiguration.java | 2 +- .../LiquibaseEndpointAutoConfiguration.java | 2 +- .../LogFileWebEndpointAutoConfiguration.java | 2 +- .../LoggersEndpointAutoConfiguration.java | 2 +- .../MailHealthIndicatorAutoConfiguration.java | 2 +- .../HeapDumpWebEndpointAutoConfiguration.java | 2 +- .../ThreadDumpEndpointAutoConfiguration.java | 2 +- ...mpositeMeterRegistryAutoConfiguration.java | 4 +- .../CompositeMeterRegistryConfiguration.java | 2 +- .../metrics/JvmMetricsAutoConfiguration.java | 2 +- .../KafkaMetricsAutoConfiguration.java | 4 +- .../Log4J2MetricsAutoConfiguration.java | 4 +- .../LogbackMetricsAutoConfiguration.java | 2 +- .../metrics/MetricsAutoConfiguration.java | 4 +- .../MetricsEndpointAutoConfiguration.java | 2 +- .../NoOpMeterRegistryConfiguration.java | 4 +- .../SystemMetricsAutoConfiguration.java | 2 +- .../amqp/RabbitMetricsAutoConfiguration.java | 4 +- ...acheMeterBinderProvidersConfiguration.java | 12 ++-- .../cache/CacheMetricsAutoConfiguration.java | 4 +- .../CacheMetricsRegistrarConfiguration.java | 13 ++-- ...pOpticsMetricsExportAutoConfiguration.java | 4 +- .../AtlasMetricsExportAutoConfiguration.java | 4 +- ...DatadogMetricsExportAutoConfiguration.java | 4 +- ...natraceMetricsExportAutoConfiguration.java | 4 +- ...ElasticMetricsExportAutoConfiguration.java | 4 +- ...GangliaMetricsExportAutoConfiguration.java | 4 +- ...raphiteMetricsExportAutoConfiguration.java | 4 +- .../HumioMetricsExportAutoConfiguration.java | 4 +- .../InfluxMetricsExportAutoConfiguration.java | 4 +- .../JmxMetricsExportAutoConfiguration.java | 4 +- .../KairosMetricsExportAutoConfiguration.java | 4 +- ...ewRelicMetricsExportAutoConfiguration.java | 4 +- ...metheusMetricsExportAutoConfiguration.java | 6 +- ...ignalFxMetricsExportAutoConfiguration.java | 4 +- .../SimpleMetricsExportAutoConfiguration.java | 4 +- .../StatsdMetricsExportAutoConfiguration.java | 4 +- ...vefrontMetricsExportAutoConfiguration.java | 4 +- ...ataSourcePoolMetricsAutoConfiguration.java | 6 +- .../JerseyServerMetricsAutoConfiguration.java | 4 +- .../HibernateMetricsAutoConfiguration.java | 2 +- .../HttpClientMetricsAutoConfiguration.java | 2 +- .../RestTemplateMetricsConfiguration.java | 2 +- .../client/WebClientMetricsConfiguration.java | 4 +- .../jetty/JettyMetricsAutoConfiguration.java | 4 +- .../WebFluxMetricsAutoConfiguration.java | 4 +- .../WebMvcMetricsAutoConfiguration.java | 4 +- .../TomcatMetricsAutoConfiguration.java | 4 +- ...MongoHealthIndicatorAutoConfiguration.java | 2 +- ...ctiveHealthIndicatorAutoConfiguration.java | 2 +- ...Neo4jHealthIndicatorAutoConfiguration.java | 2 +- ...RedisHealthIndicatorAutoConfiguration.java | 2 +- ...ctiveHealthIndicatorAutoConfiguration.java | 4 +- ...heduledTasksEndpointAutoConfiguration.java | 2 +- ...anagementWebSecurityAutoConfiguration.java | 2 +- ...anagementWebSecurityAutoConfiguration.java | 2 +- ...anagementWebSecurityConfigurerAdapter.java | 4 +- .../SessionsEndpointAutoConfiguration.java | 2 +- .../SolrHealthIndicatorAutoConfiguration.java | 2 +- ...SpaceHealthIndicatorAutoConfiguration.java | 4 +- .../http/HttpTraceAutoConfiguration.java | 8 +-- .../HttpTraceEndpointAutoConfiguration.java | 2 +- .../web/ManagementContextConfiguration.java | 2 +- .../JerseyManagementContextConfiguration.java | 2 +- .../MappingsEndpointAutoConfiguration.java | 8 +-- ...iveManagementContextAutoConfiguration.java | 4 +- ...leChildManagementContextConfiguration.java | 4 +- .../ManagementContextAutoConfiguration.java | 10 +-- ...etManagementChildContextConfiguration.java | 4 +- ...letManagementContextAutoConfiguration.java | 6 +- .../audit/AuditAutoConfigurationTests.java | 10 +-- .../CachesEndpointAutoConfigurationTests.java | 2 +- ...HealthIndicatorAutoConfigurationTests.java | 4 +- ...HealthIndicatorAutoConfigurationTests.java | 4 +- ...loudFoundryWebEndpointDiscovererTests.java | 4 +- ...oundryWebFluxEndpointIntegrationTests.java | 6 +- ...FoundryActuatorAutoConfigurationTests.java | 6 +- ...FoundryActuatorAutoConfigurationTests.java | 4 +- ...FoundryMvcWebEndpointIntegrationTests.java | 6 +- .../ConditionsReportEndpointTests.java | 4 +- ...sReportEndpointAutoConfigurationTests.java | 2 +- ...HealthIndicatorAutoConfigurationTests.java | 4 +- ...HealthIndicatorAutoConfigurationTests.java | 4 +- ...HealthIndicatorAutoConfigurationTests.java | 4 +- .../ConditionalOnEnabledEndpointTests.java | 16 ++--- .../ConditionalOnExposedEndpointTests.java | 6 +- ...ntManagementContextConfigurationTests.java | 4 +- .../AbstractEndpointDocumentationTests.java | 4 +- ...AuditEventsEndpointDocumentationTests.java | 4 +- .../BeansEndpointDocumentationTests.java | 4 +- .../CachesEndpointDocumentationTests.java | 8 +-- ...tionsReportEndpointDocumentationTests.java | 4 +- ...rtiesReportEndpointDocumentationTests.java | 4 +- ...EnvironmentEndpointDocumentationTests.java | 4 +- .../FlywayEndpointDocumentationTests.java | 4 +- .../HealthEndpointDocumentationTests.java | 4 +- ...HeapDumpWebEndpointDocumentationTests.java | 4 +- .../HttpTraceEndpointDocumentationTests.java | 4 +- .../InfoEndpointDocumentationTests.java | 4 +- ...rationGraphEndpointDocumentationTests.java | 9 +-- .../LiquibaseEndpointDocumentationTests.java | 4 +- .../LogFileWebEndpointDocumentationTests.java | 4 +- .../LoggersEndpointDocumentationTests.java | 4 +- ...ngsEndpointReactiveDocumentationTests.java | 4 +- ...ingsEndpointServletDocumentationTests.java | 4 +- .../MetricsEndpointDocumentationTests.java | 4 +- ...theusScrapeEndpointDocumentationTests.java | 4 +- ...eduledTasksEndpointDocumentationTests.java | 2 +- .../SessionsEndpointDocumentationTests.java | 4 +- .../ShutdownEndpointDocumentationTests.java | 4 +- .../ThreadDumpEndpointDocumentationTests.java | 2 +- ...ntManagementContextConfigurationTests.java | 2 +- .../FlywayEndpointAutoConfigurationTests.java | 2 +- .../HealthEndpointAutoConfigurationTests.java | 4 +- .../HealthEndpointWebExtensionTests.java | 8 +-- ...HealthIndicatorAutoConfigurationTests.java | 6 +- ...activeHealthEndpointWebExtensionTests.java | 4 +- ...HealthIndicatorAutoConfigurationTests.java | 4 +- ...InfoContributorAutoConfigurationTests.java | 12 ++-- .../JerseyEndpointIntegrationTests.java | 4 +- ...ointAutoConfigurationIntegrationTests.java | 4 +- .../WebFluxEndpointIntegrationTests.java | 4 +- .../WebMvcEndpointIntegrationTests.java | 4 +- ...HealthIndicatorAutoConfigurationTests.java | 6 +- ...JolokiaEndpointAutoConfigurationTests.java | 2 +- ...HealthIndicatorAutoConfigurationTests.java | 4 +- ...quibaseEndpointAutoConfigurationTests.java | 4 +- ...LoggersEndpointAutoConfigurationTests.java | 2 +- ...teMeterRegistryAutoConfigurationTests.java | 12 ++-- .../JvmMetricsAutoConfigurationTests.java | 8 +-- .../KafkaMetricsAutoConfigurationTests.java | 2 +- ...4jLoggerContextAutoConfigurationTests.java | 4 +- .../LogbackMetricsAutoConfigurationTests.java | 2 +- ...terRegistryConfigurerIntegrationTests.java | 2 +- .../metrics/MeterRegistryCustomizerTests.java | 4 +- ...ricsAutoConfigurationIntegrationTests.java | 4 +- .../MetricsAutoConfigurationTests.java | 6 +- ...iredConfigurationFailureAnalyzerTests.java | 4 +- .../SystemMetricsAutoConfigurationTests.java | 6 +- .../CacheMetricsAutoConfigurationTests.java | 4 +- ...csMetricsExportAutoConfigurationTests.java | 8 +-- ...asMetricsExportAutoConfigurationTests.java | 6 +- ...ogMetricsExportAutoConfigurationTests.java | 6 +- ...ceMetricsExportAutoConfigurationTests.java | 6 +- ...icMetricsExportAutoConfigurationTests.java | 6 +- ...iaMetricsExportAutoConfigurationTests.java | 6 +- ...teMetricsExportAutoConfigurationTests.java | 6 +- ...ioMetricsExportAutoConfigurationTests.java | 6 +- ...uxMetricsExportAutoConfigurationTests.java | 6 +- ...mxMetricsExportAutoConfigurationTests.java | 8 +-- ...osMetricsExportAutoConfigurationTests.java | 8 +-- ...icMetricsExportAutoConfigurationTests.java | 6 +- ...usMetricsExportAutoConfigurationTests.java | 10 +-- ...FxMetricsExportAutoConfigurationTests.java | 6 +- ...leMetricsExportAutoConfigurationTests.java | 6 +- ...sdMetricsExportAutoConfigurationTests.java | 8 +-- ...ntMetricsExportAutoConfigurationTests.java | 8 +-- ...urcePoolMetricsAutoConfigurationTests.java | 16 ++--- ...eyServerMetricsAutoConfigurationTests.java | 4 +- ...ibernateMetricsAutoConfigurationTests.java | 8 +-- .../metrics/test/MetricsIntegrationTests.java | 4 +- .../WebClientMetricsConfigurationTests.java | 2 +- .../JettyMetricsAutoConfigurationTests.java | 10 +-- .../WebFluxMetricsAutoConfigurationTests.java | 4 +- .../WebMvcMetricsAutoConfigurationTests.java | 4 +- .../TomcatMetricsAutoConfigurationTests.java | 12 ++-- ...HealthIndicatorAutoConfigurationTests.java | 6 +- ...edTasksEndpointAutoConfigurationTests.java | 2 +- ...mentWebSecurityAutoConfigurationTests.java | 4 +- ...stractEndpointRequestIntegrationTests.java | 4 +- ...JerseyEndpointRequestIntegrationTests.java | 4 +- ...mentWebSecurityAutoConfigurationTests.java | 2 +- .../MvcEndpointRequestIntegrationTests.java | 4 +- ...essionsEndpointAutoConfigurationTests.java | 2 +- ...ldManagementContextConfigurationTests.java | 2 +- ...meManagementContextConfigurationTests.java | 6 +- ...ReactiveManagementContextFactoryTests.java | 8 +-- ...ompositeHandlerExceptionResolverTests.java | 6 +- ...ndpointChildContextConfigurationTests.java | 4 +- .../HttpTraceAutoConfigurationTests.java | 10 +-- ...uditEventsEndpointWebIntegrationTests.java | 9 +-- .../actuate/beans/BeansEndpointTests.java | 8 +-- .../CachesEndpointWebIntegrationTests.java | 4 +- .../context/ShutdownEndpointTests.java | 6 +- ...sReportEndpointMethodAnnotationsTests.java | 6 +- ...onPropertiesReportEndpointParentTests.java | 8 +-- ...ionPropertiesReportEndpointProxyTests.java | 8 +-- ...rtiesReportEndpointSerializationTests.java | 24 +++---- ...gurationPropertiesReportEndpointTests.java | 6 +- .../annotation/EndpointDiscovererTests.java | 16 ++--- .../JmxEndpointDiscovererTests.java | 18 +++--- .../AbstractWebEndpointIntegrationTests.java | 36 +++++------ .../web/annotation/BaseConfiguration.java | 7 +- .../ControllerEndpointDiscovererTests.java | 6 +- .../ServletEndpointDiscovererTests.java | 6 +- .../WebEndpointDiscovererTests.java | 32 +++++----- .../JerseyWebEndpointIntegrationTests.java | 6 +- ...ndpointHandlerMappingIntegrationTests.java | 4 +- .../WebFluxEndpointIntegrationTests.java | 6 +- ...ndpointHandlerMappingIntegrationTests.java | 4 +- .../MvcWebEndpointIntegrationTests.java | 6 +- .../web/test/JerseyEndpointsRunner.java | 4 +- .../web/test/WebFluxEndpointsRunner.java | 10 +-- .../web/test/WebMvcEndpointRunner.java | 4 +- .../actuate/env/EnvironmentEndpointTests.java | 4 +- ...nvironmentEndpointWebIntegrationTests.java | 4 +- .../actuate/flyway/FlywayEndpointTests.java | 6 +- .../HealthEndpointWebIntegrationTests.java | 2 +- .../info/InfoEndpointWebIntegrationTests.java | 12 ++-- ...ationGraphEndpointWebIntegrationTests.java | 4 +- .../liquibase/LiquibaseEndpointTests.java | 4 +- ...LogFileWebEndpointWebIntegrationTests.java | 2 +- .../LoggersEndpointWebIntegrationTests.java | 4 +- ...eapDumpWebEndpointWebIntegrationTests.java | 4 +- .../MetricsEndpointWebIntegrationTests.java | 4 +- ...metheusScrapeEndpointIntegrationTests.java | 4 +- .../jdbc/DataSourcePoolMetricsTests.java | 6 +- ...LongTaskTimingHandlerInterceptorTests.java | 4 +- .../WebMvcMetricsFilterAutoTimedTests.java | 4 +- .../web/servlet/WebMvcMetricsFilterTests.java | 4 +- .../WebMvcMetricsIntegrationTests.java | 4 +- .../ScheduledTasksEndpointTests.java | 2 +- .../SessionsEndpointWebIntegrationTests.java | 4 +- .../HttpTraceWebFilterIntegrationTests.java | 4 +- .../web/mappings/MappingsEndpointTests.java | 10 +-- ...gApplicationAdminJmxAutoConfiguration.java | 2 +- .../RabbitAnnotationDrivenConfiguration.java | 6 +- .../amqp/RabbitAutoConfiguration.java | 8 +-- .../aop/AopAutoConfiguration.java | 8 +-- .../batch/BatchAutoConfiguration.java | 2 +- .../batch/BatchConfigurerConfiguration.java | 6 +- .../cache/CacheAutoConfiguration.java | 6 +- .../cache/CaffeineCacheConfiguration.java | 2 +- .../cache/CouchbaseCacheConfiguration.java | 2 +- .../cache/EhCacheCacheConfiguration.java | 2 +- .../cache/GenericCacheConfiguration.java | 2 +- .../cache/HazelcastCacheConfiguration.java | 2 +- ...lcastJCacheCustomizationConfiguration.java | 4 +- .../cache/InfinispanCacheConfiguration.java | 2 +- .../cache/JCacheCacheConfiguration.java | 2 +- .../cache/NoOpCacheConfiguration.java | 4 +- .../cache/RedisCacheConfiguration.java | 2 +- .../cache/SimpleCacheConfiguration.java | 2 +- .../cassandra/CassandraAutoConfiguration.java | 2 +- ...oudServiceConnectorsAutoConfiguration.java | 4 +- ...figurationPropertiesAutoConfiguration.java | 4 +- .../MessageSourceAutoConfiguration.java | 4 +- .../PropertyPlaceholderAutoConfiguration.java | 4 +- .../couchbase/CouchbaseAutoConfiguration.java | 6 +- .../couchbase/CouchbaseConfiguration.java | 2 +- ...ExceptionTranslationAutoConfiguration.java | 4 +- .../CassandraDataAutoConfiguration.java | 2 +- ...assandraReactiveDataAutoConfiguration.java | 4 +- ...ReactiveRepositoriesAutoConfiguration.java | 4 +- ...assandraRepositoriesAutoConfiguration.java | 4 +- ...uchbaseConfigurerAdapterConfiguration.java | 4 +- .../CouchbaseDataAutoConfiguration.java | 6 +- ...ouchbaseReactiveDataAutoConfiguration.java | 4 +- ...ReactiveRepositoriesAutoConfiguration.java | 4 +- ...ouchbaseRepositoriesAutoConfiguration.java | 4 +- .../ElasticsearchAutoConfiguration.java | 4 +- .../ElasticsearchDataAutoConfiguration.java | 4 +- ...icsearchRepositoriesAutoConfiguration.java | 4 +- .../JdbcRepositoriesAutoConfiguration.java | 4 +- .../jpa/JpaRepositoriesAutoConfiguration.java | 2 +- .../LdapRepositoriesAutoConfiguration.java | 4 +- .../mongo/MongoDataAutoConfiguration.java | 4 +- .../data/mongo/MongoDataConfiguration.java | 2 +- .../MongoReactiveDataAutoConfiguration.java | 2 +- ...ReactiveRepositoriesAutoConfiguration.java | 4 +- .../MongoRepositoriesAutoConfiguration.java | 4 +- .../Neo4jBookmarkManagementConfiguration.java | 4 +- .../neo4j/Neo4jDataAutoConfiguration.java | 48 +++++++------- .../Neo4jRepositoriesAutoConfiguration.java | 4 +- .../redis/JedisConnectionConfiguration.java | 2 +- .../redis/LettuceConnectionConfiguration.java | 2 +- .../data/redis/RedisAutoConfiguration.java | 4 +- .../redis/RedisReactiveAutoConfiguration.java | 4 +- .../RedisRepositoriesAutoConfiguration.java | 4 +- .../RepositoryRestMvcAutoConfiguration.java | 4 +- .../SolrRepositoriesAutoConfiguration.java | 4 +- .../web/SpringDataWebAutoConfiguration.java | 4 +- .../jest/JestAutoConfiguration.java | 2 +- .../rest/RestClientAutoConfiguration.java | 4 +- .../flyway/FlywayAutoConfiguration.java | 16 ++--- .../FreeMarkerAutoConfiguration.java | 4 +- .../FreeMarkerNonWebConfiguration.java | 4 +- .../FreeMarkerReactiveWebConfiguration.java | 4 +- .../FreeMarkerServletWebConfiguration.java | 4 +- .../GroovyTemplateAutoConfiguration.java | 6 +- .../gson/GsonAutoConfiguration.java | 4 +- .../h2/H2ConsoleAutoConfiguration.java | 2 +- .../hateoas/HypermediaAutoConfiguration.java | 6 +- ...ediaHttpMessageConverterConfiguration.java | 2 +- .../hazelcast/HazelcastAutoConfiguration.java | 4 +- .../HazelcastClientConfiguration.java | 8 +-- ...zelcastJpaDependencyAutoConfiguration.java | 4 +- .../HazelcastServerConfiguration.java | 8 +-- ...sonHttpMessageConvertersConfiguration.java | 6 +- ...ttpMessageConvertersAutoConfiguration.java | 4 +- ...sonHttpMessageConvertersConfiguration.java | 6 +- ...onbHttpMessageConvertersConfiguration.java | 6 +- .../http/codec/CodecsAutoConfiguration.java | 8 +-- .../influx/InfluxDbAutoConfiguration.java | 2 +- .../info/ProjectInfoAutoConfiguration.java | 4 +- .../IntegrationAutoConfiguration.java | 14 ++-- .../jackson/JacksonAutoConfiguration.java | 12 ++-- .../jdbc/DataSourceAutoConfiguration.java | 8 +-- .../jdbc/DataSourceConfiguration.java | 8 +-- ...DataSourceInitializationConfiguration.java | 4 +- .../jdbc/DataSourceJmxConfiguration.java | 6 +- ...ceTransactionManagerAutoConfiguration.java | 4 +- .../jdbc/EmbeddedDataSourceConfiguration.java | 2 +- .../jdbc/JdbcTemplateAutoConfiguration.java | 6 +- .../jdbc/JndiDataSourceAutoConfiguration.java | 2 +- .../jdbc/XADataSourceAutoConfiguration.java | 2 +- ...rcePoolMetadataProvidersConfiguration.java | 10 +-- .../jersey/JerseyAutoConfiguration.java | 4 +- .../jms/JmsAnnotationDrivenConfiguration.java | 8 +-- .../jms/JmsAutoConfiguration.java | 8 +-- ...ndiConnectionFactoryAutoConfiguration.java | 2 +- .../activemq/ActiveMQAutoConfiguration.java | 4 +- ...ctiveMQConnectionFactoryConfiguration.java | 6 +- ...iveMQXAConnectionFactoryConfiguration.java | 4 +- .../jms/artemis/ArtemisAutoConfiguration.java | 4 +- ...ArtemisConnectionFactoryConfiguration.java | 6 +- .../ArtemisEmbeddedServerConfiguration.java | 2 +- ...temisXAConnectionFactoryConfiguration.java | 4 +- .../jmx/JmxAutoConfiguration.java | 2 +- .../jooq/JooqAutoConfiguration.java | 4 +- .../jsonb/JsonbAutoConfiguration.java | 4 +- .../KafkaAnnotationDrivenConfiguration.java | 4 +- .../kafka/KafkaAutoConfiguration.java | 2 +- ...aStreamsAnnotationDrivenConfiguration.java | 4 +- .../ldap/LdapAutoConfiguration.java | 2 +- .../EmbeddedLdapAutoConfiguration.java | 2 +- .../liquibase/LiquibaseAutoConfiguration.java | 10 +-- .../mail/MailSenderAutoConfiguration.java | 4 +- .../mail/MailSenderJndiConfiguration.java | 4 +- .../MailSenderPropertiesConfiguration.java | 2 +- .../MailSenderValidatorAutoConfiguration.java | 4 +- .../mongo/MongoAutoConfiguration.java | 2 +- .../mongo/MongoReactiveAutoConfiguration.java | 4 +- .../EmbeddedMongoAutoConfiguration.java | 8 +-- .../mustache/MustacheAutoConfiguration.java | 2 +- .../MustacheReactiveWebConfiguration.java | 2 +- .../MustacheServletWebConfiguration.java | 2 +- .../jpa/HibernateJpaAutoConfiguration.java | 4 +- .../orm/jpa/HibernateJpaConfiguration.java | 2 +- .../orm/jpa/JpaBaseConfiguration.java | 50 +++++++-------- .../quartz/QuartzAutoConfiguration.java | 4 +- .../core/ReactorCoreAutoConfiguration.java | 4 +- .../security/SecurityDataConfiguration.java | 4 +- ...ReactiveOAuth2ClientAutoConfiguration.java | 2 +- .../OAuth2ClientAutoConfiguration.java | 4 +- ...ntRegistrationRepositoryConfiguration.java | 2 +- .../OAuth2WebSecurityConfiguration.java | 6 +- ...OAuth2ResourceServerAutoConfiguration.java | 4 +- ...eOAuth2ResourceServerJwkConfiguration.java | 4 +- ...esourceServerWebSecurityConfiguration.java | 2 +- ...OAuth2ResourceServerAutoConfiguration.java | 4 +- .../OAuth2ResourceServerJwtConfiguration.java | 4 +- ...esourceServerWebSecurityConfiguration.java | 6 +- .../ReactiveSecurityAutoConfiguration.java | 6 +- ...veUserDetailsServiceAutoConfiguration.java | 4 +- .../servlet/SecurityAutoConfiguration.java | 4 +- .../SecurityFilterAutoConfiguration.java | 4 +- ...questMatcherProviderAutoConfiguration.java | 8 +-- .../SpringBootWebSecurityConfiguration.java | 6 +- .../UserDetailsServiceAutoConfiguration.java | 4 +- .../WebSecurityEnablerConfiguration.java | 4 +- .../sendgrid/SendGridAutoConfiguration.java | 2 +- .../HazelcastSessionConfiguration.java | 4 +- .../session/JdbcSessionConfiguration.java | 4 +- .../MongoReactiveSessionConfiguration.java | 4 +- .../session/MongoSessionConfiguration.java | 4 +- .../NoOpReactiveSessionConfiguration.java | 4 +- .../session/NoOpSessionConfiguration.java | 4 +- .../RedisReactiveSessionConfiguration.java | 4 +- .../session/RedisSessionConfiguration.java | 4 +- .../session/SessionAutoConfiguration.java | 10 +-- .../SessionRepositoryFilterConfiguration.java | 4 +- .../solr/SolrAutoConfiguration.java | 2 +- .../task/TaskExecutionAutoConfiguration.java | 2 +- .../task/TaskSchedulingAutoConfiguration.java | 2 +- .../thymeleaf/ThymeleafAutoConfiguration.java | 22 +++---- .../TransactionAutoConfiguration.java | 10 +-- .../jta/AtomikosJtaConfiguration.java | 4 +- .../jta/BitronixJtaConfiguration.java | 4 +- .../transaction/jta/JndiJtaConfiguration.java | 2 +- .../transaction/jta/JtaAutoConfiguration.java | 4 +- .../ValidationAutoConfiguration.java | 4 +- .../client/RestTemplateAutoConfiguration.java | 2 +- ...verFactoryCustomizerAutoConfiguration.java | 12 ++-- .../HttpHandlerAutoConfiguration.java | 6 +- ...tiveWebServerFactoryAutoConfiguration.java | 4 +- ...ReactiveWebServerFactoryConfiguration.java | 8 +-- .../reactive/WebFluxAutoConfiguration.java | 8 +-- .../error/ErrorWebFluxAutoConfiguration.java | 2 +- .../ClientHttpConnectorAutoConfiguration.java | 4 +- .../ClientHttpConnectorConfiguration.java | 8 +-- .../client/WebClientAutoConfiguration.java | 6 +- .../DispatcherServletAutoConfiguration.java | 6 +- .../HttpEncodingAutoConfiguration.java | 4 +- .../servlet/MultipartAutoConfiguration.java | 4 +- ...vletWebServerFactoryAutoConfiguration.java | 4 +- .../ServletWebServerFactoryConfiguration.java | 10 +-- .../web/servlet/WebMvcAutoConfiguration.java | 29 +++++---- .../error/ErrorMvcAutoConfiguration.java | 6 +- .../WebServicesAutoConfiguration.java | 4 +- .../WebServiceTemplateAutoConfiguration.java | 2 +- .../WebSocketReactiveAutoConfiguration.java | 4 +- .../WebSocketMessagingAutoConfiguration.java | 6 +- .../WebSocketServletAutoConfiguration.java | 8 +-- .../AutoConfigurationExcludeFilterTests.java | 4 +- ...urationImportSelectorIntegrationTests.java | 10 +-- .../AutoConfigurationImportSelectorTests.java | 4 +- .../AutoConfigurationPackagesTests.java | 6 +- .../AutoConfigurationReproTests.java | 6 +- .../ImportAutoConfigurationTests.java | 10 +-- .../boot/autoconfigure/SpringJUnitTests.java | 4 +- ...icationAdminJmxAutoConfigurationTests.java | 4 +- .../amqp/RabbitAutoConfigurationTests.java | 27 ++++---- .../aop/AopAutoConfigurationTests.java | 6 +- .../batch/BatchAutoConfigurationTests.java | 8 +-- .../JobLauncherCommandLineRunnerTests.java | 4 +- .../AbstractCacheAutoConfigurationTests.java | 4 +- .../cache/CacheAutoConfigurationTests.java | 50 +++++++-------- .../CassandraAutoConfigurationTests.java | 6 +- .../AbstractNestedConditionTests.java | 8 +-- .../condition/AllNestedConditionsTests.java | 4 +- .../condition/AnyNestedConditionTests.java | 4 +- .../ConditionEvaluationReportTests.java | 10 +-- .../condition/ConditionalOnBeanTests.java | 46 ++++++------- .../condition/ConditionalOnClassTests.java | 12 ++-- .../ConditionalOnCloudPlatformTests.java | 6 +- .../ConditionalOnExpressionTests.java | 8 +-- .../condition/ConditionalOnJavaTests.java | 8 +-- .../condition/ConditionalOnJndiTests.java | 6 +- .../ConditionalOnMissingBeanTests.java | 64 +++++++++---------- ...MissingBeanWithFilteredClasspathTests.java | 4 +- .../ConditionalOnMissingClassTests.java | 8 +-- .../ConditionalOnNotWebApplicationTests.java | 6 +- .../condition/ConditionalOnPropertyTests.java | 30 ++++----- .../condition/ConditionalOnResourceTests.java | 8 +-- .../ConditionalOnSingleCandidateTests.java | 18 +++--- .../ConditionalOnWebApplicationTests.java | 8 +-- .../condition/NoneNestedConditionsTests.java | 4 +- ...eanConditionTypeDeductionFailureTests.java | 4 +- .../OnPropertyListConditionTests.java | 4 +- .../condition/ResourceConditionTests.java | 6 +- .../condition/SpringBootConditionTests.java | 6 +- .../scan/ScannedFactoryBeanConfiguration.java | 4 +- ...nWithBeanMethodArgumentsConfiguration.java | 4 +- ...ationPropertiesAutoConfigurationTests.java | 4 +- ...urceAutoConfigurationIntegrationTests.java | 4 +- ...geSourceAutoConfigurationProfileTests.java | 4 +- .../MessageSourceAutoConfigurationTests.java | 8 +-- ...ertyPlaceholderAutoConfigurationTests.java | 6 +- .../filtersample/ExampleConfiguration.java | 4 +- .../ExampleFilteredAutoConfiguration.java | 4 +- ...baseAutoConfigurationIntegrationTests.java | 4 +- .../CouchbaseAutoConfigurationTests.java | 4 +- .../OnBootstrapHostsConditionTests.java | 4 +- ...tionTranslationAutoConfigurationTests.java | 4 +- .../ConditionalOnRepositoryTypeTests.java | 6 +- .../CassandraDataAutoConfigurationTests.java | 10 +-- ...draReactiveDataAutoConfigurationTests.java | 6 +- ...iveRepositoriesAutoConfigurationTests.java | 10 +-- ...draRepositoriesAutoConfigurationTests.java | 10 +-- .../CouchbaseDataAutoConfigurationTests.java | 6 +- ...iveRepositoriesAutoConfigurationTests.java | 6 +- ...aseReactiveDataAutoConfigurationTests.java | 6 +- ...iveRepositoriesAutoConfigurationTests.java | 8 +-- ...aseRepositoriesAutoConfigurationTests.java | 8 +-- .../ElasticsearchAutoConfigurationTests.java | 4 +- ...rchRepositoriesAutoConfigurationTests.java | 8 +-- ...dbcRepositoriesAutoConfigurationTests.java | 2 +- ...JpaRepositoriesAutoConfigurationTests.java | 10 +-- .../jpa/JpaWebAutoConfigurationTests.java | 4 +- ...dapRepositoriesAutoConfigurationTests.java | 8 +-- ...ngoRepositoriesAutoConfigurationTests.java | 12 ++-- .../MongoDataAutoConfigurationTests.java | 8 +-- ...ingRepositoriesAutoConfigurationTests.java | 6 +- ...iveRepositoriesAutoConfigurationTests.java | 10 +-- ...ngoRepositoriesAutoConfigurationTests.java | 10 +-- ...o4jRepositoriesAutoConfigurationTests.java | 10 +-- .../Neo4jDataAutoConfigurationTests.java | 10 +-- .../data/neo4j/Neo4jPropertiesTests.java | 2 +- ...o4jRepositoriesAutoConfigurationTests.java | 10 +-- .../RedisAutoConfigurationJedisTests.java | 6 +- .../redis/RedisAutoConfigurationTests.java | 4 +- ...disRepositoriesAutoConfigurationTests.java | 8 +-- ...positoryRestMvcAutoConfigurationTests.java | 8 +-- ...olrRepositoriesAutoConfigurationTests.java | 10 +-- ...uchBeanDefinitionFailureAnalyzerTests.java | 24 +++---- .../domain/EntityScanPackagesTests.java | 12 ++-- .../domain/EntityScannerTests.java | 8 +-- .../jest/JestAutoConfigurationTests.java | 8 +-- .../RestClientAutoConfigurationTests.java | 6 +- .../flyway/FlywayAutoConfigurationTests.java | 12 ++-- ...oConfigurationServletIntegrationTests.java | 8 +-- .../gson/GsonAutoConfigurationTests.java | 6 +- .../HypermediaAutoConfigurationTests.java | 2 +- ...HazelcastAutoConfigurationClientTests.java | 4 +- ...HazelcastAutoConfigurationServerTests.java | 6 +- ...stJpaDependencyAutoConfigurationTests.java | 6 +- ...ssageConvertersAutoConfigurationTests.java | 14 ++-- .../codec/CodecsAutoConfigurationTests.java | 6 +- .../InfluxDbAutoConfigurationTests.java | 2 +- .../ProjectInfoAutoConfigurationTests.java | 4 +- .../IntegrationAutoConfigurationTests.java | 6 +- .../JacksonAutoConfigurationTests.java | 10 +-- .../DataSourceAutoConfigurationTests.java | 6 +- ...ourceBeanCreationFailureAnalyzerTests.java | 4 +- .../DataSourceInitializerInvokerTests.java | 4 +- .../jdbc/DataSourceJmxConfigurationTests.java | 4 +- ...nsactionManagerAutoConfigurationTests.java | 4 +- ...iverConfigurationFailureAnalyzerTests.java | 4 +- .../JdbcTemplateAutoConfigurationTests.java | 8 +-- .../JndiDataSourceAutoConfigurationTests.java | 4 +- .../jdbc/MultiDataSourceConfiguration.java | 4 +- ...tiDataSourceUsingPrimaryConfiguration.java | 4 +- .../TomcatDataSourceConfigurationTests.java | 4 +- .../XADataSourceAutoConfigurationTests.java | 6 +- ...toConfigurationCustomApplicationTests.java | 6 +- ...igurationCustomFilterContextPathTests.java | 2 +- ...utoConfigurationCustomFilterPathTests.java | 2 +- ...ConfigurationCustomLoadOnStartupTests.java | 2 +- ...rationCustomObjectMapperProviderTests.java | 2 +- ...gurationCustomServletContextPathTests.java | 2 +- ...toConfigurationCustomServletPathTests.java | 2 +- ...toConfigurationDefaultFilterPathTests.java | 2 +- ...oConfigurationDefaultServletPathTests.java | 2 +- ...onfigurationObjectMapperProviderTests.java | 2 +- ...utoConfigurationServletContainerTests.java | 4 +- .../jersey/JerseyAutoConfigurationTests.java | 6 +- ...figurationWithoutApplicationPathTests.java | 2 +- .../jms/JmsAutoConfigurationTests.java | 30 ++++----- .../ActiveMQAutoConfigurationTests.java | 6 +- .../ArtemisAutoConfigurationTests.java | 8 +-- .../jmx/JmxAutoConfigurationTests.java | 4 +- .../jooq/JooqAutoConfigurationTests.java | 4 +- .../jooq/JooqPropertiesTests.java | 4 +- ...afkaAutoConfigurationIntegrationTests.java | 4 +- .../kafka/KafkaAutoConfigurationTests.java | 14 ++-- .../ldap/LdapAutoConfigurationTests.java | 2 +- .../EmbeddedLdapAutoConfigurationTests.java | 4 +- .../LiquibaseAutoConfigurationTests.java | 2 +- ...nEvaluationReportLoggingListenerTests.java | 4 +- .../MailSenderAutoConfigurationTests.java | 6 +- .../mongo/MongoAutoConfigurationTests.java | 12 ++-- .../mongo/MongoClientFactoryTests.java | 4 +- .../mongo/MongoPropertiesTests.java | 4 +- .../MongoReactiveAutoConfigurationTests.java | 13 ++-- .../EmbeddedMongoAutoConfigurationTests.java | 4 +- ...ConfigurationReactiveIntegrationTests.java | 4 +- ...oConfigurationServletIntegrationTests.java | 4 +- .../MustacheAutoConfigurationTests.java | 6 +- .../MustacheStandaloneIntegrationTests.java | 4 +- .../AbstractJpaAutoConfigurationTests.java | 20 +++--- ...tomHibernateJpaAutoConfigurationTests.java | 10 +-- ...ibernate2ndLevelCacheIntegrationTests.java | 4 +- .../HibernateJpaAutoConfigurationTests.java | 16 ++--- .../orm/jpa/HibernatePropertiesTests.java | 4 +- .../orm/jpa/JpaPropertiesTests.java | 4 +- .../packagestest/one/FirstConfiguration.java | 4 +- .../packagestest/two/SecondConfiguration.java | 4 +- .../quartz/QuartzAutoConfigurationTests.java | 26 ++++---- .../QuartzDataSourceInitializerTests.java | 4 +- ...iveOAuth2ClientAutoConfigurationTests.java | 8 +-- .../OAuth2WebSecurityConfigurationTests.java | 12 ++-- ...2ResourceServerAutoConfigurationTests.java | 4 +- ...2ResourceServerAutoConfigurationTests.java | 4 +- ...eactiveSecurityAutoConfigurationTests.java | 4 +- ...rDetailsServiceAutoConfigurationTests.java | 10 +-- .../SecurityAutoConfigurationTests.java | 8 +-- ...ConfigurationEarlyInitializationTests.java | 4 +- .../SecurityFilterAutoConfigurationTests.java | 4 +- ...MatcherProviderAutoConfigurationTests.java | 6 +- ...rDetailsServiceAutoConfigurationTests.java | 16 ++--- .../SendGridAutoConfigurationTests.java | 4 +- ...essionAutoConfigurationHazelcastTests.java | 4 +- ...sionAutoConfigurationIntegrationTests.java | 4 +- .../SessionAutoConfigurationTests.java | 12 ++-- .../TaskExecutionAutoConfigurationTests.java | 12 ++-- .../TaskSchedulingAutoConfigurationTests.java | 12 ++-- ...ymeleafReactiveAutoConfigurationTests.java | 6 +- ...hymeleafServletAutoConfigurationTests.java | 10 +-- .../TransactionAutoConfigurationTests.java | 23 +++---- .../jta/JtaAutoConfigurationTests.java | 6 +- .../ValidationAutoConfigurationTests.java | 22 +++---- .../validation/ValidatorAdapterTests.java | 12 ++-- ...onditionalOnEnabledResourceChainTests.java | 4 +- .../web/ResourcePropertiesBindingTests.java | 4 +- .../RestTemplateAutoConfigurationTests.java | 8 +-- .../HttpHandlerAutoConfigurationTests.java | 4 +- ...ebServerFactoryAutoConfigurationTests.java | 14 ++-- .../WebFluxAutoConfigurationTests.java | 26 ++++---- ...orWebExceptionHandlerIntegrationTests.java | 2 +- ...ntHttpConnectorAutoConfigurationTests.java | 6 +- .../WebClientAutoConfigurationTests.java | 8 +-- .../ConditionalOnMissingFilterBeanTests.java | 16 ++--- ...spatcherServletAutoConfigurationTests.java | 18 +++--- .../FilterOrderingIntegrationTests.java | 8 +-- .../HttpEncodingAutoConfigurationTests.java | 10 +-- .../MultipartAutoConfigurationTests.java | 20 +++--- ...ebServerFactoryAutoConfigurationTests.java | 23 +++---- ...tWebServerServletContextListenerTests.java | 12 ++-- .../servlet/WebMvcAutoConfigurationTests.java | 44 ++++++------- .../WelcomePageHandlerMappingTests.java | 8 +-- ...asicErrorControllerDirectMockMvcTests.java | 12 ++-- .../BasicErrorControllerIntegrationTests.java | 4 +- .../BasicErrorControllerMockMvcTests.java | 4 +- .../DefaultErrorViewIntegrationTests.java | 4 +- .../RemappedErrorViewIntegrationTests.java | 4 +- .../OnWsdlLocationsConditionTests.java | 4 +- ...ServiceTemplateAutoConfigurationTests.java | 8 +-- ...SocketMessagingAutoConfigurationTests.java | 4 +- ...ebSocketServletAutoConfigurationTests.java | 6 +- .../spring-boot-cli/samples/caching.groovy | 6 +- .../spring-boot-cli/samples/jms.groovy | 2 +- .../spring-boot-cli/samples/job.groovy | 2 +- .../spring-boot-cli/samples/rabbit.groovy | 2 +- .../spring-boot-cli/samples/tx.groovy | 2 +- .../spring-boot-cli/samples/ui.groovy | 2 +- .../spring-boot-cli/test-samples/app.groovy | 2 +- .../test-samples/integration.groovy | 2 +- .../spring-boot-cli/test-samples/jms.groovy | 2 +- .../DevToolsDataSourceAutoConfiguration.java | 6 +- .../EagerInitializationAutoConfiguration.java | 2 +- .../LocalDevToolsAutoConfiguration.java | 30 +++++---- .../RemoteDevToolsAutoConfiguration.java | 4 +- .../client/RemoteClientConfiguration.java | 33 ++++++---- .../RemoteUrlPropertyExtractorTests.java | 4 +- ...ToolsDataSourceAutoConfigurationTests.java | 8 +-- .../LocalDevToolsAutoConfigurationTests.java | 10 +-- .../RemoteDevToolsAutoConfigurationTests.java | 4 +- .../ClassPathFileSystemWatcherTests.java | 9 +-- .../DevToolPropertiesIntegrationTests.java | 8 +-- .../HttpTunnelIntegrationTests.java | 4 +- .../RemoteClientConfigurationTests.java | 6 +- .../OnInitializedRestarterConditionTests.java | 4 +- .../restart/RestartScopeInitializerTests.java | 4 +- .../src/main/asciidoc/howto.adoc | 8 +-- .../asciidoc/production-ready-features.adoc | 4 +- .../src/main/asciidoc/spring-boot-cli.adoc | 2 +- .../main/asciidoc/spring-boot-features.adoc | 28 ++++---- .../src/main/asciidoc/using-spring-boot.adoc | 4 +- .../metrics/MetricsFilterBeanExample.java | 4 +- .../UserServiceAutoConfiguration.java | 4 +- .../CloudFoundryCustomContextPathExample.java | 2 +- .../TomcatLegacyCookieProcessorExample.java | 4 +- .../HibernateSearchElasticsearchExample.java | 4 +- .../docs/jdbc/BasicDataSourceExample.java | 4 +- .../jdbc/CompleteTwoDataSourcesExample.java | 2 +- .../jdbc/ConfigurableDataSourceExample.java | 4 +- .../docs/jdbc/SimpleDataSourceExample.java | 4 +- .../jdbc/SimpleTwoDataSourcesExample.java | 2 +- .../jpa/HibernateSecondLevelCacheExample.java | 4 +- .../docs/kafka/KafkaStreamsBeanExample.java | 4 +- .../CustomWebFluxSecurityExample.java | 2 +- .../UnauthenticatedAccessExample.java | 4 +- .../UserServiceAutoConfigurationTests.java | 8 +-- ...mcatLegacyCookieProcessorExampleTests.java | 4 +- .../bind/AppSystemPropertiesTests.java | 4 +- .../PropertiesMigrationListenerTests.java | 4 +- .../jdbc/TestDatabaseAutoConfiguration.java | 2 +- .../json/JsonTestersAutoConfiguration.java | 4 +- .../TestEntityManagerAutoConfiguration.java | 4 +- .../restdocs/RestDocsAutoConfiguration.java | 10 +-- ...ockRestServiceServerAutoConfiguration.java | 4 +- ...ebClientRestTemplateAutoConfiguration.java | 4 +- .../WebTestClientAutoConfiguration.java | 4 +- .../WebTestClientSecurityConfiguration.java | 4 +- .../web/servlet/MockMvcAutoConfiguration.java | 4 +- .../servlet/MockMvcSecurityConfiguration.java | 4 +- .../MockMvcWebClientAutoConfiguration.java | 2 +- .../MockMvcWebDriverAutoConfiguration.java | 2 +- ...ListenerPostConstructIntegrationTests.java | 4 +- ...cyInjectionTestExecutionListenerTests.java | 4 +- ...izerFactoryWithAutoConfigurationTests.java | 2 +- .../AutoConfigureCacheIntegrationTests.java | 4 +- ...hExistingCacheManagerIntegrationTests.java | 4 +- ...thMultipleDatasourcesIntegrationTests.java | 4 +- ...ReplaceAutoConfiguredIntegrationTests.java | 4 +- ...tabaseReplaceExplicitIntegrationTests.java | 4 +- ...aseReplacePropertyAnyIntegrationTests.java | 4 +- ...ropertyAutoConfiguredIntegrationTests.java | 4 +- .../TestDatabaseAutoConfigurationTests.java | 4 +- ...abaseAutoConfigurationNoEmbeddedTests.java | 4 +- ...yMappingContextCustomizerFactoryTests.java | 2 +- ...lientWithRestTemplateIntegrationTests.java | 4 +- .../WebTestClientAutoConfigurationTests.java | 6 +- ...tClientSpringBootTestIntegrationTests.java | 4 +- ...ringBootMockMvcBuilderCustomizerTests.java | 4 +- ...tWebDriverCustomScopeIntegrationTests.java | 4 +- .../context/ImportsContextCustomizer.java | 4 +- .../boot/test/context/TestConfiguration.java | 4 +- ...ileApplicationContextInitializerTests.java | 4 +- .../ImportsContextCustomizerFactoryTests.java | 2 +- .../ImportsContextCustomizerTests.java | 4 +- .../SpringBootContextLoaderMockMvcTests.java | 4 +- .../context/SpringBootContextLoaderTests.java | 4 +- .../SpringBootTestActiveProfileTests.java | 4 +- .../test/context/SpringBootTestArgsTests.java | 2 +- .../SpringBootTestContextHierarchyTests.java | 6 +- .../SpringBootTestCustomConfigNameTests.java | 4 +- .../SpringBootTestCustomPortTests.java | 4 +- ...ringBootTestDefaultConfigurationTests.java | 4 +- .../test/context/SpringBootTestJmxTests.java | 4 +- ...SpringBootTestMixedConfigurationTests.java | 4 +- ...eactiveWebEnvironmentDefinedPortTests.java | 4 +- ...ReactiveWebEnvironmentRandomPortTests.java | 4 +- ...nmentUserDefinedTestRestTemplateTests.java | 4 +- ...tTestUserDefinedTestRestTemplateTests.java | 4 +- ...stWebEnvironmentContextHierarchyTests.java | 6 +- ...ootTestWebEnvironmentDefinedPortTests.java | 4 +- ...SpringBootTestWebEnvironmentMockTests.java | 4 +- ...nmentMockWithWebAppConfigurationTests.java | 4 +- ...bEnvironmentRandomPortCustomPortTests.java | 4 +- ...BootTestWebEnvironmentRandomPortTests.java | 4 +- ...ngBootTestWithClassesIntegrationTests.java | 6 +- ...hContextConfigurationIntegrationTests.java | 6 +- ...ngBootTestWithTestPropertySourceTests.java | 4 +- .../ApplicationContextAssertTests.java | 4 +- ...actJupiterTestWithConfigAndExtendWith.java | 4 +- .../filter/AbstractTestNgTestWithConfig.java | 2 +- .../AbstractTestWithConfigAndRunWith.java | 4 +- .../test/context/filter/SampleConfig.java | 4 +- .../test/context/filter/SampleTestConfig.java | 4 +- .../filter/TestTypeExcludeFilterTests.java | 2 +- ...AbstractApplicationContextRunnerTests.java | 8 +-- ...ockBeanForBeanFactoryIntegrationTests.java | 4 +- ...nClassForExistingBeanIntegrationTests.java | 4 +- ...rationClassForNewBeanIntegrationTests.java | 4 +- ...nFieldForExistingBeanIntegrationTests.java | 4 +- ...rationFieldForNewBeanIntegrationTests.java | 4 +- ...eanOnContextHierarchyIntegrationTests.java | 6 +- .../mockito/MockBeanOnScopedProxyTests.java | 4 +- ...tClassForExistingBeanIntegrationTests.java | 4 +- ...OnTestClassForNewBeanIntegrationTests.java | 4 +- ...kBeanOnTestFieldForExistingBeanConfig.java | 4 +- ...tingBeanWithQualifierIntegrationTests.java | 4 +- ...OnTestFieldForNewBeanIntegrationTests.java | 4 +- .../mockito/MockBeanWithAopProxyTests.java | 4 +- ...hAsyncInterfaceMethodIntegrationTests.java | 4 +- ...ClassModeBeforeMethodIntegrationTests.java | 4 +- ...OnTestFieldForNewBeanIntegrationTests.java | 4 +- .../mockito/MockitoPostProcessorTests.java | 16 ++--- .../mockito/QualifierDefinitionTests.java | 4 +- .../ResetMocksTestExecutionListenerTests.java | 4 +- ...nClassForExistingBeanIntegrationTests.java | 4 +- ...rationClassForNewBeanIntegrationTests.java | 4 +- ...nFieldForExistingBeanIntegrationTests.java | 4 +- ...rationFieldForNewBeanIntegrationTests.java | 4 +- ...eanOnContextHierarchyIntegrationTests.java | 6 +- ...tClassForExistingBeanIntegrationTests.java | 4 +- ...OnTestClassForNewBeanIntegrationTests.java | 4 +- ...yBeanOnTestFieldForExistingBeanConfig.java | 4 +- ...tingBeanWithQualifierIntegrationTests.java | 4 +- ...orExistingGenericBeanIntegrationTests.java | 4 +- ...ngBeansWithOnePrimaryIntegrationTests.java | 4 +- ...OnTestFieldForNewBeanIntegrationTests.java | 4 +- ...thAopProxyAndNotProxyTargetAwareTests.java | 4 +- .../mockito/SpyBeanWithAopProxyTests.java | 4 +- ...ClassModeBeforeMethodIntegrationTests.java | 4 +- ...estFieldForMultipleExistingBeansTests.java | 4 +- .../SpringBootMockServletContextTests.java | 4 +- ...lateContextCustomizerIntegrationTests.java | 4 +- ...ustomizerWithOverrideIntegrationTests.java | 4 +- ...ientContextCustomizerIntegrationTests.java | 4 +- ...ustomizerWithOverrideIntegrationTests.java | 4 +- .../launcher/it/jar/SpringConfiguration.java | 4 +- .../launcher/it/jar/SpringConfiguration.java | 4 +- .../it/props/SpringConfiguration.java | 4 +- .../it/props/SpringConfiguration.java | 4 +- .../launcher/it/war/SpringConfiguration.java | 4 +- .../boot/SpringBootConfiguration.java | 2 +- .../support/ErrorPageFilterConfiguration.java | 4 +- .../org/springframework/boot/BannerTests.java | 4 +- .../boot/OverrideSourcesTests.java | 6 +- .../org/springframework/boot/ReproTests.java | 4 +- .../springframework/boot/SimpleMainTests.java | 2 +- .../boot/SpringApplicationNoWebTests.java | 4 +- .../boot/SpringApplicationTests.java | 26 ++++---- ...gApplicationAdminMXBeanRegistrarTests.java | 4 +- .../SpringApplicationBuilderTests.java | 6 +- .../boot/context/TypeExcludeFilterTests.java | 4 +- .../AnsiOutputApplicationListenerTests.java | 4 +- .../ConfigFileApplicationListenerTests.java | 16 ++--- ...ationListenerYamlProfileNegationTests.java | 4 +- .../dflt/InDefaultPackageConfiguration.java | 4 +- ...geWithBasePackageClassesConfiguration.java | 4 +- ...tPackageWithBasePackagesConfiguration.java | 4 +- ...ackageWithMetaAnnotationConfiguration.java | 4 +- ...nDefaultPackageWithValueConfiguration.java | 4 +- ...efaultPackageWithoutScanConfiguration.java | 4 +- .../InOrgSpringPackageConfiguration.java | 4 +- .../InRealButScanningProblemPackages.java | 4 +- .../real/InRealPackageConfiguration.java | 4 +- ...tionPropertiesBindHandlerAdvisorTests.java | 6 +- .../ConfigurationPropertiesTests.java | 62 +++++++++--------- .../FailureAnalyzersIntegrationTests.java | 2 +- ...rrentlyInCreationFailureAnalyzerTests.java | 18 +++--- ...efinitionOverrideFailureAnalyzerTests.java | 8 +-- ...NotOfRequiredTypeFailureAnalyzerTests.java | 6 +- ...ationPropertyNameFailureAnalyzerTests.java | 2 +- ...queBeanDefinitionFailureAnalyzerTests.java | 16 ++--- ...ependsOnBeanFactoryPostProcessorTests.java | 4 +- ...ependentBeanFactoryPostProcessorTests.java | 4 +- ...erviceLocatorApplicationListenerTests.java | 4 +- ...ctiveWebServerApplicationContextTests.java | 6 +- ...tiveWebServerApplicationConfiguration.java | 4 +- .../boot/web/server/LocalServerPortTests.java | 4 +- .../FilterRegistrationIntegrationTests.java | 8 +-- .../ServletComponentScanIntegrationTests.java | 4 +- .../ServletComponentScanRegistrarTests.java | 14 ++-- .../ServletContextInitializerBeansTests.java | 6 +- ...rvletWebServerApplicationContextTests.java | 6 +- .../ServletWebServerMvcIntegrationTests.java | 17 ++--- ...vletWebServerApplicationConfiguration.java | 4 +- .../ErrorPageFilterIntegrationTests.java | 4 +- .../SpringBootServletInitializerTests.java | 10 +-- .../boot/SpringApplicationExtensionsTests.kt | 2 +- .../customsecurity/SecurityConfiguration.java | 4 +- ...hutdownSampleActuatorApplicationTests.java | 4 +- .../SampleAtmosphereApplication.java | 4 +- .../SampleAtmosphereApplicationTests.java | 4 +- .../producer/ProducerApplication.java | 4 +- .../SampleParentContextApplication.java | 2 +- .../parent/producer/ProducerApplication.java | 4 +- ...anagementPortSampleSecureWebFluxTests.java | 2 +- ...ampleSecureWebFluxCustomSecurityTests.java | 4 +- ...igurationSampleTomcatApplicationTests.java | 4 +- .../sample/traditional/config/WebConfig.java | 4 +- .../SampleMethodSecurityApplication.java | 8 +-- .../SampleWebSecureCustomApplication.java | 4 +- .../jdbc/SampleWebSecureJdbcApplication.java | 4 +- .../secure/SampleWebSecureApplication.java | 4 +- .../sample/webservices/WebServiceConfig.java | 4 +- .../SampleJettyWebSocketsApplication.java | 4 +- .../SampleWebSocketsApplicationTests.java | 4 +- ...omContainerWebSocketsApplicationTests.java | 6 +- .../SampleTomcatWebSocketApplication.java | 4 +- .../SampleWebSocketsApplicationTests.java | 4 +- ...omContainerWebSocketsApplicationTests.java | 6 +- .../SampleUndertowWebSocketsApplication.java | 4 +- .../SampleWebSocketsApplicationTests.java | 4 +- ...omContainerWebSocketsApplicationTests.java | 6 +- 887 files changed, 2574 insertions(+), 2542 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/amqp/RabbitHealthIndicatorAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/amqp/RabbitHealthIndicatorAutoConfiguration.java index a2b0ccc49b0..061f0d1d62d 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/amqp/RabbitHealthIndicatorAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/amqp/RabbitHealthIndicatorAutoConfiguration.java @@ -40,7 +40,7 @@ import org.springframework.context.annotation.Configuration; * @author Christian Dupuis * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(RabbitTemplate.class) @ConditionalOnBean(RabbitTemplate.class) @ConditionalOnEnabledHealthIndicator("rabbit") diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/audit/AuditAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/audit/AuditAutoConfiguration.java index d65aad3624b..e337e043d00 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/audit/AuditAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/audit/AuditAutoConfiguration.java @@ -39,7 +39,7 @@ import org.springframework.context.annotation.Configuration; * @author Vedran Pavic * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) public class AuditAutoConfiguration { @Bean @@ -63,7 +63,7 @@ public class AuditAutoConfiguration { return new AuthorizationAuditListener(); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(AuditEventRepository.class) protected static class AuditEventRepositoryConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/audit/AuditEventsEndpointAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/audit/AuditEventsEndpointAutoConfiguration.java index daafb28ca76..ca3bbbba5e6 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/audit/AuditEventsEndpointAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/audit/AuditEventsEndpointAutoConfiguration.java @@ -36,7 +36,7 @@ import org.springframework.context.annotation.Configuration; * @author Vedran Pavic * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureAfter(AuditAutoConfiguration.class) @ConditionalOnEnabledEndpoint(endpoint = AuditEventsEndpoint.class) @ConditionalOnExposedEndpoint(endpoint = AuditEventsEndpoint.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/beans/BeansEndpointAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/beans/BeansEndpointAutoConfiguration.java index 6c9eaadaec5..12c64714ef8 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/beans/BeansEndpointAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/beans/BeansEndpointAutoConfiguration.java @@ -31,7 +31,7 @@ import org.springframework.context.annotation.Configuration; * @author Phillip Webb * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnEnabledEndpoint(endpoint = BeansEndpoint.class) @ConditionalOnExposedEndpoint(endpoint = BeansEndpoint.class) public class BeansEndpointAutoConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cache/CachesEndpointAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cache/CachesEndpointAutoConfiguration.java index ba870cccb1b..a85ab025669 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cache/CachesEndpointAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cache/CachesEndpointAutoConfiguration.java @@ -39,7 +39,7 @@ import org.springframework.context.annotation.Configuration; * @author Stephane Nicoll * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(CacheManager.class) @ConditionalOnEnabledEndpoint(endpoint = CachesEndpoint.class) @ConditionalOnExposedEndpoint(endpoint = CachesEndpoint.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraHealthIndicatorAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraHealthIndicatorAutoConfiguration.java index c22c0c686a5..45348f37025 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraHealthIndicatorAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraHealthIndicatorAutoConfiguration.java @@ -45,7 +45,7 @@ import org.springframework.data.cassandra.core.CassandraOperations; * @author Stephane Nicoll * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Cluster.class, CassandraOperations.class }) @ConditionalOnBean(CassandraOperations.class) @ConditionalOnEnabledHealthIndicator("cassandra") diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraReactiveHealthIndicatorAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraReactiveHealthIndicatorAutoConfiguration.java index 68fdb29f917..508307f2e3a 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraReactiveHealthIndicatorAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraReactiveHealthIndicatorAutoConfiguration.java @@ -44,7 +44,7 @@ import org.springframework.data.cassandra.core.ReactiveCassandraOperations; * @author Stephane Nicoll * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Cluster.class, ReactiveCassandraOperations.class, Flux.class }) @ConditionalOnBean(ReactiveCassandraOperations.class) @ConditionalOnEnabledHealthIndicator("cassandra") diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfiguration.java index 6a72a29e480..b6c0e1a3e70 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfiguration.java @@ -66,7 +66,7 @@ import org.springframework.web.server.WebFilter; * @author Madhura Bhave * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty(prefix = "management.cloudfoundry", name = "enabled", matchIfMissing = true) @AutoConfigureAfter(HealthEndpointAutoConfiguration.class) @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE) @@ -135,7 +135,7 @@ public class ReactiveCloudFoundryActuatorAutoConfiguration { return corsConfiguration; } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(MatcherSecurityWebFilterChain.class) static class IgnoredPathsSecurityConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfiguration.java index f254fd931de..cb0f2ab3cdd 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfiguration.java @@ -67,7 +67,7 @@ import org.springframework.web.servlet.DispatcherServlet; * @author Madhura Bhave * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty(prefix = "management.cloudfoundry", name = "enabled", matchIfMissing = true) @AutoConfigureAfter({ ServletManagementContextAutoConfiguration.class, HealthEndpointAutoConfiguration.class }) @@ -146,7 +146,7 @@ public class CloudFoundryActuatorAutoConfiguration { */ @ConditionalOnClass(WebSecurity.class) @Order(SecurityProperties.IGNORED_ORDER) - @Configuration + @Configuration(proxyBeanMethods = false) public static class IgnoredPathsWebSecurityConfigurer implements WebSecurityConfigurer { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/condition/ConditionsReportEndpointAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/condition/ConditionsReportEndpointAutoConfiguration.java index 7a255eec8f0..75858fbf12e 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/condition/ConditionsReportEndpointAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/condition/ConditionsReportEndpointAutoConfiguration.java @@ -32,7 +32,7 @@ import org.springframework.context.annotation.Configuration; * @author Phillip Webb * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnEnabledEndpoint(endpoint = ConditionsReportEndpoint.class) @ConditionalOnExposedEndpoint(endpoint = ConditionsReportEndpoint.class) public class ConditionsReportEndpointAutoConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/context/ShutdownEndpointAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/context/ShutdownEndpointAutoConfiguration.java index 43fe796c4eb..6d3dbf8de13 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/context/ShutdownEndpointAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/context/ShutdownEndpointAutoConfiguration.java @@ -30,7 +30,7 @@ import org.springframework.context.annotation.Configuration; * @author Phillip Webb * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnEnabledEndpoint(endpoint = ShutdownEndpoint.class) @ConditionalOnExposedEndpoint(endpoint = ShutdownEndpoint.class) public class ShutdownEndpointAutoConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/context/properties/ConfigurationPropertiesReportEndpointAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/context/properties/ConfigurationPropertiesReportEndpointAutoConfiguration.java index f40675517e3..b8b7d967e2f 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/context/properties/ConfigurationPropertiesReportEndpointAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/context/properties/ConfigurationPropertiesReportEndpointAutoConfiguration.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Configuration; * @author Stephane Nicoll * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnEnabledEndpoint(endpoint = ConfigurationPropertiesReportEndpoint.class) @ConditionalOnExposedEndpoint(endpoint = ConfigurationPropertiesReportEndpoint.class) @EnableConfigurationProperties(ConfigurationPropertiesReportEndpointProperties.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/couchbase/CouchbaseHealthIndicatorAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/couchbase/CouchbaseHealthIndicatorAutoConfiguration.java index ca2a690c3f2..552d476c1b5 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/couchbase/CouchbaseHealthIndicatorAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/couchbase/CouchbaseHealthIndicatorAutoConfiguration.java @@ -43,7 +43,7 @@ import org.springframework.context.annotation.Configuration; * @author Andy Wilkinson Nicoll * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(Cluster.class) @ConditionalOnBean(Cluster.class) @ConditionalOnEnabledHealthIndicator("couchbase") diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/couchbase/CouchbaseReactiveHealthIndicatorAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/couchbase/CouchbaseReactiveHealthIndicatorAutoConfiguration.java index 59d890a366e..531165b3416 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/couchbase/CouchbaseReactiveHealthIndicatorAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/couchbase/CouchbaseReactiveHealthIndicatorAutoConfiguration.java @@ -43,7 +43,7 @@ import org.springframework.context.annotation.Configuration; * @author Stephane Nicoll * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Cluster.class, Flux.class }) @ConditionalOnBean(Cluster.class) @ConditionalOnEnabledHealthIndicator("couchbase") diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticSearchClientHealthIndicatorAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticSearchClientHealthIndicatorAutoConfiguration.java index da3642e65c0..62731fcabb4 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticSearchClientHealthIndicatorAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticSearchClientHealthIndicatorAutoConfiguration.java @@ -44,7 +44,7 @@ import org.springframework.context.annotation.Configuration; * @author Stephane Nicoll * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(Client.class) @ConditionalOnBean(Client.class) @ConditionalOnEnabledHealthIndicator("elasticsearch") diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticSearchJestHealthIndicatorAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticSearchJestHealthIndicatorAutoConfiguration.java index 27717ce674e..d26fb7c5879 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticSearchJestHealthIndicatorAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticSearchJestHealthIndicatorAutoConfiguration.java @@ -43,7 +43,7 @@ import org.springframework.context.annotation.Configuration; * @author Stephane Nicoll * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(JestClient.class) @ConditionalOnBean(JestClient.class) @ConditionalOnEnabledHealthIndicator("elasticsearch") diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticSearchRestHealthIndicatorAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticSearchRestHealthIndicatorAutoConfiguration.java index 409c3666683..5a16c08dc2c 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticSearchRestHealthIndicatorAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticSearchRestHealthIndicatorAutoConfiguration.java @@ -43,7 +43,7 @@ import org.springframework.context.annotation.Configuration; * @since 2.1.1 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(RestClient.class) @ConditionalOnBean(RestClient.class) @ConditionalOnEnabledHealthIndicator("elasticsearch") diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/EndpointAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/EndpointAutoConfiguration.java index 08c72b3e811..1575199855d 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/EndpointAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/EndpointAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -33,7 +33,7 @@ import org.springframework.core.env.Environment; * @author Stephane Nicoll * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) public class EndpointAutoConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/jmx/JmxEndpointAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/jmx/JmxEndpointAutoConfiguration.java index b17e0768872..1d871fbf28a 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/jmx/JmxEndpointAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/jmx/JmxEndpointAutoConfiguration.java @@ -56,7 +56,7 @@ import org.springframework.util.ObjectUtils; * @author Phillip Webb * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureAfter(JmxAutoConfiguration.class) @EnableConfigurationProperties(JmxEndpointProperties.class) @ConditionalOnProperty(prefix = "spring.jmx", name = "enabled", havingValue = "true") diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/ServletEndpointManagementContextConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/ServletEndpointManagementContextConfiguration.java index 29350857df0..d6dcc967fb0 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/ServletEndpointManagementContextConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/ServletEndpointManagementContextConfiguration.java @@ -41,7 +41,7 @@ import org.springframework.web.servlet.DispatcherServlet; * @author Madhura Bhave * @since 2.0.0 */ -@ManagementContextConfiguration +@ManagementContextConfiguration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.SERVLET) public class ServletEndpointManagementContextConfiguration { @@ -53,7 +53,7 @@ public class ServletEndpointManagementContextConfiguration { exposure.getInclude(), exposure.getExclude()); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(DispatcherServlet.class) public static class WebMvcServletEndpointManagementContextConfiguration { @@ -69,7 +69,7 @@ public class ServletEndpointManagementContextConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(ResourceConfig.class) @ConditionalOnMissingClass("org.springframework.web.servlet.DispatcherServlet") public static class JerseyServletEndpointManagementContextConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointAutoConfiguration.java index c80246c80e2..6b47aada01b 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -60,7 +60,7 @@ import org.springframework.context.annotation.Configuration; * @author Stephane Nicoll * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication @AutoConfigureAfter(EndpointAutoConfiguration.class) @EnableConfigurationProperties(WebEndpointProperties.class) @@ -139,7 +139,7 @@ public class WebEndpointAutoConfiguration { exposure.getExclude()); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.SERVLET) static class WebEndpointServletConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/jersey/JerseyWebEndpointManagementContextConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/jersey/JerseyWebEndpointManagementContextConfiguration.java index 73cd87d95aa..56cfb9a84ea 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/jersey/JerseyWebEndpointManagementContextConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/jersey/JerseyWebEndpointManagementContextConfiguration.java @@ -51,7 +51,7 @@ import org.springframework.context.annotation.Bean; * @author Michael Simons * @author Madhura Bhave */ -@ManagementContextConfiguration +@ManagementContextConfiguration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.SERVLET) @ConditionalOnClass(ResourceConfig.class) @ConditionalOnBean(WebEndpointsSupplier.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/reactive/WebFluxEndpointManagementContextConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/reactive/WebFluxEndpointManagementContextConfiguration.java index f46b9077e89..125f323efbc 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/reactive/WebFluxEndpointManagementContextConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/reactive/WebFluxEndpointManagementContextConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -50,7 +50,7 @@ import org.springframework.web.reactive.DispatcherHandler; * @author Phillip Webb * @since 2.0.0 */ -@ManagementContextConfiguration +@ManagementContextConfiguration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.REACTIVE) @ConditionalOnClass({ DispatcherHandler.class, HttpHandler.class }) @ConditionalOnBean(WebEndpointsSupplier.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/servlet/WebMvcEndpointManagementContextConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/servlet/WebMvcEndpointManagementContextConfiguration.java index 07e3bff034c..33102a1ce1f 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/servlet/WebMvcEndpointManagementContextConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/servlet/WebMvcEndpointManagementContextConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -50,7 +50,7 @@ import org.springframework.web.servlet.DispatcherServlet; * @author Phillip Webb * @since 2.0.0 */ -@ManagementContextConfiguration +@ManagementContextConfiguration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.SERVLET) @ConditionalOnClass(DispatcherServlet.class) @ConditionalOnBean({ DispatcherServlet.class, WebEndpointsSupplier.class }) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/env/EnvironmentEndpointAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/env/EnvironmentEndpointAutoConfiguration.java index c00dd5d223e..2c2eb2de99e 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/env/EnvironmentEndpointAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/env/EnvironmentEndpointAutoConfiguration.java @@ -35,7 +35,7 @@ import org.springframework.core.env.Environment; * @author Stephane Nicoll * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnEnabledEndpoint(endpoint = EnvironmentEndpoint.class) @ConditionalOnExposedEndpoint(endpoint = EnvironmentEndpoint.class) @EnableConfigurationProperties(EnvironmentEndpointProperties.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/flyway/FlywayEndpointAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/flyway/FlywayEndpointAutoConfiguration.java index 01323a06c87..8a12b367e44 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/flyway/FlywayEndpointAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/flyway/FlywayEndpointAutoConfiguration.java @@ -37,7 +37,7 @@ import org.springframework.context.annotation.Configuration; * @author Phillip Webb * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(Flyway.class) @ConditionalOnEnabledEndpoint(endpoint = FlywayEndpoint.class) @ConditionalOnExposedEndpoint(endpoint = FlywayEndpoint.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointAutoConfiguration.java index 5a387f3c4ff..6b406340086 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -31,7 +31,7 @@ import org.springframework.context.annotation.Import; * @author Phillip Webb * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties({ HealthEndpointProperties.class, HealthIndicatorProperties.class }) @AutoConfigureAfter(HealthIndicatorAutoConfiguration.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointConfiguration.java index a29da3afee4..ff62bb0ec59 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointConfiguration.java @@ -32,7 +32,7 @@ import org.springframework.context.annotation.Configuration; * * @author Stephane Nicoll */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnSingleCandidate(HealthIndicatorRegistry.class) @ConditionalOnEnabledEndpoint(endpoint = HealthEndpoint.class) @ConditionalOnExposedEndpoint(endpoint = HealthEndpoint.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointWebExtensionConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointWebExtensionConfiguration.java index 880df3e8f91..14a640541df 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointWebExtensionConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointWebExtensionConfiguration.java @@ -42,7 +42,7 @@ import org.springframework.context.annotation.Configuration; * * @author Stephane Nicoll */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(HealthIndicatorProperties.class) @ConditionalOnEnabledEndpoint(endpoint = HealthEndpoint.class) @ConditionalOnExposedEndpoint(endpoint = HealthEndpoint.class) @@ -68,7 +68,7 @@ class HealthEndpointWebExtensionConfiguration { properties.getShowDetails(), properties.getRoles()); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.REACTIVE) @ConditionalOnSingleCandidate(ReactiveHealthIndicatorRegistry.class) static class ReactiveWebHealthConfiguration { @@ -89,7 +89,7 @@ class HealthEndpointWebExtensionConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.SERVLET) static class ServletWebHealthConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorAutoConfiguration.java index a8687d4c601..cfea36262df 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorAutoConfiguration.java @@ -45,7 +45,7 @@ import org.springframework.context.annotation.Configuration; * @author Vedran Pavic * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties({ HealthIndicatorProperties.class }) public class HealthIndicatorAutoConfiguration { @@ -73,7 +73,7 @@ public class HealthIndicatorAutoConfiguration { return HealthIndicatorRegistryBeans.get(applicationContext); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(Flux.class) static class ReactiveHealthIndicatorConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/influx/InfluxDbHealthIndicatorAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/influx/InfluxDbHealthIndicatorAutoConfiguration.java index 8ffdffeaf29..86dc99cd4e8 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/influx/InfluxDbHealthIndicatorAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/influx/InfluxDbHealthIndicatorAutoConfiguration.java @@ -41,7 +41,7 @@ import org.springframework.context.annotation.Configuration; * @author Eddú Meléndez * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(InfluxDB.class) @ConditionalOnBean(InfluxDB.class) @ConditionalOnEnabledHealthIndicator("influxdb") diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/info/InfoContributorAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/info/InfoContributorAutoConfiguration.java index f876863c235..ee0d9ad5113 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/info/InfoContributorAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/info/InfoContributorAutoConfiguration.java @@ -42,7 +42,7 @@ import org.springframework.core.env.ConfigurableEnvironment; * @author Stephane Nicoll * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureAfter(ProjectInfoAutoConfiguration.class) @EnableConfigurationProperties(InfoContributorProperties.class) public class InfoContributorAutoConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/info/InfoEndpointAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/info/InfoEndpointAutoConfiguration.java index ab19066b64e..28dcb6261d2 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/info/InfoEndpointAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/info/InfoEndpointAutoConfiguration.java @@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration; * @author Phillip Webb * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnEnabledEndpoint(endpoint = InfoEndpoint.class) @ConditionalOnExposedEndpoint(endpoint = InfoEndpoint.class) @AutoConfigureAfter(InfoContributorAutoConfiguration.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/integration/IntegrationGraphEndpointAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/integration/IntegrationGraphEndpointAutoConfiguration.java index dc29cd57099..5b181f2344f 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/integration/IntegrationGraphEndpointAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/integration/IntegrationGraphEndpointAutoConfiguration.java @@ -38,7 +38,7 @@ import org.springframework.integration.graph.IntegrationGraphServer; * @author Stephane Nicoll * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(IntegrationGraphServer.class) @ConditionalOnBean(IntegrationConfigurationBeanFactoryPostProcessor.class) @ConditionalOnEnabledEndpoint(endpoint = IntegrationGraphEndpoint.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthIndicatorAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthIndicatorAutoConfiguration.java index 5c038d233fa..b0bebbbb256 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthIndicatorAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthIndicatorAutoConfiguration.java @@ -56,7 +56,7 @@ import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; * @author Arthur Kalimullin * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ JdbcTemplate.class, AbstractRoutingDataSource.class }) @ConditionalOnBean(DataSource.class) @ConditionalOnEnabledHealthIndicator("db") diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/jms/JmsHealthIndicatorAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/jms/JmsHealthIndicatorAutoConfiguration.java index 3af7007ee4d..69415e3fe9f 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/jms/JmsHealthIndicatorAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/jms/JmsHealthIndicatorAutoConfiguration.java @@ -42,7 +42,7 @@ import org.springframework.context.annotation.Configuration; * @author Stephane Nicoll * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(ConnectionFactory.class) @ConditionalOnBean(ConnectionFactory.class) @ConditionalOnEnabledHealthIndicator("jms") diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/jolokia/JolokiaEndpointAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/jolokia/JolokiaEndpointAutoConfiguration.java index e4e28ed798b..dafa6742772 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/jolokia/JolokiaEndpointAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/jolokia/JolokiaEndpointAutoConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration; * @author Phillip Webb * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.SERVLET) @ConditionalOnClass(AgentServlet.class) @ConditionalOnEnabledEndpoint(endpoint = JolokiaEndpoint.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/ldap/LdapHealthIndicatorAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/ldap/LdapHealthIndicatorAutoConfiguration.java index a6551f684e1..361be53b641 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/ldap/LdapHealthIndicatorAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/ldap/LdapHealthIndicatorAutoConfiguration.java @@ -41,7 +41,7 @@ import org.springframework.ldap.core.LdapOperations; * @author Stephane Nicoll * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(LdapOperations.class) @ConditionalOnBean(LdapOperations.class) @ConditionalOnEnabledHealthIndicator("ldap") diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/liquibase/LiquibaseEndpointAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/liquibase/LiquibaseEndpointAutoConfiguration.java index 6a275ef6a0e..bb39e0c8b69 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/liquibase/LiquibaseEndpointAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/liquibase/LiquibaseEndpointAutoConfiguration.java @@ -40,7 +40,7 @@ import org.springframework.context.annotation.Configuration; * @author Phillip Webb * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(SpringLiquibase.class) @ConditionalOnEnabledEndpoint(endpoint = LiquibaseEndpoint.class) @ConditionalOnExposedEndpoint(endpoint = LiquibaseEndpoint.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointAutoConfiguration.java index 0ad9493e4bd..c58bf6b4fe9 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointAutoConfiguration.java @@ -39,7 +39,7 @@ import org.springframework.util.StringUtils; * @author Christian Carriere-Tisseur * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(LogFileWebEndpointProperties.class) public class LogFileWebEndpointAutoConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/LoggersEndpointAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/LoggersEndpointAutoConfiguration.java index f9f8d4e4911..a40bd91c2a7 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/LoggersEndpointAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/LoggersEndpointAutoConfiguration.java @@ -38,7 +38,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; * @author Phillip Webb * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnEnabledEndpoint(endpoint = LoggersEndpoint.class) @ConditionalOnExposedEndpoint(endpoint = LoggersEndpoint.class) public class LoggersEndpointAutoConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/mail/MailHealthIndicatorAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/mail/MailHealthIndicatorAutoConfiguration.java index 4c18df9667d..f0922765166 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/mail/MailHealthIndicatorAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/mail/MailHealthIndicatorAutoConfiguration.java @@ -40,7 +40,7 @@ import org.springframework.mail.javamail.JavaMailSenderImpl; * @author Johannes Edmeier * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(JavaMailSenderImpl.class) @ConditionalOnBean(JavaMailSenderImpl.class) @ConditionalOnEnabledHealthIndicator("mail") diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/management/HeapDumpWebEndpointAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/management/HeapDumpWebEndpointAutoConfiguration.java index add0846274f..0b16fab51b5 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/management/HeapDumpWebEndpointAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/management/HeapDumpWebEndpointAutoConfiguration.java @@ -30,7 +30,7 @@ import org.springframework.context.annotation.Configuration; * @author Andy Wilkinson * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnEnabledEndpoint(endpoint = HeapDumpWebEndpoint.class) @ConditionalOnExposedEndpoint(endpoint = HeapDumpWebEndpoint.class) public class HeapDumpWebEndpointAutoConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/management/ThreadDumpEndpointAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/management/ThreadDumpEndpointAutoConfiguration.java index d0cc8bf5d54..2ffc76a6dcf 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/management/ThreadDumpEndpointAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/management/ThreadDumpEndpointAutoConfiguration.java @@ -30,7 +30,7 @@ import org.springframework.context.annotation.Configuration; * @author Phillip Webb * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnEnabledEndpoint(endpoint = ThreadDumpEndpoint.class) @ConditionalOnExposedEndpoint(endpoint = ThreadDumpEndpoint.class) public class ThreadDumpEndpointAutoConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/CompositeMeterRegistryAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/CompositeMeterRegistryAutoConfiguration.java index ac738245540..2930bb1983a 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/CompositeMeterRegistryAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/CompositeMeterRegistryAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -30,7 +30,7 @@ import org.springframework.context.annotation.Import; * @author Andy Wilkinson * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @Import({ NoOpMeterRegistryConfiguration.class, CompositeMeterRegistryConfiguration.class }) @ConditionalOnClass(CompositeMeterRegistry.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/CompositeMeterRegistryConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/CompositeMeterRegistryConfiguration.java index 6a8c773572e..2cab421434f 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/CompositeMeterRegistryConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/CompositeMeterRegistryConfiguration.java @@ -36,7 +36,7 @@ import org.springframework.context.annotation.Primary; * * @author Andy Wilkinson */ -@Configuration +@Configuration(proxyBeanMethods = false) @Conditional(MultipleNonPrimaryMeterRegistriesCondition.class) class CompositeMeterRegistryConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/JvmMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/JvmMetricsAutoConfiguration.java index 70808da9561..54970017437 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/JvmMetricsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/JvmMetricsAutoConfiguration.java @@ -36,7 +36,7 @@ import org.springframework.context.annotation.Configuration; * @author Stephane Nicoll * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureAfter(MetricsAutoConfiguration.class) @ConditionalOnClass(MeterRegistry.class) @ConditionalOnBean(MeterRegistry.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/KafkaMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/KafkaMetricsAutoConfiguration.java index 0478021dbf5..e21c9d0d062 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/KafkaMetricsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/KafkaMetricsAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -38,7 +38,7 @@ import org.springframework.context.annotation.Configuration; * @author Andy Wilkinson * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureAfter({ MetricsAutoConfiguration.class, JmxAutoConfiguration.class }) @ConditionalOnClass({ KafkaConsumerMetrics.class, KafkaConsumer.class }) @ConditionalOnBean(MeterRegistry.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsAutoConfiguration.java index 5551c7df88d..ce9da2dfea9 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -40,7 +40,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; * @author Andy Wilkinson * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureAfter(MetricsAutoConfiguration.class) @ConditionalOnClass(value = { Log4j2Metrics.class, LogManager.class }, name = "org.apache.logging.log4j.core.LoggerContext") diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/LogbackMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/LogbackMetricsAutoConfiguration.java index c6b9e4656ad..ca88a1eeb64 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/LogbackMetricsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/LogbackMetricsAutoConfiguration.java @@ -43,7 +43,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; * @author Stephane Nicoll * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureAfter(MetricsAutoConfiguration.class) @ConditionalOnClass({ MeterRegistry.class, LoggerContext.class, LoggerFactory.class }) @ConditionalOnBean(MeterRegistry.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfiguration.java index 7a2d49c816a..2db54b89e63 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -38,7 +38,7 @@ import org.springframework.core.annotation.Order; * @author Stephane Nicoll * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(Timed.class) @EnableConfigurationProperties(MetricsProperties.class) @AutoConfigureBefore(CompositeMeterRegistryAutoConfiguration.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsEndpointAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsEndpointAutoConfiguration.java index 96be8a80d49..90e3484ada5 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsEndpointAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsEndpointAutoConfiguration.java @@ -36,7 +36,7 @@ import org.springframework.context.annotation.Configuration; * @author Phillip Webb * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(Timed.class) @ConditionalOnEnabledEndpoint(endpoint = MetricsEndpoint.class) @ConditionalOnExposedEndpoint(endpoint = MetricsEndpoint.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/NoOpMeterRegistryConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/NoOpMeterRegistryConfiguration.java index 8ccb51ff9a9..48ba41240d5 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/NoOpMeterRegistryConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/NoOpMeterRegistryConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -31,7 +31,7 @@ import org.springframework.context.annotation.Configuration; * * @author Andy Wilkinson */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnBean(Clock.class) @ConditionalOnMissingBean(MeterRegistry.class) class NoOpMeterRegistryConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/SystemMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/SystemMetricsAutoConfiguration.java index f8aa852c968..d7cd7c4290b 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/SystemMetricsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/SystemMetricsAutoConfiguration.java @@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration; * @author Stephane Nicoll * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureAfter(MetricsAutoConfiguration.class) @ConditionalOnClass(MeterRegistry.class) @ConditionalOnBean(MeterRegistry.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/amqp/RabbitMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/amqp/RabbitMetricsAutoConfiguration.java index 9fef2ad323d..0f92d24e95f 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/amqp/RabbitMetricsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/amqp/RabbitMetricsAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -38,7 +38,7 @@ import org.springframework.context.annotation.Configuration; * @author Stephane Nicoll * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureAfter({ MetricsAutoConfiguration.class, RabbitAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class }) @ConditionalOnClass({ ConnectionFactory.class, AbstractConnectionFactory.class }) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMeterBinderProvidersConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMeterBinderProvidersConfiguration.java index c4819ee12b9..907fb97138f 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMeterBinderProvidersConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMeterBinderProvidersConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -38,11 +38,11 @@ import org.springframework.context.annotation.Configuration; * * @author Stephane Nicoll */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(MeterBinder.class) class CacheMeterBinderProvidersConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ CaffeineCache.class, com.github.benmanes.caffeine.cache.Cache.class }) static class CaffeineCacheMeterBinderProviderConfiguration { @@ -54,7 +54,7 @@ class CacheMeterBinderProvidersConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ EhCacheCache.class, Ehcache.class }) static class EhCache2CacheMeterBinderProviderConfiguration { @@ -65,7 +65,7 @@ class CacheMeterBinderProvidersConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ HazelcastCache.class, Hazelcast.class }) static class HazelcastCacheMeterBinderProviderConfiguration { @@ -76,7 +76,7 @@ class CacheMeterBinderProvidersConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ JCacheCache.class, javax.cache.CacheManager.class }) static class JCacheCacheMeterBinderProviderConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMetricsAutoConfiguration.java index afc58ce202a..86d11bb9090 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMetricsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMetricsAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Import; * @author Stephane Nicoll * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureAfter({ MetricsAutoConfiguration.class, CacheAutoConfiguration.class }) @ConditionalOnBean(CacheManager.class) @Import({ CacheMeterBinderProvidersConfiguration.class, diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMetricsRegistrarConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMetricsRegistrarConfiguration.java index aa0e063d66c..69baa670877 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMetricsRegistrarConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMetricsRegistrarConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -39,7 +39,7 @@ import org.springframework.util.StringUtils; * * @author Stephane Nicoll */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnBean({ CacheMeterBinderProvider.class, MeterRegistry.class }) class CacheMetricsRegistrarConfiguration { @@ -47,7 +47,7 @@ class CacheMetricsRegistrarConfiguration { private final MeterRegistry registry; - private final Collection> binderProviders; + private final CacheMetricsRegistrar cacheMetricsRegistrar; private final Map cacheManagers; @@ -55,13 +55,14 @@ class CacheMetricsRegistrarConfiguration { Collection> binderProviders, Map cacheManagers) { this.registry = registry; - this.binderProviders = binderProviders; this.cacheManagers = cacheManagers; + this.cacheMetricsRegistrar = new CacheMetricsRegistrar(this.registry, + binderProviders); } @Bean public CacheMetricsRegistrar cacheMetricsRegistrar() { - return new CacheMetricsRegistrar(this.registry, this.binderProviders); + return this.cacheMetricsRegistrar; } @PostConstruct @@ -76,7 +77,7 @@ class CacheMetricsRegistrarConfiguration { private void bindCacheToRegistry(String beanName, Cache cache) { Tag cacheManagerTag = Tag.of("cacheManager", getCacheManagerName(beanName)); - cacheMetricsRegistrar().bindCacheToRegistry(cache, cacheManagerTag); + this.cacheMetricsRegistrar.bindCacheToRegistry(cache, cacheManagerTag); } /** diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsMetricsExportAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsMetricsExportAutoConfiguration.java index b2e73f40c91..812d58eed2b 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsMetricsExportAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsMetricsExportAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -42,7 +42,7 @@ import org.springframework.context.annotation.Configuration; * @author Artsiom Yudovin * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureBefore({ CompositeMeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class }) @AutoConfigureAfter(MetricsAutoConfiguration.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasMetricsExportAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasMetricsExportAutoConfiguration.java index 077ae67f314..ac55c9a9141 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasMetricsExportAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasMetricsExportAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -41,7 +41,7 @@ import org.springframework.context.annotation.Configuration; * @author Andy Wilkinson * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureBefore({ CompositeMeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class }) @AutoConfigureAfter(MetricsAutoConfiguration.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogMetricsExportAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogMetricsExportAutoConfiguration.java index 54e4813f354..ceb865e7f2c 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogMetricsExportAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogMetricsExportAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -42,7 +42,7 @@ import org.springframework.context.annotation.Configuration; * @author Artsiom Yudovin * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureBefore({ CompositeMeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class }) @AutoConfigureAfter(MetricsAutoConfiguration.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatraceMetricsExportAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatraceMetricsExportAutoConfiguration.java index 79d84511abb..216082b4801 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatraceMetricsExportAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatraceMetricsExportAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -42,7 +42,7 @@ import org.springframework.context.annotation.Configuration; * @author Artsiom Yudovin * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureBefore({ CompositeMeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class }) @AutoConfigureAfter(MetricsAutoConfiguration.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticMetricsExportAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticMetricsExportAutoConfiguration.java index 7d45e0a9cf4..38d555fee0a 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticMetricsExportAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticMetricsExportAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -42,7 +42,7 @@ import org.springframework.context.annotation.Configuration; * @author Artsiom Yudovin * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureBefore({ CompositeMeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class }) @AutoConfigureAfter(MetricsAutoConfiguration.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ganglia/GangliaMetricsExportAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ganglia/GangliaMetricsExportAutoConfiguration.java index a1c5d437665..3455d0ebe66 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ganglia/GangliaMetricsExportAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ganglia/GangliaMetricsExportAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -40,7 +40,7 @@ import org.springframework.context.annotation.Configuration; * @author Jon Schneider * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureBefore({ CompositeMeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class }) @AutoConfigureAfter(MetricsAutoConfiguration.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphiteMetricsExportAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphiteMetricsExportAutoConfiguration.java index 37c8a1a014b..c3723462d56 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphiteMetricsExportAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphiteMetricsExportAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -40,7 +40,7 @@ import org.springframework.context.annotation.Configuration; * @author Jon Schneider * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureBefore({ CompositeMeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class }) @AutoConfigureAfter(MetricsAutoConfiguration.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioMetricsExportAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioMetricsExportAutoConfiguration.java index 36ce667bd71..b9747314f3e 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioMetricsExportAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioMetricsExportAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -42,7 +42,7 @@ import org.springframework.context.annotation.Configuration; * @author Artsiom Yudovin * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureBefore({ CompositeMeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class }) @AutoConfigureAfter(MetricsAutoConfiguration.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxMetricsExportAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxMetricsExportAutoConfiguration.java index 48d3f4f7856..e5a7327f6ce 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxMetricsExportAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxMetricsExportAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -42,7 +42,7 @@ import org.springframework.context.annotation.Configuration; * @author Artsiom Yudovin * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureBefore({ CompositeMeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class }) @AutoConfigureAfter(MetricsAutoConfiguration.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/jmx/JmxMetricsExportAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/jmx/JmxMetricsExportAutoConfiguration.java index 015496acdc9..aae404f8abb 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/jmx/JmxMetricsExportAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/jmx/JmxMetricsExportAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -40,7 +40,7 @@ import org.springframework.context.annotation.Configuration; * @author Jon Schneider * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureBefore({ CompositeMeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class }) @AutoConfigureAfter(MetricsAutoConfiguration.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/kairos/KairosMetricsExportAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/kairos/KairosMetricsExportAutoConfiguration.java index d053dad21f2..c2a21db5e38 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/kairos/KairosMetricsExportAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/kairos/KairosMetricsExportAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -42,7 +42,7 @@ import org.springframework.context.annotation.Configuration; * @author Artsiom Yudovin * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureBefore({ CompositeMeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class }) @AutoConfigureAfter(MetricsAutoConfiguration.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/newrelic/NewRelicMetricsExportAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/newrelic/NewRelicMetricsExportAutoConfiguration.java index ddb07a84862..5a096c7446b 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/newrelic/NewRelicMetricsExportAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/newrelic/NewRelicMetricsExportAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -43,7 +43,7 @@ import org.springframework.context.annotation.Configuration; * @author Artsiom Yudovin * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureBefore({ CompositeMeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class }) @AutoConfigureAfter(MetricsAutoConfiguration.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusMetricsExportAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusMetricsExportAutoConfiguration.java index 7fa7ddcd741..8c6898dc622 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusMetricsExportAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusMetricsExportAutoConfiguration.java @@ -52,7 +52,7 @@ import org.springframework.core.env.Environment; * @author Jon Schneider * @author David J. M. Karlsen */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureBefore({ CompositeMeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class }) @AutoConfigureAfter(MetricsAutoConfiguration.class) @@ -82,7 +82,7 @@ public class PrometheusMetricsExportAutoConfiguration { return new CollectorRegistry(true); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnEnabledEndpoint(endpoint = PrometheusScrapeEndpoint.class) @ConditionalOnExposedEndpoint(endpoint = PrometheusScrapeEndpoint.class) public static class PrometheusScrapeEndpointConfiguration { @@ -100,7 +100,7 @@ public class PrometheusMetricsExportAutoConfiguration { * Configuration for Prometheus * Pushgateway. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(PushGateway.class) @ConditionalOnProperty(prefix = "management.metrics.export.prometheus.pushgateway", name = "enabled") public static class PrometheusPushGatewayConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxMetricsExportAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxMetricsExportAutoConfiguration.java index 2129a5da6b9..e999a27af7f 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxMetricsExportAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxMetricsExportAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -41,7 +41,7 @@ import org.springframework.context.annotation.Configuration; * @author Andy Wilkinson * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureBefore({ CompositeMeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class }) @AutoConfigureAfter(MetricsAutoConfiguration.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/simple/SimpleMetricsExportAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/simple/SimpleMetricsExportAutoConfiguration.java index 29a3454a6a2..4fafae99443 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/simple/SimpleMetricsExportAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/simple/SimpleMetricsExportAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -41,7 +41,7 @@ import org.springframework.context.annotation.Configuration; * @author Jon Schneider * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureAfter(MetricsAutoConfiguration.class) @AutoConfigureBefore(CompositeMeterRegistryAutoConfiguration.class) @ConditionalOnBean(Clock.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfiguration.java index b53333a0c58..fd8f04f94eb 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -41,7 +41,7 @@ import org.springframework.context.annotation.Configuration; * @author Jon Schneider * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureBefore({ CompositeMeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class }) @AutoConfigureAfter(MetricsAutoConfiguration.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/wavefront/WavefrontMetricsExportAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/wavefront/WavefrontMetricsExportAutoConfiguration.java index d5a59e1c86c..d002e05186f 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/wavefront/WavefrontMetricsExportAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/wavefront/WavefrontMetricsExportAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -42,7 +42,7 @@ import org.springframework.context.annotation.Configuration; * @author Artsiom Yudovin * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureBefore({ CompositeMeterRegistryAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class }) @AutoConfigureAfter(MetricsAutoConfiguration.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jdbc/DataSourcePoolMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jdbc/DataSourcePoolMetricsAutoConfiguration.java index e38a4ba1ca7..7b18d427eaf 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jdbc/DataSourcePoolMetricsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jdbc/DataSourcePoolMetricsAutoConfiguration.java @@ -52,14 +52,14 @@ import org.springframework.util.StringUtils; * @author Stephane Nicoll * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureAfter({ MetricsAutoConfiguration.class, DataSourceAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class }) @ConditionalOnClass({ DataSource.class, MeterRegistry.class }) @ConditionalOnBean({ DataSource.class, MeterRegistry.class }) public class DataSourcePoolMetricsAutoConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnBean(DataSourcePoolMetadataProvider.class) static class DataSourcePoolMetadataMetricsConfiguration { @@ -99,7 +99,7 @@ public class DataSourcePoolMetricsAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(HikariDataSource.class) static class HikariDataSourceMetricsConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jersey/JerseyServerMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jersey/JerseyServerMetricsAutoConfiguration.java index 235486b2af0..12076871b84 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jersey/JerseyServerMetricsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jersey/JerseyServerMetricsAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -53,7 +53,7 @@ import org.springframework.core.annotation.Order; * @author Andy Wilkinson * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureAfter({ MetricsAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class }) @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfiguration.java index 013cadb8e19..a28b166e3db 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfiguration.java @@ -45,7 +45,7 @@ import org.springframework.util.StringUtils; * @author Stephane Nicoll * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureAfter({ MetricsAutoConfiguration.class, HibernateJpaAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class }) @ConditionalOnClass({ EntityManagerFactory.class, SessionFactory.class, diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/HttpClientMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/HttpClientMetricsAutoConfiguration.java index 9fbf39b6906..d3ba08198fc 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/HttpClientMetricsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/HttpClientMetricsAutoConfiguration.java @@ -42,7 +42,7 @@ import org.springframework.core.annotation.Order; * @author Raheela Aslam * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureAfter({ MetricsAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class, RestTemplateAutoConfiguration.class }) @ConditionalOnClass(MeterRegistry.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/RestTemplateMetricsConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/RestTemplateMetricsConfiguration.java index d97102ac15b..73d0e51babf 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/RestTemplateMetricsConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/RestTemplateMetricsConfiguration.java @@ -37,7 +37,7 @@ import org.springframework.web.client.RestTemplate; * @author Phillip Webb * @author Raheela Aslam */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(RestTemplate.class) @ConditionalOnBean(RestTemplateBuilder.class) class RestTemplateMetricsConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/WebClientMetricsConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/WebClientMetricsConfiguration.java index fcf19f52c5e..51145005f67 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/WebClientMetricsConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/WebClientMetricsConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -34,7 +34,7 @@ import org.springframework.web.reactive.function.client.WebClient; * @author Brian Clozel * @author Stephane Nicoll */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(WebClient.class) class WebClientMetricsConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/jetty/JettyMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/jetty/JettyMetricsAutoConfiguration.java index ca96c9b1807..0b00831d458 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/jetty/JettyMetricsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/jetty/JettyMetricsAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration; * @author Andy Wilkinson * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication @ConditionalOnClass({ JettyServerThreadPoolMetrics.class, Server.class }) public class JettyMetricsAutoConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/reactive/WebFluxMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/reactive/WebFluxMetricsAutoConfiguration.java index 980a0326f22..57b7bcf0d6e 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/reactive/WebFluxMetricsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/reactive/WebFluxMetricsAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -43,7 +43,7 @@ import org.springframework.core.annotation.Order; * @author Dmytro Nosan * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureAfter({ MetricsAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class }) @ConditionalOnBean(MeterRegistry.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/servlet/WebMvcMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/servlet/WebMvcMetricsAutoConfiguration.java index 5fd587de80f..b071e95ae57 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/servlet/WebMvcMetricsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/servlet/WebMvcMetricsAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -54,7 +54,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; * @author Dmytro Nosan * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureAfter({ MetricsAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class }) @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfiguration.java index 7258d98c453..f72a7d2ea44 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration; * @author Andy Wilkinson * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication @ConditionalOnClass({ TomcatMetrics.class, Manager.class }) public class TomcatMetricsAutoConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/mongo/MongoHealthIndicatorAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/mongo/MongoHealthIndicatorAutoConfiguration.java index 7921fff29ac..89bdded2342 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/mongo/MongoHealthIndicatorAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/mongo/MongoHealthIndicatorAutoConfiguration.java @@ -41,7 +41,7 @@ import org.springframework.data.mongodb.core.MongoTemplate; * @author Stephane Nicoll * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(MongoTemplate.class) @ConditionalOnBean(MongoTemplate.class) @ConditionalOnEnabledHealthIndicator("mongo") diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/mongo/MongoReactiveHealthIndicatorAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/mongo/MongoReactiveHealthIndicatorAutoConfiguration.java index b9ba5f58ece..d758a453639 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/mongo/MongoReactiveHealthIndicatorAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/mongo/MongoReactiveHealthIndicatorAutoConfiguration.java @@ -43,7 +43,7 @@ import org.springframework.data.mongodb.core.ReactiveMongoTemplate; * @author Stephane Nicoll * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ ReactiveMongoTemplate.class, Flux.class }) @ConditionalOnBean(ReactiveMongoTemplate.class) @ConditionalOnEnabledHealthIndicator("mongo") diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/neo4j/Neo4jHealthIndicatorAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/neo4j/Neo4jHealthIndicatorAutoConfiguration.java index bb9459da318..baee6ba3bcc 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/neo4j/Neo4jHealthIndicatorAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/neo4j/Neo4jHealthIndicatorAutoConfiguration.java @@ -42,7 +42,7 @@ import org.springframework.context.annotation.Configuration; * @author Stephane Nicoll * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(SessionFactory.class) @ConditionalOnBean(SessionFactory.class) @ConditionalOnEnabledHealthIndicator("neo4j") diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/redis/RedisHealthIndicatorAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/redis/RedisHealthIndicatorAutoConfiguration.java index 72370028dd4..1a1e2d9f6ec 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/redis/RedisHealthIndicatorAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/redis/RedisHealthIndicatorAutoConfiguration.java @@ -43,7 +43,7 @@ import org.springframework.data.redis.connection.RedisConnectionFactory; * @author Mark Paluch * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(RedisConnectionFactory.class) @ConditionalOnBean(RedisConnectionFactory.class) @ConditionalOnEnabledHealthIndicator("redis") diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/redis/RedisReactiveHealthIndicatorAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/redis/RedisReactiveHealthIndicatorAutoConfiguration.java index bbab3905502..2f2abb6f23a 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/redis/RedisReactiveHealthIndicatorAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/redis/RedisReactiveHealthIndicatorAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -46,7 +46,7 @@ import org.springframework.data.redis.connection.ReactiveRedisConnectionFactory; * @author Mark Paluch * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ ReactiveRedisConnectionFactory.class, Flux.class }) @ConditionalOnBean(ReactiveRedisConnectionFactory.class) @ConditionalOnEnabledHealthIndicator("redis") diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/scheduling/ScheduledTasksEndpointAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/scheduling/ScheduledTasksEndpointAutoConfiguration.java index 767572ce626..4216c870eca 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/scheduling/ScheduledTasksEndpointAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/scheduling/ScheduledTasksEndpointAutoConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.scheduling.config.ScheduledTaskHolder; * @author Andy Wilkinson * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnEnabledEndpoint(endpoint = ScheduledTasksEndpoint.class) @ConditionalOnExposedEndpoint(endpoint = ScheduledTasksEndpoint.class) public class ScheduledTasksEndpointAutoConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/reactive/ReactiveManagementWebSecurityAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/reactive/ReactiveManagementWebSecurityAutoConfiguration.java index 5deb06e0ce7..1943f8d9bb1 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/reactive/ReactiveManagementWebSecurityAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/reactive/ReactiveManagementWebSecurityAutoConfiguration.java @@ -45,7 +45,7 @@ import org.springframework.security.web.server.WebFilterChainProxy; * @author Madhura Bhave * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ EnableWebFluxSecurity.class, WebFilterChainProxy.class }) @ConditionalOnMissingBean({ SecurityWebFilterChain.class, WebFilterChainProxy.class }) @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfiguration.java index d4d9b802366..1ead9b87088 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfiguration.java @@ -41,7 +41,7 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur * @author Madhura Bhave * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(WebSecurityConfigurerAdapter.class) @ConditionalOnMissingBean(WebSecurityConfigurerAdapter.class) @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityConfigurerAdapter.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityConfigurerAdapter.java index 8d6d136a57a..90b3ad76ebc 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityConfigurerAdapter.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityConfigurerAdapter.java @@ -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"); * you may not use this file except in compliance with the License. @@ -34,7 +34,7 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur * * @author Madhura Bhave */ -@Configuration +@Configuration(proxyBeanMethods = false) class ManagementWebSecurityConfigurerAdapter extends WebSecurityConfigurerAdapter { @Override diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/session/SessionsEndpointAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/session/SessionsEndpointAutoConfiguration.java index 04546d983b9..a436a4f8473 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/session/SessionsEndpointAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/session/SessionsEndpointAutoConfiguration.java @@ -36,7 +36,7 @@ import org.springframework.session.Session; * @author Vedran Pavic * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(FindByIndexNameSessionRepository.class) @ConditionalOnEnabledEndpoint(endpoint = SessionsEndpoint.class) @ConditionalOnExposedEndpoint(endpoint = SessionsEndpoint.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/solr/SolrHealthIndicatorAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/solr/SolrHealthIndicatorAutoConfiguration.java index 24b66e839fd..b8cbca255a0 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/solr/SolrHealthIndicatorAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/solr/SolrHealthIndicatorAutoConfiguration.java @@ -42,7 +42,7 @@ import org.springframework.context.annotation.Configuration; * @author Stephane Nicoll * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(SolrClient.class) @ConditionalOnBean(SolrClient.class) @ConditionalOnEnabledHealthIndicator("solr") diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/system/DiskSpaceHealthIndicatorAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/system/DiskSpaceHealthIndicatorAutoConfiguration.java index 8c61f849d23..fb2ed94af2a 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/system/DiskSpaceHealthIndicatorAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/system/DiskSpaceHealthIndicatorAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Configuration; * @author Andy Wilkinson * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnEnabledHealthIndicator("diskspace") @AutoConfigureBefore(HealthIndicatorAutoConfiguration.class) public class DiskSpaceHealthIndicatorAutoConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/trace/http/HttpTraceAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/trace/http/HttpTraceAutoConfiguration.java index 2aa8b2c62ba..f3e048d9876 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/trace/http/HttpTraceAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/trace/http/HttpTraceAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -36,7 +36,7 @@ import org.springframework.context.annotation.Configuration; * @author Dave Syer * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication @ConditionalOnProperty(prefix = "management.trace.http", name = "enabled", matchIfMissing = true) @EnableConfigurationProperties(HttpTraceProperties.class) @@ -54,7 +54,7 @@ public class HttpTraceAutoConfiguration { return new HttpExchangeTracer(traceProperties.getInclude()); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.SERVLET) static class ServletTraceFilterConfiguration { @@ -67,7 +67,7 @@ public class HttpTraceAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.REACTIVE) static class ReactiveTraceFilterConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/trace/http/HttpTraceEndpointAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/trace/http/HttpTraceEndpointAutoConfiguration.java index 1344e92e2cf..2e8ef770784 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/trace/http/HttpTraceEndpointAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/trace/http/HttpTraceEndpointAutoConfiguration.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Configuration; * @author Phillip Webb * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnEnabledEndpoint(endpoint = HttpTraceEndpoint.class) @ConditionalOnExposedEndpoint(endpoint = HttpTraceEndpoint.class) @AutoConfigureAfter(HttpTraceAutoConfiguration.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/ManagementContextConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/ManagementContextConfiguration.java index bdc9d6c86b2..de76c2af72f 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/ManagementContextConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/ManagementContextConfiguration.java @@ -45,7 +45,7 @@ import org.springframework.core.annotation.Order; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) @Documented -@Configuration +@Configuration(proxyBeanMethods = false) public @interface ManagementContextConfiguration { /** diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/jersey/JerseyManagementContextConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/jersey/JerseyManagementContextConfiguration.java index d5e0818872a..ff32297c4e2 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/jersey/JerseyManagementContextConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/jersey/JerseyManagementContextConfiguration.java @@ -30,7 +30,7 @@ import org.springframework.context.annotation.Configuration; * * @author Madhura Bhave */ -@Configuration +@Configuration(proxyBeanMethods = false) class JerseyManagementContextConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/mappings/MappingsEndpointAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/mappings/MappingsEndpointAutoConfiguration.java index 41ec26b88ad..96aaca4fe4d 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/mappings/MappingsEndpointAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/mappings/MappingsEndpointAutoConfiguration.java @@ -44,7 +44,7 @@ import org.springframework.web.servlet.DispatcherServlet; * @author Andy Wilkinson * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) public class MappingsEndpointAutoConfiguration { @Bean @@ -57,7 +57,7 @@ public class MappingsEndpointAutoConfiguration { applicationContext); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.SERVLET) static class ServletWebConfiguration { @@ -71,7 +71,7 @@ public class MappingsEndpointAutoConfiguration { return new FiltersMappingDescriptionProvider(); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(DispatcherServlet.class) @ConditionalOnBean(DispatcherServlet.class) static class SpringMvcConfiguration { @@ -85,7 +85,7 @@ public class MappingsEndpointAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.REACTIVE) @ConditionalOnClass(DispatcherHandler.class) @ConditionalOnBean(DispatcherHandler.class) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/reactive/ReactiveManagementContextAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/reactive/ReactiveManagementContextAutoConfiguration.java index ff34749f72b..64cde1867a1 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/reactive/ReactiveManagementContextAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/reactive/ReactiveManagementContextAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ import org.springframework.context.annotation.Configuration; * @author Phillip Webb * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(Flux.class) @ConditionalOnWebApplication(type = Type.REACTIVE) public class ReactiveManagementContextAutoConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/EnableChildManagementContextConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/EnableChildManagementContextConfiguration.java index 284ea4b9db5..c53b09da56a 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/EnableChildManagementContextConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/EnableChildManagementContextConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -24,7 +24,7 @@ import org.springframework.context.annotation.Configuration; * * @author Andy Wilkinson */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableManagementContext(ManagementContextType.CHILD) class EnableChildManagementContextConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextAutoConfiguration.java index d78c89168ca..b6850167753 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -53,7 +53,7 @@ import org.springframework.util.Assert; * @author Andy Wilkinson * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureOrder(Ordered.LOWEST_PRECEDENCE) @EnableConfigurationProperties({ WebEndpointProperties.class, ManagementServerProperties.class }) @@ -62,7 +62,7 @@ public class ManagementContextAutoConfiguration { private static final Log logger = LogFactory .getLog(ManagementContextAutoConfiguration.class); - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnManagementPort(ManagementPortType.SAME) static class SameManagementContextConfiguration implements SmartInitializingSingleton { @@ -111,7 +111,7 @@ public class ManagementContextAutoConfiguration { }); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableManagementContext(ManagementContextType.SAME) static class EnableSameManagementContextConfiguration { @@ -119,7 +119,7 @@ public class ManagementContextAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnManagementPort(ManagementPortType.DIFFERENT) static class DifferentManagementContextConfiguration implements SmartInitializingSingleton { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/ServletManagementChildContextConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/ServletManagementChildContextConfiguration.java index 93c2cc0b9c0..bd000c5b15e 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/ServletManagementChildContextConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/ServletManagementChildContextConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -94,7 +94,7 @@ class ServletManagementChildContextConfiguration { return new JettyAccessLogCustomizer(); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ EnableWebSecurity.class, Filter.class }) @ConditionalOnBean(name = BeanIds.SPRING_SECURITY_FILTER_CHAIN, search = SearchStrategy.ANCESTORS) static class ServletManagementContextSecurityConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/ServletManagementContextAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/ServletManagementContextAutoConfiguration.java index 3ec4e829f63..1b7cc12c58c 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/ServletManagementContextAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/ServletManagementContextAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -36,7 +36,7 @@ import org.springframework.context.annotation.Configuration; * @author Phillip Webb * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(Servlet.class) @ConditionalOnWebApplication(type = Type.SERVLET) public class ServletManagementContextAutoConfiguration { @@ -54,7 +54,7 @@ public class ServletManagementContextAutoConfiguration { // Put Servlets and Filters in their own nested class so they don't force early // instantiation of ManagementServerProperties. - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(prefix = "management.server", name = "add-application-context-header", havingValue = "true") protected static class ApplicationContextFilterConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/audit/AuditAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/audit/AuditAutoConfigurationTests.java index dc0e1f63ed9..50f08d434ef 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/audit/AuditAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/audit/AuditAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -90,7 +90,7 @@ public class AuditAutoConfigurationTests { this.context.refresh(); } - @Configuration + @Configuration(proxyBeanMethods = false) public static class CustomAuditEventRepositoryConfiguration { @Bean @@ -104,7 +104,7 @@ public class AuditAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class CustomAuthenticationAuditListenerConfiguration { @Bean @@ -127,7 +127,7 @@ public class AuditAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class CustomAuthorizationAuditListenerConfiguration { @Bean @@ -150,7 +150,7 @@ public class AuditAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class CustomAuditListenerConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cache/CachesEndpointAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cache/CachesEndpointAutoConfigurationTests.java index 9b6ad090973..614c5322257 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cache/CachesEndpointAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cache/CachesEndpointAutoConfigurationTests.java @@ -71,7 +71,7 @@ public class CachesEndpointAutoConfigurationTests { .doesNotHaveBean(CachesEndpoint.class)); } - @Configuration + @Configuration(proxyBeanMethods = false) static class CacheConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraHealthIndicatorAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraHealthIndicatorAutoConfigurationTests.java index 8b30f124079..28fe266992e 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraHealthIndicatorAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraHealthIndicatorAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -58,7 +58,7 @@ public class CassandraHealthIndicatorAutoConfigurationTests { .hasSingleBean(ApplicationHealthIndicator.class)); } - @Configuration + @Configuration(proxyBeanMethods = false) @AutoConfigureBefore(CassandraHealthIndicatorAutoConfiguration.class) protected static class CassandraConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraReactiveHealthIndicatorAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraReactiveHealthIndicatorAutoConfigurationTests.java index ceb8883bba8..95a9b1f9301 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraReactiveHealthIndicatorAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraReactiveHealthIndicatorAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -61,7 +61,7 @@ public class CassandraReactiveHealthIndicatorAutoConfigurationTests { .hasSingleBean(ApplicationHealthIndicator.class)); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class CassandraMockConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/CloudFoundryWebEndpointDiscovererTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/CloudFoundryWebEndpointDiscovererTests.java index ae3660c37b5..6ca05e3db95 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/CloudFoundryWebEndpointDiscovererTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/CloudFoundryWebEndpointDiscovererTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -102,7 +102,7 @@ public class CloudFoundryWebEndpointDiscovererTests { } } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/CloudFoundryWebFluxEndpointIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/CloudFoundryWebFluxEndpointIntegrationTests.java index 7faf65138bd..16b959f4380 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/CloudFoundryWebFluxEndpointIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/CloudFoundryWebFluxEndpointIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -182,7 +182,7 @@ public class CloudFoundryWebFluxEndpointIntegrationTests { + Base64Utils.encodeToString("signature".getBytes()); } - @Configuration + @Configuration(proxyBeanMethods = false) static class CloudFoundryReactiveConfiguration { @Bean @@ -276,7 +276,7 @@ public class CloudFoundryWebFluxEndpointIntegrationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(CloudFoundryReactiveConfiguration.class) protected static class TestEndpointConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfigurationTests.java index 76fd2fe3584..20212146893 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -360,7 +360,7 @@ public class ReactiveCloudFoundryActuatorAutoConfigurationTests { + requestPath + " from " + endpoint.getOperations()); } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestConfiguration { @Bean @@ -380,7 +380,7 @@ public class ReactiveCloudFoundryActuatorAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class WebClientCustomizerConfig { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfigurationTests.java index 89d65182bce..08f0fd55951 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -309,7 +309,7 @@ public class CloudFoundryActuatorAutoConfigurationTests { + requestPath + " from " + endpoint.getOperations()); } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryMvcWebEndpointIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryMvcWebEndpointIntegrationTests.java index 46f9bfe19e9..ffb45bf47cc 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryMvcWebEndpointIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryMvcWebEndpointIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -176,7 +176,7 @@ public class CloudFoundryMvcWebEndpointIntegrationTests { + Base64Utils.encodeToString("signature".getBytes()); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWebMvc static class CloudFoundryMvcConfiguration { @@ -281,7 +281,7 @@ public class CloudFoundryMvcWebEndpointIntegrationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(CloudFoundryMvcConfiguration.class) protected static class TestEndpointConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/condition/ConditionsReportEndpointTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/condition/ConditionsReportEndpointTests.java index e9859429b6c..e8beedfe4ec 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/condition/ConditionsReportEndpointTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/condition/ConditionsReportEndpointTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -60,7 +60,7 @@ public class ConditionsReportEndpointTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties public static class Config { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/context/properties/ConfigurationPropertiesReportEndpointAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/context/properties/ConfigurationPropertiesReportEndpointAutoConfigurationTests.java index a0afe522eff..434b5835190 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/context/properties/ConfigurationPropertiesReportEndpointAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/context/properties/ConfigurationPropertiesReportEndpointAutoConfigurationTests.java @@ -93,7 +93,7 @@ public class ConfigurationPropertiesReportEndpointAutoConfigurationTests { }; } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties public static class Config { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/couchbase/CouchbaseHealthIndicatorAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/couchbase/CouchbaseHealthIndicatorAutoConfigurationTests.java index 527dc9b5137..e486ca15131 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/couchbase/CouchbaseHealthIndicatorAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/couchbase/CouchbaseHealthIndicatorAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -59,7 +59,7 @@ public class CouchbaseHealthIndicatorAutoConfigurationTests { .hasSingleBean(ApplicationHealthIndicator.class)); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class CouchbaseMockConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/couchbase/CouchbaseReactiveHealthIndicatorAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/couchbase/CouchbaseReactiveHealthIndicatorAutoConfigurationTests.java index bdade547b9d..846a900d7e3 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/couchbase/CouchbaseReactiveHealthIndicatorAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/couchbase/CouchbaseReactiveHealthIndicatorAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -59,7 +59,7 @@ public class CouchbaseReactiveHealthIndicatorAutoConfigurationTests { .hasSingleBean(ApplicationHealthIndicator.class)); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class CouchbaseMockConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticsearchHealthIndicatorAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticsearchHealthIndicatorAutoConfigurationTests.java index dcca1ac2e9f..c2a1b85725c 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticsearchHealthIndicatorAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticsearchHealthIndicatorAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -79,7 +79,7 @@ public class ElasticsearchHealthIndicatorAutoConfigurationTests { .hasSingleBean(ApplicationHealthIndicator.class)); } - @Configuration + @Configuration(proxyBeanMethods = false) @AutoConfigureBefore(JestAutoConfiguration.class) protected static class JestClientConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/ConditionalOnEnabledEndpointTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/ConditionalOnEnabledEndpointTests.java index c77bfdda0c1..1ba2d57c2e3 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/ConditionalOnEnabledEndpointTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/ConditionalOnEnabledEndpointTests.java @@ -190,7 +190,7 @@ public class ConditionalOnEnabledEndpointTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class FooEndpointEnabledByDefaultTrueConfiguration { @Bean @@ -201,7 +201,7 @@ public class ConditionalOnEnabledEndpointTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnEnabledEndpoint(endpoint = FooEndpointEnabledByDefaultTrue.class) static class FooEndpointEnabledByDefaultTrueOnConfigurationConfiguration { @@ -212,7 +212,7 @@ public class ConditionalOnEnabledEndpointTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class FooEndpointEnabledByDefaultFalseConfiguration { @Bean @@ -223,7 +223,7 @@ public class ConditionalOnEnabledEndpointTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class FooBarEndpointEnabledByDefaultFalseConfiguration { @Bean @@ -234,7 +234,7 @@ public class ConditionalOnEnabledEndpointTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class FooEndpointAndExtensionEnabledByDefaultTrueConfiguration { @Bean @@ -251,7 +251,7 @@ public class ConditionalOnEnabledEndpointTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class FooEndpointAndExtensionEnabledByDefaultFalseConfiguration { @Bean @@ -268,7 +268,7 @@ public class ConditionalOnEnabledEndpointTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ComponentEnabledIfEndpointIsEnabledConfiguration { @Bean @@ -279,7 +279,7 @@ public class ConditionalOnEnabledEndpointTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ComponentWithNoEndpointReferenceConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/ConditionalOnExposedEndpointTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/ConditionalOnExposedEndpointTests.java index 68d00ddaec2..2dd2c1a5f08 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/ConditionalOnExposedEndpointTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/ConditionalOnExposedEndpointTests.java @@ -183,7 +183,7 @@ public class ConditionalOnExposedEndpointTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class AllEndpointsConfiguration { @Bean @@ -212,7 +212,7 @@ public class ConditionalOnExposedEndpointTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ComponentEnabledIfEndpointIsExposedConfiguration { @Bean @@ -229,7 +229,7 @@ public class ConditionalOnExposedEndpointTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ComponentWithNoEndpointReferenceConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/ServletEndpointManagementContextConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/ServletEndpointManagementContextConfigurationTests.java index e332953590c..9221869d9ea 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/ServletEndpointManagementContextConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/ServletEndpointManagementContextConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -77,7 +77,7 @@ public class ServletEndpointManagementContextConfigurationTests { .doesNotHaveBean(ServletEndpointRegistrar.class)); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(ServletEndpointManagementContextConfiguration.class) @EnableConfigurationProperties(WebEndpointProperties.class) static class TestConfig { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/AbstractEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/AbstractEndpointDocumentationTests.java index ff2ddf1bc15..327d0419538 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/AbstractEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/AbstractEndpointDocumentationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -127,7 +127,7 @@ public abstract class AbstractEndpointDocumentationTests { .limit(3).collect(Collectors.toList()); } - @Configuration + @Configuration(proxyBeanMethods = false) @ImportAutoConfiguration({ JacksonAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, WebMvcAutoConfiguration.class, DispatcherServletAutoConfiguration.class, EndpointAutoConfiguration.class, diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/AuditEventsEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/AuditEventsEndpointDocumentationTests.java index 6dbef202536..f879bfcf2df 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/AuditEventsEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/AuditEventsEndpointDocumentationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -94,7 +94,7 @@ public class AuditEventsEndpointDocumentationTests verify(this.repository).find("alice", now.toInstant(), "logout"); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseDocumentationConfiguration.class) static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/BeansEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/BeansEndpointDocumentationTests.java index b6a76870326..4adcfa108f2 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/BeansEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/BeansEndpointDocumentationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -77,7 +77,7 @@ public class BeansEndpointDocumentationTests extends MockMvcEndpointDocumentatio .isEmpty((Collection) bean.getValue().get("dependencies")); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseDocumentationConfiguration.class) static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/CachesEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/CachesEndpointDocumentationTests.java index 9f657419d14..c1b29cd56aa 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/CachesEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/CachesEndpointDocumentationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -99,7 +99,7 @@ public class CachesEndpointDocumentationTests extends MockMvcEndpointDocumentati requestParameters(requestParameters))); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseDocumentationConfiguration.class) static class TestConfiguration { @@ -114,8 +114,8 @@ public class CachesEndpointDocumentationTests extends MockMvcEndpointDocumentati } @Bean - public CachesEndpointWebExtension endpointWebExtension() { - return new CachesEndpointWebExtension(endpoint()); + public CachesEndpointWebExtension endpointWebExtension(CachesEndpoint endpoint) { + return new CachesEndpointWebExtension(endpoint); } } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ConditionsReportEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ConditionsReportEndpointDocumentationTests.java index 873415bb1c1..b687edc1203 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ConditionsReportEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ConditionsReportEndpointDocumentationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -114,7 +114,7 @@ public class ConditionsReportEndpointDocumentationTests parentIdField()))); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseDocumentationConfiguration.class) static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ConfigurationPropertiesReportEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ConfigurationPropertiesReportEndpointDocumentationTests.java index fb14a8a4317..3411c43a7b4 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ConfigurationPropertiesReportEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ConfigurationPropertiesReportEndpointDocumentationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -59,7 +59,7 @@ public class ConfigurationPropertiesReportEndpointDocumentationTests parentIdField()))); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseDocumentationConfiguration.class) static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/EnvironmentEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/EnvironmentEndpointDocumentationTests.java index 59b3bf677c6..41a03934d1d 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/EnvironmentEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/EnvironmentEndpointDocumentationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -144,7 +144,7 @@ public class EnvironmentEndpointDocumentationTests || key.startsWith("com.example"); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseDocumentationConfiguration.class) static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/FlywayEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/FlywayEndpointDocumentationTests.java index 5e0972092a4..9959d3db34d 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/FlywayEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/FlywayEndpointDocumentationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -97,7 +97,7 @@ public class FlywayEndpointDocumentationTests extends MockMvcEndpointDocumentati .optional()); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseDocumentationConfiguration.class) @ImportAutoConfiguration(FlywayAutoConfiguration.class) static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HealthEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HealthEndpointDocumentationTests.java index 7f186bdc3de..f6a88fbff43 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HealthEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HealthEndpointDocumentationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -92,7 +92,7 @@ public class HealthEndpointDocumentationTests extends MockMvcEndpointDocumentati .andDo(document("health/instance", responseFields(componentFields))); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseDocumentationConfiguration.class) @ImportAutoConfiguration(DataSourceAutoConfiguration.class) static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HeapDumpWebEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HeapDumpWebEndpointDocumentationTests.java index 20d5dc5889f..c2a27b2f764 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HeapDumpWebEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HeapDumpWebEndpointDocumentationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -59,7 +59,7 @@ public class HeapDumpWebEndpointDocumentationTests })); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseDocumentationConfiguration.class) static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HttpTraceEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HttpTraceEndpointDocumentationTests.java index daf271c6e6c..069c3e330c3 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HttpTraceEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HttpTraceEndpointDocumentationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -114,7 +114,7 @@ public class HttpTraceEndpointDocumentationTests "Time, in milliseconds, taken to handle the exchange.")))); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseDocumentationConfiguration.class) static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/InfoEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/InfoEndpointDocumentationTests.java index f81b81ade95..1969acfd63c 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/InfoEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/InfoEndpointDocumentationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -81,7 +81,7 @@ public class InfoEndpointDocumentationTests extends MockMvcEndpointDocumentation .type(JsonFieldType.VARIES).optional()))); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseDocumentationConfiguration.class) static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/IntegrationGraphEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/IntegrationGraphEndpointDocumentationTests.java index 02dd54295e8..80dcbb98f5b 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/IntegrationGraphEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/IntegrationGraphEndpointDocumentationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -51,7 +51,7 @@ public class IntegrationGraphEndpointDocumentationTests .andDo(MockMvcRestDocumentation.document("integrationgraph/rebuild")); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableIntegration @Import(BaseDocumentationConfiguration.class) static class TestConfiguration { @@ -62,8 +62,9 @@ public class IntegrationGraphEndpointDocumentationTests } @Bean - public IntegrationGraphEndpoint endpoint() { - return new IntegrationGraphEndpoint(integrationGraphServer()); + public IntegrationGraphEndpoint endpoint( + IntegrationGraphServer integrationGraphServer) { + return new IntegrationGraphEndpoint(integrationGraphServer); } } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LiquibaseEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LiquibaseEndpointDocumentationTests.java index ebafb761ef9..e18c8772ced 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LiquibaseEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LiquibaseEndpointDocumentationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -89,7 +89,7 @@ public class LiquibaseEndpointDocumentationTests .optional().type(JsonFieldType.STRING)); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import({ BaseDocumentationConfiguration.class, EmbeddedDataSourceConfiguration.class, LiquibaseAutoConfiguration.class }) static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LogFileWebEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LogFileWebEndpointDocumentationTests.java index 3ef69af3e5e..62a54d17186 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LogFileWebEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LogFileWebEndpointDocumentationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -51,7 +51,7 @@ public class LogFileWebEndpointDocumentationTests .andDo(MockMvcRestDocumentation.document("logfile/range")); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseDocumentationConfiguration.class) static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LoggersEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LoggersEndpointDocumentationTests.java index c57924a64e5..f00a0e32113 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LoggersEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LoggersEndpointDocumentationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -108,7 +108,7 @@ public class LoggersEndpointDocumentationTests extends MockMvcEndpointDocumentat verify(this.loggingSystem).setLogLevel("com.example", null); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseDocumentationConfiguration.class) static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MappingsEndpointReactiveDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MappingsEndpointReactiveDocumentationTests.java index 8e1537ef2c8..8e0cf455ea4 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MappingsEndpointReactiveDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MappingsEndpointReactiveDocumentationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -168,7 +168,7 @@ public class MappingsEndpointReactiveDocumentationTests return fieldWithPath("*.[].details.requestMappingConditions" + path); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseDocumentationConfiguration.class) static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MappingsEndpointServletDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MappingsEndpointServletDocumentationTests.java index d196b753a34..340d0d52511 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MappingsEndpointServletDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MappingsEndpointServletDocumentationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -191,7 +191,7 @@ public class MappingsEndpointServletDocumentationTests return fieldWithPath("*.[].details.requestMappingConditions" + path); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseDocumentationConfiguration.class) static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MetricsEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MetricsEndpointDocumentationTests.java index 08baee11f6b..b89cd98c214 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MetricsEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MetricsEndpointDocumentationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -82,7 +82,7 @@ public class MetricsEndpointDocumentationTests extends MockMvcEndpointDocumentat "A tag to use for drill-down in the form `name:value`.")))); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseDocumentationConfiguration.class) static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/PrometheusScrapeEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/PrometheusScrapeEndpointDocumentationTests.java index 2b133d2c6b4..72b1852f5e6 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/PrometheusScrapeEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/PrometheusScrapeEndpointDocumentationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -45,7 +45,7 @@ public class PrometheusScrapeEndpointDocumentationTests .andDo(document("prometheus")); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseDocumentationConfiguration.class) static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ScheduledTasksEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ScheduledTasksEndpointDocumentationTests.java index f5a8b95be8a..3e38ac06798 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ScheduledTasksEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ScheduledTasksEndpointDocumentationTests.java @@ -95,7 +95,7 @@ public class ScheduledTasksEndpointDocumentationTests .description("Delay, in milliseconds, before first execution."); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableScheduling @Import(BaseDocumentationConfiguration.class) static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/SessionsEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/SessionsEndpointDocumentationTests.java index ad94c8ab7a6..7c13fdf7fa2 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/SessionsEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/SessionsEndpointDocumentationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -133,7 +133,7 @@ public class SessionsEndpointDocumentationTests return session; } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseDocumentationConfiguration.class) static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ShutdownEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ShutdownEndpointDocumentationTests.java index 02684dbb050..3e6409b4f0b 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ShutdownEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ShutdownEndpointDocumentationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -47,7 +47,7 @@ public class ShutdownEndpointDocumentationTests "Message describing the result of the request.")))); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseDocumentationConfiguration.class) static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ThreadDumpEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ThreadDumpEndpointDocumentationTests.java index 00acfc09a47..fe38f4ad046 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ThreadDumpEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ThreadDumpEndpointDocumentationTests.java @@ -210,7 +210,7 @@ public class ThreadDumpEndpointDocumentationTests latch.countDown(); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseDocumentationConfiguration.class) static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/jersey/JerseyWebEndpointManagementContextConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/jersey/JerseyWebEndpointManagementContextConfigurationTests.java index c656e3b6855..073e80dd3f2 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/jersey/JerseyWebEndpointManagementContextConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/jersey/JerseyWebEndpointManagementContextConfigurationTests.java @@ -69,7 +69,7 @@ public class JerseyWebEndpointManagementContextConfigurationTests { .doesNotHaveBean(JerseySameManagementContextConfiguration.class)); } - @Configuration + @Configuration(proxyBeanMethods = false) static class WebEndpointsSupplierConfig { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/flyway/FlywayEndpointAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/flyway/FlywayEndpointAutoConfigurationTests.java index 212b16d0541..9af127ca0c6 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/flyway/FlywayEndpointAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/flyway/FlywayEndpointAutoConfigurationTests.java @@ -61,7 +61,7 @@ public class FlywayEndpointAutoConfigurationTests { (context) -> assertThat(context).doesNotHaveBean(FlywayEndpoint.class)); } - @Configuration + @Configuration(proxyBeanMethods = false) static class FlywayConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointAutoConfigurationTests.java index ade160c3715..61bf1c129b4 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointAutoConfigurationTests.java @@ -102,7 +102,7 @@ public class HealthEndpointAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class HealthIndicatorConfiguration { @Bean @@ -114,7 +114,7 @@ public class HealthEndpointAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ReactiveHealthIndicatorConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointWebExtensionTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointWebExtensionTests.java index 9c745450277..4c9977208f7 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointWebExtensionTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointWebExtensionTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -421,7 +421,7 @@ public class HealthEndpointWebExtensionTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class HealthIndicatorsConfiguration { @Bean @@ -430,9 +430,9 @@ public class HealthEndpointWebExtensionTests { } @Bean - public HealthIndicator compositeHealthIndicator() { + public HealthIndicator compositeHealthIndicator(HealthIndicator healthIndicator) { Map nestedIndicators = new HashMap<>(); - nestedIndicators.put("one", simpleHealthIndicator()); + nestedIndicators.put("one", healthIndicator); nestedIndicators.put("two", () -> Health.up().build()); return new CompositeHealthIndicator(new OrderedHealthAggregator(), nestedIndicators); diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorAutoConfigurationTests.java index 69b9feb275b..49561cabab2 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -108,7 +108,7 @@ public class HealthIndicatorAutoConfigurationTests { .isNotInstanceOf(OrderedHealthAggregator.class)); } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomHealthIndicatorConfiguration { @Bean @@ -128,7 +128,7 @@ public class HealthIndicatorAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomHealthAggregatorConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/ReactiveHealthEndpointWebExtensionTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/ReactiveHealthEndpointWebExtensionTests.java index a9b10ebce49..1a431c4a3f1 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/ReactiveHealthEndpointWebExtensionTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/ReactiveHealthEndpointWebExtensionTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -242,7 +242,7 @@ public class ReactiveHealthEndpointWebExtensionTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class HealthIndicatorsConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/influx/InfluxDbHealthIndicatorAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/influx/InfluxDbHealthIndicatorAutoConfigurationTests.java index bc989fd8235..abe0dec6eab 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/influx/InfluxDbHealthIndicatorAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/influx/InfluxDbHealthIndicatorAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -57,7 +57,7 @@ public class InfluxDbHealthIndicatorAutoConfigurationTests { .hasSingleBean(ApplicationHealthIndicator.class)); } - @Configuration + @Configuration(proxyBeanMethods = false) static class InfluxDbConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/info/InfoContributorAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/info/InfoContributorAutoConfigurationTests.java index 47908759a64..c2629b3be91 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/info/InfoContributorAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/info/InfoContributorAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -157,7 +157,7 @@ public class InfoContributorAutoConfigurationTests { this.context = context; } - @Configuration + @Configuration(proxyBeanMethods = false) static class GitPropertiesConfiguration { @Bean @@ -171,7 +171,7 @@ public class InfoContributorAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class BuildPropertiesConfiguration { @Bean @@ -185,7 +185,7 @@ public class InfoContributorAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomInfoContributorConfiguration { @Bean @@ -196,7 +196,7 @@ public class InfoContributorAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomGitInfoContributorConfiguration { @Bean @@ -206,7 +206,7 @@ public class InfoContributorAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomBuildInfoContributorConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JerseyEndpointIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JerseyEndpointIntegrationTests.java index 3f03df0f0b1..abe8e7b5fe2 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JerseyEndpointIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JerseyEndpointIntegrationTests.java @@ -96,7 +96,7 @@ public class JerseyEndpointIntegrationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class EndpointsConfiguration { @Bean @@ -111,7 +111,7 @@ public class JerseyEndpointIntegrationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ResourceConfigConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JolokiaEndpointAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JolokiaEndpointAutoConfigurationIntegrationTests.java index b522dbd56dc..a46afbba909 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JolokiaEndpointAutoConfigurationIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JolokiaEndpointAutoConfigurationIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -98,7 +98,7 @@ public class JolokiaEndpointAutoConfigurationIntegrationTests { assertThat(response.getBody()).contains("NonHeapMemoryUsage"); } - @Configuration + @Configuration(proxyBeanMethods = false) @MinimalWebConfiguration @Import({ JacksonAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebFluxEndpointIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebFluxEndpointIntegrationTests.java index f4b211c421e..407a589894f 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebFluxEndpointIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebFluxEndpointIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -80,7 +80,7 @@ public class WebFluxEndpointIntegrationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class EndpointsConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebMvcEndpointIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebMvcEndpointIntegrationTests.java index aa1ea07021b..817cafea299 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebMvcEndpointIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebMvcEndpointIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -190,7 +190,7 @@ public class WebMvcEndpointIntegrationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class EndpointsConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthIndicatorAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthIndicatorAutoConfigurationTests.java index 57e198505ed..997df6346a3 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthIndicatorAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthIndicatorAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -109,7 +109,7 @@ public class DataSourceHealthIndicatorAutoConfigurationTests { .hasSingleBean(ApplicationHealthIndicator.class)); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties protected static class DataSourceConfig { @@ -124,7 +124,7 @@ public class DataSourceHealthIndicatorAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class RoutingDatasourceConfig { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/jolokia/JolokiaEndpointAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/jolokia/JolokiaEndpointAutoConfigurationTests.java index 7e18f95db9e..dbaf27398eb 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/jolokia/JolokiaEndpointAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/jolokia/JolokiaEndpointAutoConfigurationTests.java @@ -108,7 +108,7 @@ public class JolokiaEndpointAutoConfigurationTests { return endpoints.iterator().next(); } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/ldap/LdapHealthIndicatorAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/ldap/LdapHealthIndicatorAutoConfigurationTests.java index 3f1f72ea033..41d7704e47c 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/ldap/LdapHealthIndicatorAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/ldap/LdapHealthIndicatorAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -59,7 +59,7 @@ public class LdapHealthIndicatorAutoConfigurationTests { .hasSingleBean(ApplicationHealthIndicator.class)); } - @Configuration + @Configuration(proxyBeanMethods = false) @AutoConfigureBefore(LdapHealthIndicatorAutoConfiguration.class) protected static class LdapConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/liquibase/LiquibaseEndpointAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/liquibase/LiquibaseEndpointAutoConfigurationTests.java index 3c0aad05c22..870df3e968a 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/liquibase/LiquibaseEndpointAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/liquibase/LiquibaseEndpointAutoConfigurationTests.java @@ -91,7 +91,7 @@ public class LiquibaseEndpointAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class LiquibaseConfiguration { @Bean @@ -101,7 +101,7 @@ public class LiquibaseEndpointAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class DataSourceClosingLiquibaseConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/LoggersEndpointAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/LoggersEndpointAutoConfigurationTests.java index bd36fca2f19..62bd70b8997 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/LoggersEndpointAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/LoggersEndpointAutoConfigurationTests.java @@ -70,7 +70,7 @@ public class LoggersEndpointAutoConfigurationTests { .doesNotHaveBean(LoggersEndpoint.class)); } - @Configuration + @Configuration(proxyBeanMethods = false) static class LoggingConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/CompositeMeterRegistryAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/CompositeMeterRegistryAutoConfigurationTests.java index 8e34e7868c7..bfe7edab7db 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/CompositeMeterRegistryAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/CompositeMeterRegistryAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -93,7 +93,7 @@ public class CompositeMeterRegistryAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class BaseConfig { @Bean @@ -104,12 +104,12 @@ public class CompositeMeterRegistryAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class NoMeterRegistryConfig { } - @Configuration + @Configuration(proxyBeanMethods = false) static class SingleMeterRegistryConfig { @Bean @@ -119,7 +119,7 @@ public class CompositeMeterRegistryAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class MultipleMeterRegistriesConfig { @Bean @@ -134,7 +134,7 @@ public class CompositeMeterRegistryAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class MultipleMeterRegistriesWithOnePrimaryConfig { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/JvmMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/JvmMetricsAutoConfigurationTests.java index 3da5a8b9327..d82a21fc1f7 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/JvmMetricsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/JvmMetricsAutoConfigurationTests.java @@ -93,7 +93,7 @@ public class JvmMetricsAutoConfigurationTests { .hasBean("customClassLoaderMetrics")); } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomJvmGcMetricsConfiguration { @Bean @@ -103,7 +103,7 @@ public class JvmMetricsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomJvmMemoryMetricsConfiguration { @Bean @@ -113,7 +113,7 @@ public class JvmMetricsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomJvmThreadMetricsConfiguration { @Bean @@ -123,7 +123,7 @@ public class JvmMetricsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomClassLoaderMetricsConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/KafkaMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/KafkaMetricsAutoConfigurationTests.java index a19c83353f4..c18b78c78b0 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/KafkaMetricsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/KafkaMetricsAutoConfigurationTests.java @@ -64,7 +64,7 @@ public class KafkaMetricsAutoConfigurationTests { .hasBean("customKafkaConsumerMetrics")); } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomKafkaConsumerMetricsConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsWithLog4jLoggerContextAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsWithLog4jLoggerContextAutoConfigurationTests.java index 6521af77fe7..15cb74f0805 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsWithLog4jLoggerContextAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsWithLog4jLoggerContextAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -61,7 +61,7 @@ public class Log4J2MetricsWithLog4jLoggerContextAutoConfigurationTests { .hasBean("customLog4J2Metrics")); } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomLog4J2MetricsConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/LogbackMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/LogbackMetricsAutoConfigurationTests.java index 69ec329b783..8d747f0a6a7 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/LogbackMetricsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/LogbackMetricsAutoConfigurationTests.java @@ -52,7 +52,7 @@ public class LogbackMetricsAutoConfigurationTests { .hasBean("customLogbackMetrics")); } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomLogbackMetricsConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MeterRegistryConfigurerIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MeterRegistryConfigurerIntegrationTests.java index a45dc4b433d..a10dcdb5275 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MeterRegistryConfigurerIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MeterRegistryConfigurerIntegrationTests.java @@ -66,7 +66,7 @@ public class MeterRegistryConfigurerIntegrationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MeterRegistryCustomizerTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MeterRegistryCustomizerTests.java index 8b685473c89..05c1ca16f6a 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MeterRegistryCustomizerTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MeterRegistryCustomizerTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -78,7 +78,7 @@ public class MeterRegistryCustomizerTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class MeterRegistryCustomizerConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfigurationIntegrationTests.java index d185e9a0e69..8fda7925afa 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfigurationIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfigurationIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -115,7 +115,7 @@ public class MetricsAutoConfigurationIntegrationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class PrimaryMeterRegistryConfiguration { @Primary diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfigurationTests.java index 99532e6c01d..fdd2ba460f0 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -80,7 +80,7 @@ public class MetricsAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomClockConfiguration { @Bean @@ -90,7 +90,7 @@ public class MetricsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class MeterRegistryConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MissingRequiredConfigurationFailureAnalyzerTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MissingRequiredConfigurationFailureAnalyzerTests.java index 1e2d7cfb85b..df85b6803ff 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MissingRequiredConfigurationFailureAnalyzerTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MissingRequiredConfigurationFailureAnalyzerTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -58,7 +58,7 @@ public class MissingRequiredConfigurationFailureAnalyzerTests { } } - @Configuration + @Configuration(proxyBeanMethods = false) static class MissingAccountIdConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/SystemMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/SystemMetricsAutoConfigurationTests.java index 5bd8cf0eb8a..61a2210fcd9 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/SystemMetricsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/SystemMetricsAutoConfigurationTests.java @@ -84,7 +84,7 @@ public class SystemMetricsAutoConfigurationTests { .hasBean("customFileDescriptorMetrics")); } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomUptimeMetricsConfiguration { @Bean @@ -94,7 +94,7 @@ public class SystemMetricsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomProcessorMetricsConfiguration { @Bean @@ -104,7 +104,7 @@ public class SystemMetricsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomFileDescriptorMetricsConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMetricsAutoConfigurationTests.java index b5bcc75aa04..f1a124c0017 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMetricsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMetricsAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -76,7 +76,7 @@ public class CacheMetricsAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableCaching static class CachingConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsMetricsExportAutoConfigurationTests.java index ced8955572e..26362b24c12 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsMetricsExportAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -91,7 +91,7 @@ public class AppOpticsMetricsExportAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class BaseConfiguration { @Bean @@ -101,7 +101,7 @@ public class AppOpticsMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomConfigConfiguration { @@ -112,7 +112,7 @@ public class AppOpticsMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomRegistryConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasMetricsExportAutoConfigurationTests.java index 2e46a15a796..a9d6a0e7d16 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasMetricsExportAutoConfigurationTests.java @@ -91,7 +91,7 @@ public class AtlasMetricsExportAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class BaseConfiguration { @Bean @@ -101,7 +101,7 @@ public class AtlasMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomConfigConfiguration { @@ -112,7 +112,7 @@ public class AtlasMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomRegistryConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogMetricsExportAutoConfigurationTests.java index 66e8ae6f2c7..98372d329d3 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogMetricsExportAutoConfigurationTests.java @@ -100,7 +100,7 @@ public class DatadogMetricsExportAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class BaseConfiguration { @Bean @@ -110,7 +110,7 @@ public class DatadogMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomConfigConfiguration { @@ -126,7 +126,7 @@ public class DatadogMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomRegistryConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatraceMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatraceMetricsExportAutoConfigurationTests.java index 05cfd3713a2..d248ea824a2 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatraceMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatraceMetricsExportAutoConfigurationTests.java @@ -109,7 +109,7 @@ public class DynatraceMetricsExportAutoConfigurationTests { "management.metrics.export.dynatrace.device-id=test"); } - @Configuration + @Configuration(proxyBeanMethods = false) static class BaseConfiguration { @Bean @@ -119,7 +119,7 @@ public class DynatraceMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomConfigConfiguration { @@ -141,7 +141,7 @@ public class DynatraceMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomRegistryConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticMetricsExportAutoConfigurationTests.java index d9158283eff..8c5e982f901 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticMetricsExportAutoConfigurationTests.java @@ -92,7 +92,7 @@ public class ElasticMetricsExportAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class BaseConfiguration { @Bean @@ -102,7 +102,7 @@ public class ElasticMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomConfigConfiguration { @@ -113,7 +113,7 @@ public class ElasticMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomRegistryConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ganglia/GangliaMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ganglia/GangliaMetricsExportAutoConfigurationTests.java index 5dd868890ba..c1489e84bbf 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ganglia/GangliaMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ganglia/GangliaMetricsExportAutoConfigurationTests.java @@ -91,7 +91,7 @@ public class GangliaMetricsExportAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class BaseConfiguration { @Bean @@ -101,7 +101,7 @@ public class GangliaMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomConfigConfiguration { @@ -112,7 +112,7 @@ public class GangliaMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomRegistryConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphiteMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphiteMetricsExportAutoConfigurationTests.java index 799879dd882..3ce2555ba15 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphiteMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphiteMetricsExportAutoConfigurationTests.java @@ -108,7 +108,7 @@ public class GraphiteMetricsExportAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class BaseConfiguration { @Bean @@ -118,7 +118,7 @@ public class GraphiteMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomConfigConfiguration { @@ -134,7 +134,7 @@ public class GraphiteMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomRegistryConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioMetricsExportAutoConfigurationTests.java index cf7dcd3cc1d..c4b0cee10ac 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioMetricsExportAutoConfigurationTests.java @@ -93,7 +93,7 @@ public class HumioMetricsExportAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class BaseConfiguration { @Bean @@ -103,7 +103,7 @@ public class HumioMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomConfigConfiguration { @@ -114,7 +114,7 @@ public class HumioMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomRegistryConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxMetricsExportAutoConfigurationTests.java index f511bd3ed21..6f5a01348ed 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxMetricsExportAutoConfigurationTests.java @@ -91,7 +91,7 @@ public class InfluxMetricsExportAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class BaseConfiguration { @Bean @@ -101,7 +101,7 @@ public class InfluxMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomConfigConfiguration { @@ -112,7 +112,7 @@ public class InfluxMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomRegistryConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/jmx/JmxMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/jmx/JmxMetricsExportAutoConfigurationTests.java index 02fcb97a27a..3abd36c9f78 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/jmx/JmxMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/jmx/JmxMetricsExportAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -90,7 +90,7 @@ public class JmxMetricsExportAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class BaseConfiguration { @Bean @@ -100,7 +100,7 @@ public class JmxMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomConfigConfiguration { @@ -111,7 +111,7 @@ public class JmxMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomRegistryConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/kairos/KairosMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/kairos/KairosMetricsExportAutoConfigurationTests.java index ec3743639be..47bfd0189bc 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/kairos/KairosMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/kairos/KairosMetricsExportAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -91,7 +91,7 @@ public class KairosMetricsExportAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class BaseConfiguration { @Bean @@ -101,7 +101,7 @@ public class KairosMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomConfigConfiguration { @@ -112,7 +112,7 @@ public class KairosMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomRegistryConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/newrelic/NewRelicMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/newrelic/NewRelicMetricsExportAutoConfigurationTests.java index a542e589877..cc16f9ce70c 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/newrelic/NewRelicMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/newrelic/NewRelicMetricsExportAutoConfigurationTests.java @@ -113,7 +113,7 @@ public class NewRelicMetricsExportAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class BaseConfiguration { @Bean @@ -123,7 +123,7 @@ public class NewRelicMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomConfigConfiguration { @@ -142,7 +142,7 @@ public class NewRelicMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomRegistryConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusMetricsExportAutoConfigurationTests.java index 4b0fc797330..e8d6d068418 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusMetricsExportAutoConfigurationTests.java @@ -155,7 +155,7 @@ public class PrometheusMetricsExportAutoConfigurationTests { .hasSingleBean(PrometheusPushGatewayManager.class)); } - @Configuration + @Configuration(proxyBeanMethods = false) static class BaseConfiguration { @Bean @@ -165,7 +165,7 @@ public class PrometheusMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomConfigConfiguration { @@ -176,7 +176,7 @@ public class PrometheusMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomRegistryConfiguration { @@ -188,7 +188,7 @@ public class PrometheusMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomCollectorRegistryConfiguration { @@ -199,7 +199,7 @@ public class PrometheusMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomEndpointConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxMetricsExportAutoConfigurationTests.java index 324c5cadc8e..cd23da5db39 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxMetricsExportAutoConfigurationTests.java @@ -108,7 +108,7 @@ public class SignalFxMetricsExportAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class BaseConfiguration { @Bean @@ -118,7 +118,7 @@ public class SignalFxMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomConfigConfiguration { @@ -134,7 +134,7 @@ public class SignalFxMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomRegistryConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/simple/SimpleMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/simple/SimpleMetricsExportAutoConfigurationTests.java index b6d7f554f41..1db8c23b87d 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/simple/SimpleMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/simple/SimpleMetricsExportAutoConfigurationTests.java @@ -74,7 +74,7 @@ public class SimpleMetricsExportAutoConfigurationTests { .hasBean("customRegistry").doesNotHaveBean(SimpleConfig.class)); } - @Configuration + @Configuration(proxyBeanMethods = false) static class BaseConfiguration { @Bean @@ -84,7 +84,7 @@ public class SimpleMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomConfigConfiguration { @@ -95,7 +95,7 @@ public class SimpleMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomRegistryConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfigurationTests.java index 977544e30b1..175d59fed36 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -93,7 +93,7 @@ public class StatsdMetricsExportAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class BaseConfiguration { @Bean @@ -103,7 +103,7 @@ public class StatsdMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomConfigConfiguration { @@ -114,7 +114,7 @@ public class StatsdMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomRegistryConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/wavefront/WavefrontMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/wavefront/WavefrontMetricsExportAutoConfigurationTests.java index a25d51dd9f2..f7a08f82000 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/wavefront/WavefrontMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/wavefront/WavefrontMetricsExportAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -92,7 +92,7 @@ public class WavefrontMetricsExportAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class BaseConfiguration { @Bean @@ -102,7 +102,7 @@ public class WavefrontMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomConfigConfiguration { @@ -123,7 +123,7 @@ public class WavefrontMetricsExportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CustomRegistryConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/jdbc/DataSourcePoolMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/jdbc/DataSourcePoolMetricsAutoConfigurationTests.java index 26aa383afe7..72a6974d582 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/jdbc/DataSourcePoolMetricsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/jdbc/DataSourcePoolMetricsAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -228,7 +228,7 @@ public class DataSourcePoolMetricsAutoConfigurationTests { return hikariDataSource; } - @Configuration + @Configuration(proxyBeanMethods = false) static class BaseConfiguration { @Bean @@ -238,7 +238,7 @@ public class DataSourcePoolMetricsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class TwoDataSourcesConfiguration { @Bean @@ -258,7 +258,7 @@ public class DataSourcePoolMetricsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class TwoHikariDataSourcesConfiguration { @Bean @@ -273,7 +273,7 @@ public class DataSourcePoolMetricsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ProxiedHikariDataSourcesConfiguration { @Bean @@ -289,7 +289,7 @@ public class DataSourcePoolMetricsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class OneHikariDataSourceConfiguration { @Bean @@ -299,7 +299,7 @@ public class DataSourcePoolMetricsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class MixedDataSourcesConfiguration { @Bean @@ -328,7 +328,7 @@ public class DataSourcePoolMetricsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class HikariSealingConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/jersey/JerseyServerMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/jersey/JerseyServerMetricsAutoConfigurationTests.java index 07395b5edca..578d594cf49 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/jersey/JerseyServerMetricsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/jersey/JerseyServerMetricsAutoConfigurationTests.java @@ -128,7 +128,7 @@ public class JerseyServerMetricsAutoConfigurationTests { String.class); } - @Configuration + @Configuration(proxyBeanMethods = false) static class ResourceConfiguration { @Bean @@ -149,7 +149,7 @@ public class JerseyServerMetricsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomJerseyTagsProviderConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfigurationTests.java index eab78c6dbbe..1beb909d8af 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -152,7 +152,7 @@ public class HibernateMetricsAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class BaseConfiguration { @Bean @@ -171,7 +171,7 @@ public class HibernateMetricsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class TwoEntityManagerFactoriesConfiguration { private static final Class[] PACKAGE_CLASSES = new Class[] { @@ -199,7 +199,7 @@ public class HibernateMetricsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class NonHibernateEntityManagerFactoryConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/test/MetricsIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/test/MetricsIntegrationTests.java index 60c10bb8599..2b1954838f3 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/test/MetricsIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/test/MetricsIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -141,7 +141,7 @@ public class MetricsIntegrationTests { DispatcherType.ASYNC); } - @Configuration + @Configuration(proxyBeanMethods = false) @ImportAutoConfiguration({ MetricsAutoConfiguration.class, JvmMetricsAutoConfiguration.class, LogbackMetricsAutoConfiguration.class, SystemMetricsAutoConfiguration.class, RabbitMetricsAutoConfiguration.class, diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/WebClientMetricsConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/WebClientMetricsConfigurationTests.java index 7d525f17014..bd9fea76188 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/WebClientMetricsConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/WebClientMetricsConfigurationTests.java @@ -128,7 +128,7 @@ public class WebClientMetricsConfigurationTests { return builder.clientConnector(connector).build(); } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomTagsProviderConfig { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/jetty/JettyMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/jetty/JettyMetricsAutoConfigurationTests.java index 75189b84379..687d150c907 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/jetty/JettyMetricsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/jetty/JettyMetricsAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -100,7 +100,7 @@ public class JettyMetricsAutoConfigurationTests { .hasBean("customJettyServerThreadPoolMetricsBinder")); } - @Configuration + @Configuration(proxyBeanMethods = false) static class MeterRegistryConfiguration { @Bean @@ -110,7 +110,7 @@ public class JettyMetricsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ServletWebServerConfiguration { @Bean @@ -120,7 +120,7 @@ public class JettyMetricsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ReactiveWebServerConfiguration { @Bean @@ -135,7 +135,7 @@ public class JettyMetricsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomJettyServerThreadPoolMetricsBinder { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/reactive/WebFluxMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/reactive/WebFluxMetricsAutoConfigurationTests.java index b2b904d457d..9bc87f15d1e 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/reactive/WebFluxMetricsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/reactive/WebFluxMetricsAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -119,7 +119,7 @@ public class WebFluxMetricsAutoConfigurationTests { return context.getBean(MeterRegistry.class); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class CustomWebFluxTagsProviderConfig { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/servlet/WebMvcMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/servlet/WebMvcMetricsAutoConfigurationTests.java index ffd64aff184..3c5f2fbd666 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/servlet/WebMvcMetricsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/servlet/WebMvcMetricsAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -164,7 +164,7 @@ public class WebMvcMetricsAutoConfigurationTests { return context.getBean(MeterRegistry.class); } - @Configuration + @Configuration(proxyBeanMethods = false) static class TagsProviderConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfigurationTests.java index 7c8f5939049..215cff5a3f2 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -130,7 +130,7 @@ public class TomcatMetricsAutoConfigurationTests { .hasBean("customTomcatMetrics")); } - @Configuration + @Configuration(proxyBeanMethods = false) static class MeterRegistryConfiguration { @Bean @@ -140,7 +140,7 @@ public class TomcatMetricsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ServletWebServerConfiguration { @Bean @@ -150,7 +150,7 @@ public class TomcatMetricsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ReactiveWebServerConfiguration { @Bean @@ -165,7 +165,7 @@ public class TomcatMetricsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomTomcatMetrics { @Bean @@ -175,7 +175,7 @@ public class TomcatMetricsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomTomcatMetricsBinder { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/neo4j/Neo4jHealthIndicatorAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/neo4j/Neo4jHealthIndicatorAutoConfigurationTests.java index 68ed00aac6d..c353e3bd788 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/neo4j/Neo4jHealthIndicatorAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/neo4j/Neo4jHealthIndicatorAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -72,7 +72,7 @@ public class Neo4jHealthIndicatorAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class Neo4jConfiguration { @Bean @@ -82,7 +82,7 @@ public class Neo4jHealthIndicatorAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class CustomIndicatorConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/scheduling/ScheduledTasksEndpointAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/scheduling/ScheduledTasksEndpointAutoConfigurationTests.java index b809a0e7b8d..d3285aa0f4f 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/scheduling/ScheduledTasksEndpointAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/scheduling/ScheduledTasksEndpointAutoConfigurationTests.java @@ -70,7 +70,7 @@ public class ScheduledTasksEndpointAutoConfigurationTests { .hasBean("customEndpoint")); } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomEndpointConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/reactive/ReactiveManagementWebSecurityAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/reactive/ReactiveManagementWebSecurityAutoConfigurationTests.java index 28dc751db0e..aae075206c7 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/reactive/ReactiveManagementWebSecurityAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/reactive/ReactiveManagementWebSecurityAutoConfigurationTests.java @@ -185,7 +185,7 @@ public class ReactiveManagementWebSecurityAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomSecurityConfiguration { @Bean @@ -196,7 +196,7 @@ public class ReactiveManagementWebSecurityAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class WebFilterChainProxyConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/AbstractEndpointRequestIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/AbstractEndpointRequestIntegrationTests.java index dfcc8050939..7082a6c315a 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/AbstractEndpointRequestIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/AbstractEndpointRequestIntegrationTests.java @@ -96,7 +96,7 @@ public abstract class AbstractEndpointRequestIntegrationTests { return "Basic " + Base64.getEncoder().encodeToString("user:password".getBytes()); } - @Configuration + @Configuration(proxyBeanMethods = false) static class BaseConfiguration { @Bean @@ -167,7 +167,7 @@ public abstract class AbstractEndpointRequestIntegrationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class SecurityConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/JerseyEndpointRequestIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/JerseyEndpointRequestIntegrationTests.java index 445339068b2..af592eb102b 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/JerseyEndpointRequestIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/JerseyEndpointRequestIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -110,7 +110,7 @@ public class JerseyEndpointRequestIntegrationTests }); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(WebEndpointProperties.class) static class JerseyEndpointConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfigurationTests.java index db934b567e7..0211bdf1b63 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfigurationTests.java @@ -132,7 +132,7 @@ public class ManagementWebSecurityAutoConfigurationTests { return HttpStatus.valueOf(response.getStatus()); } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomSecurityConfiguration extends WebSecurityConfigurerAdapter { @Override diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/MvcEndpointRequestIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/MvcEndpointRequestIntegrationTests.java index 9cc12d79d20..ae30031f02a 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/MvcEndpointRequestIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/MvcEndpointRequestIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -108,7 +108,7 @@ public class MvcEndpointRequestIntegrationTests DispatcherServletAutoConfiguration.class)); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(WebEndpointProperties.class) static class WebMvcEndpointConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/session/SessionsEndpointAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/session/SessionsEndpointAutoConfigurationTests.java index 800530222ee..03800d38324 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/session/SessionsEndpointAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/session/SessionsEndpointAutoConfigurationTests.java @@ -62,7 +62,7 @@ public class SessionsEndpointAutoConfigurationTests { .doesNotHaveBean(SessionsEndpoint.class)); } - @Configuration + @Configuration(proxyBeanMethods = false) static class SessionConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/jersey/JerseyChildManagementContextConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/jersey/JerseyChildManagementContextConfigurationTests.java index 6063f535bf1..f7d2425c137 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/jersey/JerseyChildManagementContextConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/jersey/JerseyChildManagementContextConfigurationTests.java @@ -102,7 +102,7 @@ public class JerseyChildManagementContextConfigurationTests { (context) -> assertThat(context).hasSingleBean(ResourceConfig.class)); } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomizerConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/jersey/JerseySameManagementContextConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/jersey/JerseySameManagementContextConfigurationTests.java index 17e7e0d236a..96360d20833 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/jersey/JerseySameManagementContextConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/jersey/JerseySameManagementContextConfigurationTests.java @@ -115,7 +115,7 @@ public class JerseySameManagementContextConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class ConfigWithJerseyApplicationPath { @Bean @@ -125,7 +125,7 @@ public class JerseySameManagementContextConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ConfigWithResourceConfig { @Bean @@ -135,7 +135,7 @@ public class JerseySameManagementContextConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomizerConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/reactive/ReactiveManagementContextFactoryTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/reactive/ReactiveManagementContextFactoryTests.java index 932123be97a..8cb9f5aeae0 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/reactive/ReactiveManagementContextFactoryTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/reactive/ReactiveManagementContextFactoryTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -57,7 +57,7 @@ public class ReactiveManagementContextFactoryTests { this.parent.close(); } - @Configuration + @Configuration(proxyBeanMethods = false) static class ParentConfiguration { @Bean @@ -72,7 +72,7 @@ public class ReactiveManagementContextFactoryTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestConfiguration1 { @Bean @@ -82,7 +82,7 @@ public class ReactiveManagementContextFactoryTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestConfiguration2 { } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/CompositeHandlerExceptionResolverTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/CompositeHandlerExceptionResolverTests.java index 779765e22db..7ca46d08af6 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/CompositeHandlerExceptionResolverTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/CompositeHandlerExceptionResolverTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -74,7 +74,7 @@ public class CompositeHandlerExceptionResolverTests { this.context = context; } - @Configuration + @Configuration(proxyBeanMethods = false) static class BaseConfiguration { @Bean(name = DispatcherServlet.HANDLER_EXCEPTION_RESOLVER_BEAN_NAME) @@ -84,7 +84,7 @@ public class CompositeHandlerExceptionResolverTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/WebMvcEndpointChildContextConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/WebMvcEndpointChildContextConfigurationTests.java index 1b8a155a5dd..36e993b2724 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/WebMvcEndpointChildContextConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/WebMvcEndpointChildContextConfigurationTests.java @@ -73,7 +73,7 @@ public class WebMvcEndpointChildContextConfigurationTests { .isEqualTo("/")); } - @Configuration + @Configuration(proxyBeanMethods = false) static class ExistingConfig { @Bean @@ -83,7 +83,7 @@ public class WebMvcEndpointChildContextConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class RequestContextListenerConfig { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/trace/HttpTraceAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/trace/HttpTraceAutoConfigurationTests.java index d4574bd97de..de9d4624276 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/trace/HttpTraceAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/trace/HttpTraceAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -157,7 +157,7 @@ public class HttpTraceAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomRepositoryConfiguration { @Bean @@ -175,7 +175,7 @@ public class HttpTraceAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomTracerConfiguration { @Bean @@ -194,7 +194,7 @@ public class HttpTraceAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomWebFilterConfiguration { @Bean @@ -215,7 +215,7 @@ public class HttpTraceAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomFilterConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/AuditEventsEndpointWebIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/AuditEventsEndpointWebIntegrationTests.java index 1fd55ad0c05..2aa00823338 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/AuditEventsEndpointWebIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/AuditEventsEndpointWebIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -80,7 +80,7 @@ public class AuditEventsEndpointWebIntegrationTests { .isEqualTo(new JSONArray().appendElement("logout")); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TestConfiguration { @Bean @@ -93,8 +93,9 @@ public class AuditEventsEndpointWebIntegrationTests { } @Bean - public AuditEventsEndpoint auditEventsEndpoint() { - return new AuditEventsEndpoint(auditEventsRepository()); + public AuditEventsEndpoint auditEventsEndpoint( + AuditEventRepository auditEventRepository) { + return new AuditEventsEndpoint(auditEventRepository); } private AuditEvent createEvent(String instant, String principal, String type) { diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/beans/BeansEndpointTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/beans/BeansEndpointTests.java index f7ec9166282..9240a45ef8e 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/beans/BeansEndpointTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/beans/BeansEndpointTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -110,7 +110,7 @@ public class BeansEndpointTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) public static class EndpointConfiguration { @Bean @@ -120,7 +120,7 @@ public class BeansEndpointTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class BeanConfiguration { @Bean @@ -130,7 +130,7 @@ public class BeansEndpointTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class LazyBeanConfiguration { @Lazy diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cache/CachesEndpointWebIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cache/CachesEndpointWebIntegrationTests.java index 1f547a6f5c7..df2723cd6a9 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cache/CachesEndpointWebIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cache/CachesEndpointWebIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -97,7 +97,7 @@ public class CachesEndpointWebIntegrationTests { client.get().uri("/actuator/caches/a").exchange().expectStatus().isBadRequest(); } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/ShutdownEndpointTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/ShutdownEndpointTests.java index 56ecf682807..140dfad84ec 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/ShutdownEndpointTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/ShutdownEndpointTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -94,7 +94,7 @@ public class ShutdownEndpointTests { assertThat(childLatch.await(10, TimeUnit.SECONDS)).isTrue(); } - @Configuration + @Configuration(proxyBeanMethods = false) public static class EndpointConfig { private final CountDownLatch latch = new CountDownLatch(1); @@ -118,7 +118,7 @@ public class ShutdownEndpointTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class EmptyConfig { private final CountDownLatch latch = new CountDownLatch(1); diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointMethodAnnotationsTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointMethodAnnotationsTests.java index 9d961bcd8cc..2a32dde42df 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointMethodAnnotationsTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointMethodAnnotationsTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -83,7 +83,7 @@ public class ConfigurationPropertiesReportEndpointMethodAnnotationsTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties public static class Config { @@ -106,7 +106,7 @@ public class ConfigurationPropertiesReportEndpointMethodAnnotationsTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties public static class OverriddenPrefix { diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointParentTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointParentTests.java index 6b3fb1d3b5c..034cdbe0a85 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointParentTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointParentTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -84,7 +84,7 @@ public class ConfigurationPropertiesReportEndpointParentTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties public static class Parent { @@ -95,7 +95,7 @@ public class ConfigurationPropertiesReportEndpointParentTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties public static class ClassConfigurationProperties { @@ -111,7 +111,7 @@ public class ConfigurationPropertiesReportEndpointParentTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties public static class BeanMethodConfigurationProperties { diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointProxyTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointProxyTests.java index 469d761c6ed..699d22dc9ae 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointProxyTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointProxyTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -62,7 +62,7 @@ public class ConfigurationPropertiesReportEndpointProxyTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableTransactionManagement(proxyTargetClass = false) @EnableConfigurationProperties public static class Config { @@ -73,8 +73,8 @@ public class ConfigurationPropertiesReportEndpointProxyTests { } @Bean - public PlatformTransactionManager transactionManager() { - return new DataSourceTransactionManager(dataSource()); + public PlatformTransactionManager transactionManager(DataSource dataSource) { + return new DataSourceTransactionManager(dataSource); } @Bean diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointSerializationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointSerializationTests.java index 1259ac08a15..0d6414998ad 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointSerializationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointSerializationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -258,7 +258,7 @@ public class ConfigurationPropertiesReportEndpointSerializationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties public static class Base { @@ -269,7 +269,7 @@ public class ConfigurationPropertiesReportEndpointSerializationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(Base.class) public static class FooConfig { @@ -281,7 +281,7 @@ public class ConfigurationPropertiesReportEndpointSerializationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(Base.class) public static class SelfReferentialConfig { @@ -293,7 +293,7 @@ public class ConfigurationPropertiesReportEndpointSerializationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(Base.class) public static class MetadataCycleConfig { @@ -305,7 +305,7 @@ public class ConfigurationPropertiesReportEndpointSerializationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(Base.class) public static class MapConfig { @@ -317,7 +317,7 @@ public class ConfigurationPropertiesReportEndpointSerializationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(Base.class) public static class ListConfig { @@ -329,7 +329,7 @@ public class ConfigurationPropertiesReportEndpointSerializationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(Base.class) public static class MetadataMapConfig { @@ -341,7 +341,7 @@ public class ConfigurationPropertiesReportEndpointSerializationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(Base.class) public static class AddressedConfig { @@ -353,7 +353,7 @@ public class ConfigurationPropertiesReportEndpointSerializationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(Base.class) public static class InitializedMapAndListPropertiesConfig { @@ -508,7 +508,7 @@ public class ConfigurationPropertiesReportEndpointSerializationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(Base.class) static class CycleConfig { @@ -521,7 +521,7 @@ public class ConfigurationPropertiesReportEndpointSerializationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties static class HikariDataSourceConfig { diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointTests.java index 87c090ebd30..f29c51fcb37 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -222,7 +222,7 @@ public class ConfigurationPropertiesReportEndpointTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties public static class Parent { @@ -233,7 +233,7 @@ public class ConfigurationPropertiesReportEndpointTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties public static class Config { diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscovererTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscovererTests.java index 0da86eca0c2..bf610655154 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscovererTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscovererTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -151,8 +151,8 @@ public class EndpointDiscovererTests { @Test public void getEndpointsWhenEndpointsArePrefixedWithScopedTargetShouldRegisterOnlyOneEndpoint() { load(ScopedTargetEndpointConfiguration.class, (context) -> { - TestEndpoint expectedEndpoint = context - .getBean(ScopedTargetEndpointConfiguration.class).testEndpoint(); + TestEndpoint expectedEndpoint = context.getBean("testEndpoint", + TestEndpoint.class); Collection endpoints = new TestEndpointDiscoverer( context).getEndpoints(); assertThat(endpoints).flatExtracting(TestExposableEndpoint::getEndpointBean) @@ -365,12 +365,12 @@ public class EndpointDiscovererTests { } } - @Configuration + @Configuration(proxyBeanMethods = false) static class EmptyConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestEndpointConfiguration { @Bean @@ -380,7 +380,7 @@ public class EndpointDiscovererTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestEndpointSubclassConfiguration { @Bean @@ -390,7 +390,7 @@ public class EndpointDiscovererTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ClashingEndpointConfiguration { @Bean @@ -405,7 +405,7 @@ public class EndpointDiscovererTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ScopedTargetEndpointConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/annotation/JmxEndpointDiscovererTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/annotation/JmxEndpointDiscovererTests.java index 19ed42f56cd..49ae0531e12 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/annotation/JmxEndpointDiscovererTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/annotation/JmxEndpointDiscovererTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -304,12 +304,12 @@ public class JmxEndpointDiscovererTests { } } - @Configuration + @Configuration(proxyBeanMethods = false) static class EmptyConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) static class MultipleEndpointsConfiguration { @Bean @@ -329,7 +329,7 @@ public class JmxEndpointDiscovererTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class OverriddenOperationJmxEndpointConfiguration { @Bean @@ -344,7 +344,7 @@ public class JmxEndpointDiscovererTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class AdditionalOperationJmxEndpointConfiguration { @Bean @@ -359,7 +359,7 @@ public class JmxEndpointDiscovererTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class AdditionalClashingOperationsConfiguration { @Bean @@ -374,7 +374,7 @@ public class JmxEndpointDiscovererTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ClashingJmxEndpointConfiguration { @Bean @@ -394,7 +394,7 @@ public class JmxEndpointDiscovererTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ClashingStandardEndpointConfiguration { @Bean @@ -409,7 +409,7 @@ public class JmxEndpointDiscovererTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class InvalidJmxExtensionConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/AbstractWebEndpointIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/AbstractWebEndpointIntegrationTests.java index 6b7dbd0e7d9..8dfb8441d59 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/AbstractWebEndpointIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/AbstractWebEndpointIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -462,7 +462,7 @@ public abstract class AbstractWebEndpointIntegrationTests infoContributors) { + return new InfoEndpoint( + infoContributors.orderedStream().collect(Collectors.toList())); } @Bean diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/integration/IntegrationGraphEndpointWebIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/integration/IntegrationGraphEndpointWebIntegrationTests.java index 80e913eeb78..4f5943a61f3 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/integration/IntegrationGraphEndpointWebIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/integration/IntegrationGraphEndpointWebIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -53,7 +53,7 @@ public class IntegrationGraphEndpointWebIntegrationTests { .exchange().expectStatus().isNoContent(); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableIntegration public static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/liquibase/LiquibaseEndpointTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/liquibase/LiquibaseEndpointTests.java index 10a9cf28cc4..e9a2c853097 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/liquibase/LiquibaseEndpointTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/liquibase/LiquibaseEndpointTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -83,7 +83,7 @@ public class LiquibaseEndpointTests { } } - @Configuration + @Configuration(proxyBeanMethods = false) public static class Config { @Bean diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LogFileWebEndpointWebIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LogFileWebEndpointWebIntegrationTests.java index 3c5bf7b8f4e..5533d631206 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LogFileWebEndpointWebIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LogFileWebEndpointWebIntegrationTests.java @@ -80,7 +80,7 @@ public class LogFileWebEndpointWebIntegrationTests { .expectStatus().isOk().expectBody(String.class).isEqualTo("--TEST--"); } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LoggersEndpointWebIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LoggersEndpointWebIntegrationTests.java index 1281006fbd4..14d69d98e9e 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LoggersEndpointWebIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LoggersEndpointWebIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -161,7 +161,7 @@ public class LoggersEndpointWebIntegrationTests { return array; } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/management/HeapDumpWebEndpointWebIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/management/HeapDumpWebEndpointWebIntegrationTests.java index b2b93095e1e..743ffb7667b 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/management/HeapDumpWebEndpointWebIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/management/HeapDumpWebEndpointWebIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -80,7 +80,7 @@ public class HeapDumpWebEndpointWebIntegrationTests { assertThat(this.endpoint.file.exists()).isFalse(); } - @Configuration + @Configuration(proxyBeanMethods = false) public static class TestConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/MetricsEndpointWebIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/MetricsEndpointWebIntegrationTests.java index 2cec40eb749..f920511c90a 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/MetricsEndpointWebIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/MetricsEndpointWebIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -76,7 +76,7 @@ public class MetricsEndpointWebIntegrationTests { .isEqualTo("jvm.memory.used"); } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/prometheus/PrometheusScrapeEndpointIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/prometheus/PrometheusScrapeEndpointIntegrationTests.java index 218d3694cf5..67046768b0c 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/prometheus/PrometheusScrapeEndpointIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/prometheus/PrometheusScrapeEndpointIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -47,7 +47,7 @@ public class PrometheusScrapeEndpointIntegrationTests { .contentType(MediaType.parseMediaType(TextFormat.CONTENT_TYPE_004)); } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/jdbc/DataSourcePoolMetricsTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/jdbc/DataSourcePoolMetricsTests.java index dedaf9de1c6..13d63235706 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/jdbc/DataSourcePoolMetricsTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/jdbc/DataSourcePoolMetricsTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -55,7 +55,7 @@ public class DataSourcePoolMetricsTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class MetricsApp { @Bean @@ -65,7 +65,7 @@ public class DataSourcePoolMetricsTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class DataSourceConfig { DataSourceConfig(DataSource dataSource, diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/LongTaskTimingHandlerInterceptorTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/LongTaskTimingHandlerInterceptorTests.java index 036e6f82e49..e91c63e912a 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/LongTaskTimingHandlerInterceptorTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/LongTaskTimingHandlerInterceptorTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -119,7 +119,7 @@ public class LongTaskTimingHandlerInterceptorTests { .longTaskTimer().activeTasks()).isEqualTo(0); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWebMvc @Import(Controller1.class) static class MetricsInterceptorConfiguration { diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilterAutoTimedTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilterAutoTimedTests.java index 55784c6e930..7cb75f222c4 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilterAutoTimedTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilterAutoTimedTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -77,7 +77,7 @@ public class WebMvcMetricsFilterAutoTimedTests { .count()).isEqualTo(1L); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWebMvc @Import({ Controller.class }) static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilterTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilterTests.java index 7b53c255690..de7fe8e22e8 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilterTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilterTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -298,7 +298,7 @@ public class WebMvcMetricsFilterTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWebMvc @Import({ Controller1.class, Controller2.class }) static class MetricsFilterApp { diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsIntegrationTests.java index 383a5cd6774..5b827b8aab3 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsIntegrationTests.java @@ -93,7 +93,7 @@ public class WebMvcMetricsIntegrationTests { .isEqualTo(1L); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWebMvc static class TestConfiguration { @@ -114,7 +114,7 @@ public class WebMvcMetricsIntegrationTests { "http.server.requests", true); } - @Configuration + @Configuration(proxyBeanMethods = false) @RestController @RequestMapping("/api") @Timed diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/scheduling/ScheduledTasksEndpointTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/scheduling/ScheduledTasksEndpointTests.java index 3f662a54a2c..4d487b55922 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/scheduling/ScheduledTasksEndpointTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/scheduling/ScheduledTasksEndpointTests.java @@ -167,7 +167,7 @@ public class ScheduledTasksEndpointTests { .accept(context.getBean(ScheduledTasksEndpoint.class).scheduledTasks())); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableScheduling static class BaseConfiguration { diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/session/SessionsEndpointWebIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/session/SessionsEndpointWebIntegrationTests.java index 3ef535899be..59fe8d3b87c 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/session/SessionsEndpointWebIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/session/SessionsEndpointWebIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -84,7 +84,7 @@ public class SessionsEndpointWebIntegrationTests { .expectStatus().isNotFound(); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TestConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/http/reactive/HttpTraceWebFilterIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/http/reactive/HttpTraceWebFilterIntegrationTests.java index 8e5f9efdf02..d657cd9614a 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/http/reactive/HttpTraceWebFilterIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/http/reactive/HttpTraceWebFilterIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -92,7 +92,7 @@ public class HttpTraceWebFilterIntegrationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWebFlux static class Config { diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/mappings/MappingsEndpointTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/mappings/MappingsEndpointTests.java index d66600286e8..63275c28484 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/mappings/MappingsEndpointTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/mappings/MappingsEndpointTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -170,7 +170,7 @@ public class MappingsEndpointTests { return (T) contextMappings.getMappings().get(key); } - @Configuration + @Configuration(proxyBeanMethods = false) static class EndpointConfiguration { @Bean @@ -182,7 +182,7 @@ public class MappingsEndpointTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWebFlux @Controller static class ReactiveWebConfiguration { @@ -205,7 +205,7 @@ public class MappingsEndpointTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWebMvc @Controller static class ServletWebConfiguration { @@ -259,7 +259,7 @@ public class MappingsEndpointTests { @Bean public ServletRegistrationBean anotherDispatcherServletRegistration( - WebApplicationContext context) { + DispatcherServlet dispatcherServlet, WebApplicationContext context) { ServletRegistrationBean registrationBean = new ServletRegistrationBean<>( anotherDispatcherServlet(context)); registrationBean.setName("anotherDispatcherServletRegistration"); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/admin/SpringApplicationAdminJmxAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/admin/SpringApplicationAdminJmxAutoConfiguration.java index 64d98807508..351f57c3615 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/admin/SpringApplicationAdminJmxAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/admin/SpringApplicationAdminJmxAutoConfiguration.java @@ -39,7 +39,7 @@ import org.springframework.jmx.export.MBeanExporter; * @since 1.3.0 * @see SpringApplicationAdminMXBean */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureAfter(JmxAutoConfiguration.class) @ConditionalOnProperty(prefix = "spring.application.admin", value = "enabled", havingValue = "true", matchIfMissing = false) public class SpringApplicationAdminJmxAutoConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAnnotationDrivenConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAnnotationDrivenConfiguration.java index 2be022cb668..c239df60bf7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAnnotationDrivenConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAnnotationDrivenConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -39,7 +39,7 @@ import org.springframework.context.annotation.Configuration; * @author Josh Thornhill * @since 1.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(EnableRabbit.class) class RabbitAnnotationDrivenConfiguration { @@ -107,7 +107,7 @@ class RabbitAnnotationDrivenConfiguration { return factory; } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableRabbit @ConditionalOnMissingBean(name = RabbitListenerConfigUtils.RABBIT_LISTENER_ANNOTATION_PROCESSOR_BEAN_NAME) protected static class EnableRabbitConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java index ca7d39cb20d..556cb7056c4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java @@ -81,13 +81,13 @@ import org.springframework.context.annotation.Import; * @author Phillip Webb * @author Artsiom Yudovin */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ RabbitTemplate.class, Channel.class }) @EnableConfigurationProperties(RabbitProperties.class) @Import(RabbitAnnotationDrivenConfiguration.class) public class RabbitAutoConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(ConnectionFactory.class) protected static class RabbitConnectionFactoryCreator { @@ -153,7 +153,7 @@ public class RabbitAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(RabbitConnectionFactoryCreator.class) protected static class RabbitTemplateConfiguration { @@ -202,7 +202,7 @@ public class RabbitAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(RabbitMessagingTemplate.class) @ConditionalOnMissingBean(RabbitMessagingTemplate.class) @Import(RabbitTemplateConfiguration.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/aop/AopAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/aop/AopAutoConfiguration.java index e9ad5cacb27..84c59e8d1a2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/aop/AopAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/aop/AopAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -39,20 +39,20 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy; * @author Josh Long * @see EnableAspectJAutoProxy */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ EnableAspectJAutoProxy.class, Aspect.class, Advice.class, AnnotatedElement.class }) @ConditionalOnProperty(prefix = "spring.aop", name = "auto", havingValue = "true", matchIfMissing = true) public class AopAutoConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAspectJAutoProxy(proxyTargetClass = false) @ConditionalOnProperty(prefix = "spring.aop", name = "proxy-target-class", havingValue = "false", matchIfMissing = false) public static class JdkDynamicAutoProxyConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAspectJAutoProxy(proxyTargetClass = true) @ConditionalOnProperty(prefix = "spring.aop", name = "proxy-target-class", havingValue = "true", matchIfMissing = true) public static class CglibAutoProxyConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java index 68c23e66a80..7d3bb847bb5 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java @@ -58,7 +58,7 @@ import org.springframework.util.StringUtils; * @author Kazuki Shimizu * @author Mahmoud Ben Hassine */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ JobLauncher.class, DataSource.class, JdbcOperations.class }) @AutoConfigureAfter(HibernateJpaAutoConfiguration.class) @ConditionalOnBean(JobLauncher.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchConfigurerConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchConfigurerConfiguration.java index 48a04b3bf7a..f33d5b80922 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchConfigurerConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchConfigurerConfiguration.java @@ -36,10 +36,10 @@ import org.springframework.transaction.PlatformTransactionManager; */ @ConditionalOnClass(PlatformTransactionManager.class) @ConditionalOnMissingBean(BatchConfigurer.class) -@Configuration +@Configuration(proxyBeanMethods = false) class BatchConfigurerConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(name = "entityManagerFactory") static class JdbcBatchConfiguration { @@ -53,7 +53,7 @@ class BatchConfigurerConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(EntityManagerFactory.class) @ConditionalOnBean(name = "entityManagerFactory") static class JpaBatchConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfiguration.java index ec56805d2bc..8da70b8f012 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -54,7 +54,7 @@ import org.springframework.util.Assert; * @since 1.3.0 * @see EnableCaching */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(CacheManager.class) @ConditionalOnBean(CacheAspectSupport.class) @ConditionalOnMissingBean(value = CacheManager.class, name = "cacheResolver") @@ -78,7 +78,7 @@ public class CacheAutoConfiguration { return new CacheManagerValidator(cacheProperties, cacheManager); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(LocalContainerEntityManagerFactoryBean.class) @ConditionalOnBean(AbstractEntityManagerFactoryBean.class) protected static class CacheManagerJpaDependencyConfiguration diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CaffeineCacheConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CaffeineCacheConfiguration.java index d0b123d4835..5719f9f28c3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CaffeineCacheConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CaffeineCacheConfiguration.java @@ -39,7 +39,7 @@ import org.springframework.util.StringUtils; * @author Eddú Meléndez * @since 1.4.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Caffeine.class, CaffeineCacheManager.class }) @ConditionalOnMissingBean(CacheManager.class) @Conditional({ CacheCondition.class }) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CouchbaseCacheConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CouchbaseCacheConfiguration.java index d84def6b8d0..f75247f9374 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CouchbaseCacheConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CouchbaseCacheConfiguration.java @@ -40,7 +40,7 @@ import org.springframework.util.StringUtils; * @author Stephane Nicoll * @since 1.4.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Bucket.class, CouchbaseCacheManager.class }) @ConditionalOnMissingBean(CacheManager.class) @ConditionalOnSingleCandidate(Bucket.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/EhCacheCacheConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/EhCacheCacheConfiguration.java index 6037f7d5ed7..410cd59650d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/EhCacheCacheConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/EhCacheCacheConfiguration.java @@ -38,7 +38,7 @@ import org.springframework.core.io.Resource; * @author Madhura Bhave * @since 1.3.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Cache.class, EhCacheCacheManager.class }) @ConditionalOnMissingBean(org.springframework.cache.CacheManager.class) @Conditional({ CacheCondition.class, diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/GenericCacheConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/GenericCacheConfiguration.java index 6af9862fc3c..1fe62c80dd3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/GenericCacheConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/GenericCacheConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration; * @author Stephane Nicoll * @since 1.3.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnBean(Cache.class) @ConditionalOnMissingBean(CacheManager.class) @Conditional(CacheCondition.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/HazelcastCacheConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/HazelcastCacheConfiguration.java index ed1200a61d4..961f1cfd4b5 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/HazelcastCacheConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/HazelcastCacheConfiguration.java @@ -43,7 +43,7 @@ import org.springframework.context.annotation.Configuration; * @since 1.3.0 * @see HazelcastConfigResourceCondition */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ HazelcastInstance.class, HazelcastCacheManager.class }) @ConditionalOnMissingBean(CacheManager.class) @Conditional(CacheCondition.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/HazelcastJCacheCustomizationConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/HazelcastJCacheCustomizationConfiguration.java index 2b578fb9123..df1ca5ad5d9 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/HazelcastJCacheCustomizationConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/HazelcastJCacheCustomizationConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -33,7 +33,7 @@ import org.springframework.core.io.Resource; * * @author Stephane Nicoll */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(HazelcastInstance.class) class HazelcastJCacheCustomizationConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/InfinispanCacheConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/InfinispanCacheConfiguration.java index 25093bc9950..9d53d517f50 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/InfinispanCacheConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/InfinispanCacheConfiguration.java @@ -43,7 +43,7 @@ import org.springframework.util.CollectionUtils; * @author Raja Kolli * @since 1.3.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(SpringEmbeddedCacheManager.class) @ConditionalOnMissingBean(CacheManager.class) @Conditional(CacheCondition.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/JCacheCacheConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/JCacheCacheConfiguration.java index 832f68cdf4a..703b48e52ac 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/JCacheCacheConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/JCacheCacheConfiguration.java @@ -55,7 +55,7 @@ import org.springframework.util.StringUtils; * @author Madhura Bhave * @since 1.3.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Caching.class, JCacheCacheManager.class }) @ConditionalOnMissingBean(org.springframework.cache.CacheManager.class) @Conditional({ CacheCondition.class, diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/NoOpCacheConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/NoOpCacheConfiguration.java index 34a85323b62..1617f77ac31 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/NoOpCacheConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/NoOpCacheConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -29,7 +29,7 @@ import org.springframework.context.annotation.Configuration; * @author Stephane Nicoll * @since 1.3.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(CacheManager.class) @Conditional(CacheCondition.class) class NoOpCacheConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/RedisCacheConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/RedisCacheConfiguration.java index 47b2d2437cb..c398c7ea9b4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/RedisCacheConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/RedisCacheConfiguration.java @@ -45,7 +45,7 @@ import org.springframework.data.redis.serializer.RedisSerializationContext.Seria * @author Ryon Day * @since 1.3.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(RedisConnectionFactory.class) @AutoConfigureAfter(RedisAutoConfiguration.class) @ConditionalOnBean(RedisConnectionFactory.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/SimpleCacheConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/SimpleCacheConfiguration.java index fd989e02216..75c297d572c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/SimpleCacheConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/SimpleCacheConfiguration.java @@ -31,7 +31,7 @@ import org.springframework.context.annotation.Configuration; * @author Stephane Nicoll * @since 1.3.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(CacheManager.class) @Conditional(CacheCondition.class) class SimpleCacheConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java index 24fa3e0506d..539fea50ca8 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java @@ -42,7 +42,7 @@ import org.springframework.util.StringUtils; * @author Stephane Nicoll * @since 1.3.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Cluster.class }) @EnableConfigurationProperties(CassandraProperties.class) public class CassandraAutoConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cloud/CloudServiceConnectorsAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cloud/CloudServiceConnectorsAutoConfiguration.java index 3b5a8d44b88..b6212e9500a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cloud/CloudServiceConnectorsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cloud/CloudServiceConnectorsAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -43,7 +43,7 @@ import org.springframework.core.Ordered; * @author Ramnivas Laddad * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @Profile("cloud") @AutoConfigureOrder(CloudServiceConnectorsAutoConfiguration.ORDER) @ConditionalOnClass(CloudScanConfiguration.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/context/ConfigurationPropertiesAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/context/ConfigurationPropertiesAutoConfiguration.java index 1422e4fec58..4fe010a51da 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/context/ConfigurationPropertiesAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/context/ConfigurationPropertiesAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -31,7 +31,7 @@ import org.springframework.context.annotation.Configuration; * @see EnableConfigurationProperties * @see ConfigurationProperties */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties public class ConfigurationPropertiesAutoConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfiguration.java index 9c1b4d8aded..b2357997de5 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -49,7 +49,7 @@ import org.springframework.util.StringUtils; * @author Phillip Webb * @author Eddú Meléndez */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(name = AbstractApplicationContext.MESSAGE_SOURCE_BEAN_NAME, search = SearchStrategy.CURRENT) @AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE) @Conditional(ResourceBundleCondition.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/context/PropertyPlaceholderAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/context/PropertyPlaceholderAutoConfiguration.java index 499f519516c..9e6b4974360 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/context/PropertyPlaceholderAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/context/PropertyPlaceholderAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ import org.springframework.core.Ordered; * @author Phillip Webb * @author Dave Syer */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE) public class PropertyPlaceholderAutoConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java index 142f9e98dcc..e6539d211db 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -37,13 +37,13 @@ import org.springframework.context.annotation.Import; * @author Yulin Qin * @since 1.4.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ CouchbaseBucket.class, Cluster.class }) @Conditional(CouchbaseAutoConfiguration.CouchbaseCondition.class) @EnableConfigurationProperties(CouchbaseProperties.class) public class CouchbaseAutoConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(value = CouchbaseConfiguration.class, type = "org.springframework.data.couchbase.config.CouchbaseConfigurer") @Import(CouchbaseConfiguration.class) static class DefaultCouchbaseConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseConfiguration.java index fafcb01ee5c..684431ebdec 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfiguration.java index 4a6f5e0fb97..40cc26c13f7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -34,7 +34,7 @@ import org.springframework.dao.annotation.PersistenceExceptionTranslationPostPro * @author Madhura Bhave * @since 1.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(PersistenceExceptionTranslationPostProcessor.class) public class PersistenceExceptionTranslationAutoConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfiguration.java index 827d7e8b280..9800a12331d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfiguration.java @@ -57,7 +57,7 @@ import org.springframework.data.cassandra.core.mapping.SimpleUserTypeResolver; * @author Madhura Bhave * @since 1.3.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Cluster.class, CassandraAdminOperations.class }) @EnableConfigurationProperties(CassandraProperties.class) @AutoConfigureAfter(CassandraAutoConfiguration.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveDataAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveDataAutoConfiguration.java index bf279901f14..62c6ac3895b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveDataAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveDataAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -42,7 +42,7 @@ import org.springframework.data.cassandra.core.cql.session.DefaultReactiveSessio * @author Mark Paluch * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Cluster.class, ReactiveCassandraTemplate.class, Flux.class }) @ConditionalOnBean(Session.class) @AutoConfigureAfter(CassandraDataAutoConfiguration.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveRepositoriesAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveRepositoriesAutoConfiguration.java index fb6c88628c3..cec9f2adfda 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveRepositoriesAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveRepositoriesAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -38,7 +38,7 @@ import org.springframework.data.cassandra.repository.support.ReactiveCassandraRe * @since 2.0.0 * @see EnableReactiveCassandraRepositories */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ ReactiveSession.class, ReactiveCassandraRepository.class }) @ConditionalOnRepositoryType(store = "cassandra", type = RepositoryType.REACTIVE) @ConditionalOnMissingBean(ReactiveCassandraRepositoryFactoryBean.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraRepositoriesAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraRepositoriesAutoConfiguration.java index 7dce53d1e48..a8871946f94 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraRepositoriesAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraRepositoriesAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -37,7 +37,7 @@ import org.springframework.data.cassandra.repository.support.CassandraRepository * @see EnableCassandraRepositories * @since 1.3.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Session.class, CassandraRepository.class }) @ConditionalOnRepositoryType(store = "cassandra", type = RepositoryType.IMPERATIVE) @ConditionalOnMissingBean(CassandraRepositoryFactoryBean.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseConfigurerAdapterConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseConfigurerAdapterConfiguration.java index 5f8d7d7d636..727e1be545d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseConfigurerAdapterConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseConfigurerAdapterConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -30,7 +30,7 @@ import org.springframework.data.couchbase.config.CouchbaseConfigurer; * * @author Stephane Nicoll */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(CouchbaseConfigurer.class) @ConditionalOnBean(CouchbaseConfiguration.class) class CouchbaseConfigurerAdapterConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataAutoConfiguration.java index 1206f9fb5dc..8d883e22a32 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -40,7 +40,7 @@ import org.springframework.data.couchbase.repository.CouchbaseRepository; * @author Stephane Nicoll * @since 1.4.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Bucket.class, CouchbaseRepository.class }) @AutoConfigureAfter({ CouchbaseAutoConfiguration.class, ValidationAutoConfiguration.class }) @@ -49,7 +49,7 @@ import org.springframework.data.couchbase.repository.CouchbaseRepository; SpringBootCouchbaseDataConfiguration.class }) public class CouchbaseDataAutoConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(Validator.class) public static class ValidationConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveDataAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveDataAutoConfiguration.java index 7474ff4a5bb..1bababd1893 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveDataAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveDataAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -33,7 +33,7 @@ import org.springframework.data.couchbase.repository.ReactiveCouchbaseRepository * @author Alex Derkach * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Bucket.class, ReactiveCouchbaseRepository.class, Flux.class }) @AutoConfigureAfter(CouchbaseDataAutoConfiguration.class) @Import(SpringBootCouchbaseReactiveDataConfiguration.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveRepositoriesAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveRepositoriesAutoConfiguration.java index e9071288528..884c5535b4c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveRepositoriesAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveRepositoriesAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -39,7 +39,7 @@ import org.springframework.data.couchbase.repository.support.ReactiveCouchbaseRe * @author Alex Derkach * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Bucket.class, ReactiveCouchbaseRepository.class, Flux.class }) @ConditionalOnRepositoryType(store = "couchbase", type = RepositoryType.REACTIVE) @ConditionalOnBean(ReactiveRepositoryOperationsMapping.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseRepositoriesAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseRepositoriesAutoConfiguration.java index 451538a2be4..c5be0b0f92f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseRepositoriesAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseRepositoriesAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -38,7 +38,7 @@ import org.springframework.data.couchbase.repository.support.CouchbaseRepository * @author Stephane Nicoll * @since 1.4.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Bucket.class, CouchbaseRepository.class }) @ConditionalOnBean(RepositoryOperationsMapping.class) @ConditionalOnRepositoryType(store = "couchbase", type = RepositoryType.IMPERATIVE) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchAutoConfiguration.java index ab292f2d3d5..4036835a4c5 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -38,7 +38,7 @@ import org.springframework.data.elasticsearch.client.TransportClientFactoryBean; * @author Andy Wilkinson * @since 1.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Client.class, TransportClientFactoryBean.class }) @ConditionalOnProperty(prefix = "spring.data.elasticsearch", name = "cluster-nodes", matchIfMissing = false) @EnableConfigurationProperties(ElasticsearchProperties.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfiguration.java index bdcbe35ede4..b1d66f55ecc 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -43,7 +43,7 @@ import org.springframework.data.elasticsearch.repository.config.EnableElasticsea * @see EnableElasticsearchRepositories * @since 1.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Client.class, ElasticsearchTemplate.class }) @AutoConfigureAfter(ElasticsearchAutoConfiguration.class) public class ElasticsearchDataAutoConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfiguration.java index 205b944316b..4e98c41401f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -37,7 +37,7 @@ import org.springframework.data.elasticsearch.repository.support.ElasticsearchRe * @see EnableElasticsearchRepositories * @since 1.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Client.class, ElasticsearchRepository.class }) @ConditionalOnProperty(prefix = "spring.data.elasticsearch.repositories", name = "enabled", havingValue = "true", matchIfMissing = true) @ConditionalOnMissingBean(ElasticsearchRepositoryFactoryBean.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfiguration.java index 7efb31ee296..8f77872aef7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfiguration.java @@ -43,7 +43,7 @@ import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations; * @see EnableJdbcRepositories */ @SuppressWarnings("deprecation") -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnBean(NamedParameterJdbcOperations.class) @ConditionalOnClass({ NamedParameterJdbcOperations.class, AbstractJdbcConfiguration.class }) @@ -51,7 +51,7 @@ import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations; @AutoConfigureAfter(JdbcTemplateAutoConfiguration.class) public class JdbcRepositoriesAutoConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(JdbcRepositoryConfigExtension.class) @Import(JdbcRepositoriesAutoConfigureRegistrar.class) static class JdbcRepositoriesConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfiguration.java index 4c7400684d6..0d29dae6780 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfiguration.java @@ -59,7 +59,7 @@ import org.springframework.data.jpa.repository.support.JpaRepositoryFactoryBean; * @author Josh Long * @see EnableJpaRepositories */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnBean(DataSource.class) @ConditionalOnClass(JpaRepository.class) @ConditionalOnMissingBean({ JpaRepositoryFactoryBean.class, diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/ldap/LdapRepositoriesAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/ldap/LdapRepositoriesAutoConfiguration.java index 8817c47335b..792931142f4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/ldap/LdapRepositoriesAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/ldap/LdapRepositoriesAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -33,7 +33,7 @@ import org.springframework.data.ldap.repository.support.LdapRepositoryFactoryBea * @author Eddú Meléndez * @since 1.5.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ LdapContext.class, LdapRepository.class }) @ConditionalOnProperty(prefix = "spring.data.ldap.repositories", name = "enabled", havingValue = "true", matchIfMissing = true) @ConditionalOnMissingBean(LdapRepositoryFactoryBean.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfiguration.java index 444b5c0eec5..2c1b0a61a42 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -72,7 +72,7 @@ import org.springframework.util.StringUtils; * @author Christoph Strobl * @since 1.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ MongoClient.class, com.mongodb.client.MongoClient.class, MongoTemplate.class }) @Conditional(AnyMongoClientAvailable.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataConfiguration.java index 1fb93cf1a9d..b4545f508b4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataConfiguration.java @@ -35,7 +35,7 @@ import org.springframework.data.mongodb.core.mapping.MongoMappingContext; * * @author Madhura Bhave */ -@Configuration +@Configuration(proxyBeanMethods = false) class MongoDataConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveDataAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveDataAutoConfiguration.java index 414eb75a6f9..ac6001f3f3c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveDataAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveDataAutoConfiguration.java @@ -51,7 +51,7 @@ import org.springframework.data.mongodb.core.mapping.MongoMappingContext; * @author Mark Paluch * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ MongoClient.class, ReactiveMongoTemplate.class }) @ConditionalOnBean(MongoClient.class) @EnableConfigurationProperties(MongoProperties.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveRepositoriesAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveRepositoriesAutoConfiguration.java index b96f4714886..6989e7f5e62 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveRepositoriesAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveRepositoriesAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -48,7 +48,7 @@ import org.springframework.data.mongodb.repository.support.ReactiveMongoReposito * @since 2.0.0 * @see EnableReactiveMongoRepositories */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ MongoClient.class, ReactiveMongoRepository.class }) @ConditionalOnMissingBean({ ReactiveMongoRepositoryFactoryBean.class, ReactiveMongoRepositoryConfigurationExtension.class }) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoRepositoriesAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoRepositoriesAutoConfiguration.java index b7a180efb71..508ed5e7b2d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoRepositoriesAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoRepositoriesAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -52,7 +52,7 @@ import org.springframework.data.mongodb.repository.support.MongoRepositoryFactor * @author Josh Long * @see EnableMongoRepositories */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ MongoClient.class, MongoRepository.class }) @ConditionalOnMissingBean({ MongoRepositoryFactoryBean.class, MongoRepositoryConfigurationExtension.class }) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jBookmarkManagementConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jBookmarkManagementConfiguration.java index d3751cb8ec8..de5ffb85c98 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jBookmarkManagementConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jBookmarkManagementConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -41,7 +41,7 @@ import org.springframework.web.context.WebApplicationContext; * * @author Michael Simons */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Caffeine.class, CaffeineCacheManager.class }) @ConditionalOnMissingBean(BookmarkManager.class) @ConditionalOnBean({ BeanFactoryBookmarkOperationAdvisor.class, diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfiguration.java index 1c4e179e997..ffcfe43d89a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfiguration.java @@ -55,7 +55,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; * @author Kazuki Shimizu * @since 1.4.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ SessionFactory.class, Neo4jTransactionManager.class, PlatformTransactionManager.class }) @ConditionalOnMissingBean(SessionFactory.class) @@ -105,41 +105,43 @@ public class Neo4jDataAutoConfiguration { return StringUtils.toStringArray(packages); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.SERVLET) @ConditionalOnClass({ WebMvcConfigurer.class, OpenSessionInViewInterceptor.class }) @ConditionalOnMissingBean(OpenSessionInViewInterceptor.class) @ConditionalOnProperty(prefix = "spring.data.neo4j", name = "open-in-view", havingValue = "true", matchIfMissing = true) protected static class Neo4jWebConfiguration { - @Configuration - protected static class Neo4jWebMvcConfiguration implements WebMvcConfigurer { + private static final Log logger = LogFactory.getLog(Neo4jWebConfiguration.class); - private static final Log logger = LogFactory - .getLog(Neo4jWebMvcConfiguration.class); + private final Neo4jProperties neo4jProperties; - private final Neo4jProperties neo4jProperties; + protected Neo4jWebConfiguration(Neo4jProperties neo4jProperties) { + this.neo4jProperties = neo4jProperties; + } - protected Neo4jWebMvcConfiguration(Neo4jProperties neo4jProperties) { - this.neo4jProperties = neo4jProperties; + @Bean + public OpenSessionInViewInterceptor neo4jOpenSessionInViewInterceptor() { + if (this.neo4jProperties.getOpenInView() == null) { + logger.warn("spring.data.neo4j.open-in-view is enabled by default." + + "Therefore, database queries may be performed during view " + + "rendering. Explicitly configure " + + "spring.data.neo4j.open-in-view to disable this warning"); } + return new OpenSessionInViewInterceptor(); + } - @Bean - public OpenSessionInViewInterceptor neo4jOpenSessionInViewInterceptor() { - if (this.neo4jProperties.getOpenInView() == null) { - logger.warn("spring.data.neo4j.open-in-view is enabled by default." - + "Therefore, database queries may be performed during view " - + "rendering. Explicitly configure " - + "spring.data.neo4j.open-in-view to disable this warning"); + @Bean + public WebMvcConfigurer neo4jOpenSessionInViewInterceptorConfigurer( + OpenSessionInViewInterceptor interceptor) { + return new WebMvcConfigurer() { + + @Override + public void addInterceptors(InterceptorRegistry registry) { + registry.addWebRequestInterceptor(interceptor); } - return new OpenSessionInViewInterceptor(); - } - - @Override - public void addInterceptors(InterceptorRegistry registry) { - registry.addWebRequestInterceptor(neo4jOpenSessionInViewInterceptor()); - } + }; } } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfiguration.java index b86be7189d3..758801d2e4a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -48,7 +48,7 @@ import org.springframework.data.neo4j.repository.support.Neo4jRepositoryFactoryB * @since 1.4.0 * @see EnableNeo4jRepositories */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Neo4jSession.class, Neo4jRepository.class }) @ConditionalOnMissingBean({ Neo4jRepositoryFactoryBean.class, Neo4jRepositoryConfigurationExtension.class }) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/JedisConnectionConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/JedisConnectionConfiguration.java index b464d688129..abcf5757ae1 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/JedisConnectionConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/JedisConnectionConfiguration.java @@ -43,7 +43,7 @@ import org.springframework.util.StringUtils; * @author Mark Paluch * @author Stephane Nicoll */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ GenericObjectPool.class, JedisConnection.class, Jedis.class }) class JedisConnectionConfiguration extends RedisConnectionConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceConnectionConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceConnectionConfiguration.java index 05f7761abd3..2114fac3cfd 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceConnectionConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceConnectionConfiguration.java @@ -44,7 +44,7 @@ import org.springframework.util.StringUtils; * @author Mark Paluch * @author Andy Wilkinson */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(RedisClient.class) class LettuceConnectionConfiguration extends RedisConnectionConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfiguration.java index c6c423022d0..d14f76ba502 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -43,7 +43,7 @@ import org.springframework.data.redis.core.StringRedisTemplate; * @author Marco Aust * @author Mark Paluch */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(RedisOperations.class) @EnableConfigurationProperties(RedisProperties.class) @Import({ LettuceConnectionConfiguration.class, JedisConnectionConfiguration.class }) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisReactiveAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisReactiveAutoConfiguration.java index c9f486efe75..080f68ec99c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisReactiveAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisReactiveAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -39,7 +39,7 @@ import org.springframework.data.redis.serializer.RedisSerializationContext; * @author Stephane Nicoll * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ ReactiveRedisConnectionFactory.class, ReactiveRedisTemplate.class, Flux.class }) @AutoConfigureAfter(RedisAutoConfiguration.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisRepositoriesAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisRepositoriesAutoConfiguration.java index 36adc1412d2..50ff252d688 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisRepositoriesAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisRepositoriesAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -37,7 +37,7 @@ import org.springframework.data.redis.repository.support.RedisRepositoryFactoryB * @see EnableRedisRepositories * @since 1.4.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(EnableRedisRepositories.class) @ConditionalOnBean(RedisConnectionFactory.class) @ConditionalOnProperty(prefix = "spring.data.redis.repositories", name = "enabled", havingValue = "true", matchIfMissing = true) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfiguration.java index 495711ae5b6..e241978290f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -46,7 +46,7 @@ import org.springframework.data.rest.webmvc.config.RepositoryRestMvcConfiguratio * @author Andy Wilkinson * @since 1.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.SERVLET) @ConditionalOnMissingBean(RepositoryRestMvcConfiguration.class) @ConditionalOnClass(RepositoryRestMvcConfiguration.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfiguration.java index 4aa30413770..ac3d8a71b18 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -42,7 +42,7 @@ import org.springframework.data.solr.repository.support.SolrRepositoryFactoryBea * @author Oliver Gierke * @since 1.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ SolrClient.class, SolrRepository.class }) @ConditionalOnMissingBean({ SolrRepositoryFactoryBean.class, SolrRepositoryConfigExtension.class }) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/web/SpringDataWebAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/web/SpringDataWebAutoConfiguration.java index 256392b00a3..7af52397ab3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/web/SpringDataWebAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/web/SpringDataWebAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -44,7 +44,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; * @author Vedran Pavic * @since 1.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableSpringDataWebSupport @ConditionalOnWebApplication(type = Type.SERVLET) @ConditionalOnClass({ PageableHandlerMethodArgumentResolver.class, diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestAutoConfiguration.java index 78531af3983..b4d30c1b6bc 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestAutoConfiguration.java @@ -43,7 +43,7 @@ import org.springframework.util.Assert; * @author Stephane Nicoll * @since 1.4.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(JestClient.class) @EnableConfigurationProperties(JestProperties.class) @AutoConfigureAfter(GsonAutoConfiguration.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/rest/RestClientAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/rest/RestClientAutoConfiguration.java index 419cb850fcb..cce567340d7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/rest/RestClientAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/rest/RestClientAutoConfiguration.java @@ -41,7 +41,7 @@ import org.springframework.context.annotation.Configuration; * @author Brian Clozel * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(RestClient.class) @EnableConfigurationProperties(RestClientProperties.class) public class RestClientAutoConfiguration { @@ -73,7 +73,7 @@ public class RestClientAutoConfiguration { return builder; } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(RestHighLevelClient.class) public static class RestHighLevelClientConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java index 4b456eb7701..ae0e8dac9d4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java @@ -80,7 +80,7 @@ import org.springframework.util.StringUtils; * @since 1.1.0 */ @SuppressWarnings("deprecation") -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(Flyway.class) @ConditionalOnBean(DataSource.class) @ConditionalOnProperty(prefix = "spring.flyway", name = "enabled", matchIfMissing = true) @@ -100,7 +100,7 @@ public class FlywayAutoConfiguration { return new FlywaySchemaManagementProvider(flyways); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(Flyway.class) @EnableConfigurationProperties({ DataSourceProperties.class, FlywayProperties.class }) public static class FlywayConfiguration { @@ -274,7 +274,7 @@ public class FlywayAutoConfiguration { * Additional configuration to ensure that {@link EntityManagerFactory} beans * depend on the {@code flywayInitializer} bean. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(LocalContainerEntityManagerFactoryBean.class) @ConditionalOnBean(AbstractEntityManagerFactoryBean.class) protected static class FlywayInitializerJpaDependencyConfiguration @@ -290,7 +290,7 @@ public class FlywayAutoConfiguration { * Additional configuration to ensure that {@link JdbcOperations} beans depend on * the {@code flywayInitializer} bean. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(JdbcOperations.class) @ConditionalOnBean(JdbcOperations.class) protected static class FlywayInitializerJdbcOperationsDependencyConfiguration @@ -307,7 +307,7 @@ public class FlywayAutoConfiguration { * Additional configuration to ensure that {@link NamedParameterJdbcOperations} * beans depend on the {@code flywayInitializer} bean. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(NamedParameterJdbcOperations.class) @ConditionalOnBean(NamedParameterJdbcOperations.class) protected static class FlywayInitializerNamedParameterJdbcOperationsDependencyConfiguration @@ -325,7 +325,7 @@ public class FlywayAutoConfiguration { * Additional configuration to ensure that {@link EntityManagerFactory} beans depend * on the {@code flyway} bean. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(LocalContainerEntityManagerFactoryBean.class) @ConditionalOnBean(AbstractEntityManagerFactoryBean.class) protected static class FlywayJpaDependencyConfiguration @@ -341,7 +341,7 @@ public class FlywayAutoConfiguration { * Additional configuration to ensure that {@link JdbcOperations} beans depend on the * {@code flyway} bean. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(JdbcOperations.class) @ConditionalOnBean(JdbcOperations.class) protected static class FlywayJdbcOperationsDependencyConfiguration @@ -357,7 +357,7 @@ public class FlywayAutoConfiguration { * Additional configuration to ensure that {@link NamedParameterJdbcOperations} beans * depend on the {@code flyway} bean. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(NamedParameterJdbcOperations.class) @ConditionalOnBean(NamedParameterJdbcOperations.class) protected static class FlywayNamedParameterJdbcOperationsDependencyConfiguration diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfiguration.java index 0772418c795..60cad9ca46a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -41,7 +41,7 @@ import org.springframework.ui.freemarker.FreeMarkerConfigurationFactory; * @author Kazuki Shimizu * @since 1.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ freemarker.template.Configuration.class, FreeMarkerConfigurationFactory.class }) @EnableConfigurationProperties(FreeMarkerProperties.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerNonWebConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerNonWebConfiguration.java index 22b1dcebd2e..f373425f67a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerNonWebConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerNonWebConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ import org.springframework.ui.freemarker.FreeMarkerConfigurationFactoryBean; * @author Brian Clozel * @author Andy Wilkinson */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnNotWebApplication class FreeMarkerNonWebConfiguration extends AbstractFreeMarkerConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerReactiveWebConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerReactiveWebConfiguration.java index db51592e074..0026a7e3fa5 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerReactiveWebConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerReactiveWebConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -33,7 +33,7 @@ import org.springframework.web.reactive.result.view.freemarker.FreeMarkerViewRes * @author Brian Clozel * @author Andy Wilkinson */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE) @AutoConfigureAfter(WebFluxAutoConfiguration.class) class FreeMarkerReactiveWebConfiguration extends AbstractFreeMarkerConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerServletWebConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerServletWebConfiguration.java index b025ccb4148..f9e0defa873 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerServletWebConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerServletWebConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -41,7 +41,7 @@ import org.springframework.web.servlet.view.freemarker.FreeMarkerViewResolver; * @author Brian Clozel * @author Andy Wilkinson */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) @ConditionalOnClass({ Servlet.class, FreeMarkerConfigurer.class }) @AutoConfigureAfter(WebMvcAutoConfiguration.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAutoConfiguration.java index 58d798fa48a..18be078a888 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAutoConfiguration.java @@ -57,7 +57,7 @@ import org.springframework.web.servlet.view.groovy.GroovyMarkupViewResolver; * @author Brian Clozel * @since 1.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(MarkupTemplateEngine.class) @AutoConfigureAfter(WebMvcAutoConfiguration.class) @EnableConfigurationProperties(GroovyTemplateProperties.class) @@ -66,7 +66,7 @@ public class GroovyTemplateAutoConfiguration { private static final Log logger = LogFactory .getLog(GroovyTemplateAutoConfiguration.class); - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(GroovyMarkupConfigurer.class) public static class GroovyMarkupConfiguration { @@ -132,7 +132,7 @@ public class GroovyTemplateAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Servlet.class, LocaleContextHolder.class, UrlBasedViewResolver.class }) @ConditionalOnWebApplication(type = Type.SERVLET) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/gson/GsonAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/gson/GsonAutoConfiguration.java index 3de566bccd1..1b32bec7aa5 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/gson/GsonAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/gson/GsonAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -37,7 +37,7 @@ import org.springframework.core.Ordered; * @author Ivan Golovko * @since 1.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(Gson.class) @EnableConfigurationProperties(GsonProperties.class) public class GsonAutoConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfiguration.java index 3c5e7eba9a1..dc236556fc5 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfiguration.java @@ -36,7 +36,7 @@ import org.springframework.context.annotation.Configuration; * @author Stephane Nicoll * @since 1.3.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.SERVLET) @ConditionalOnClass(WebServlet.class) @ConditionalOnProperty(prefix = "spring.h2.console", name = "enabled", havingValue = "true", matchIfMissing = false) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfiguration.java index 7d2cddc2c08..7940e471676 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfiguration.java @@ -48,7 +48,7 @@ import org.springframework.web.bind.annotation.RequestMapping; * @author Andy Wilkinson * @since 1.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ EntityModel.class, RequestMapping.class, Plugin.class }) @ConditionalOnWebApplication @AutoConfigureAfter({ WebMvcAutoConfiguration.class, JacksonAutoConfiguration.class, @@ -58,7 +58,7 @@ import org.springframework.web.bind.annotation.RequestMapping; @Import(HypermediaHttpMessageConverterConfiguration.class) public class HypermediaAutoConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(LinkDiscoverers.class) @ConditionalOnClass(ObjectMapper.class) @EnableHypermediaSupport(type = HypermediaType.HAL) @@ -66,7 +66,7 @@ public class HypermediaAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(EntityLinks.class) @EnableEntityLinks protected static class EntityLinksConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaHttpMessageConverterConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaHttpMessageConverterConfiguration.java index 6172d079fb6..6bbb16ec0a7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaHttpMessageConverterConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaHttpMessageConverterConfiguration.java @@ -42,7 +42,7 @@ import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandl * * @author Andy Wilkinson */ -@Configuration +@Configuration(proxyBeanMethods = false) public class HypermediaHttpMessageConverterConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfiguration.java index 91a146db178..7f54f57894d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Import; * @since 1.3.0 * @see HazelcastConfigResourceCondition */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(HazelcastInstance.class) @EnableConfigurationProperties(HazelcastProperties.class) @Import({ HazelcastClientConfiguration.class, HazelcastServerConfiguration.class }) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastClientConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastClientConfiguration.java index 2651ff1ae4b..37822005a12 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastClientConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastClientConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -36,14 +36,14 @@ import org.springframework.core.io.Resource; * @author Vedran Pavic * @author Stephane Nicoll */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(HazelcastClient.class) @ConditionalOnMissingBean(HazelcastInstance.class) class HazelcastClientConfiguration { static final String CONFIG_SYSTEM_PROPERTY = "hazelcast.client.config"; - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(ClientConfig.class) @Conditional(ConfigAvailableCondition.class) static class HazelcastClientConfigFileConfiguration { @@ -60,7 +60,7 @@ class HazelcastClientConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnSingleCandidate(ClientConfig.class) static class HazelcastClientConfigConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastJpaDependencyAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastJpaDependencyAutoConfiguration.java index d5c1a8594bf..a887db38382 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastJpaDependencyAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastJpaDependencyAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -39,7 +39,7 @@ import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; * @author Stephane Nicoll * @since 1.3.2 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ HazelcastInstance.class, LocalContainerEntityManagerFactoryBean.class }) @AutoConfigureAfter({ HazelcastAutoConfiguration.class, diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastServerConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastServerConfiguration.java index f705e869342..69289a34981 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastServerConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastServerConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -35,13 +35,13 @@ import org.springframework.core.io.Resource; * @author Stephane Nicoll * @author Vedran Pavic */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(HazelcastInstance.class) class HazelcastServerConfiguration { static final String CONFIG_SYSTEM_PROPERTY = "hazelcast.config"; - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(Config.class) @Conditional(ConfigAvailableCondition.class) static class HazelcastServerConfigFileConfiguration { @@ -58,7 +58,7 @@ class HazelcastServerConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnSingleCandidate(Config.class) static class HazelcastServerConfigConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/GsonHttpMessageConvertersConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/GsonHttpMessageConvertersConfiguration.java index e594187c8cd..1a5ee0ce660 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/GsonHttpMessageConvertersConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/GsonHttpMessageConvertersConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -37,11 +37,11 @@ import org.springframework.http.converter.json.MappingJackson2HttpMessageConvert * @author Eddú Meléndez * @since 1.2.2 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(Gson.class) class GsonHttpMessageConvertersConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnBean(Gson.class) @Conditional(PreferGsonOrJacksonAndJsonbUnavailableCondition.class) protected static class GsonHttpMessageConverterConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersAutoConfiguration.java index 92cb822e7ae..4d8dc355349 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersAutoConfiguration.java @@ -51,7 +51,7 @@ import org.springframework.http.converter.StringHttpMessageConverter; * @author Stephane Nicoll * @author Eddú Meléndez */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(HttpMessageConverter.class) @Conditional(NotReactiveWebApplicationCondition.class) @AutoConfigureAfter({ GsonAutoConfiguration.class, JacksonAutoConfiguration.class, @@ -71,7 +71,7 @@ public class HttpMessageConvertersAutoConfiguration { converters.orderedStream().collect(Collectors.toList())); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(StringHttpMessageConverter.class) @EnableConfigurationProperties(HttpProperties.class) protected static class StringHttpMessageConverterConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/JacksonHttpMessageConvertersConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/JacksonHttpMessageConvertersConfiguration.java index 0d0f0b8cfd1..0e8511f58ba 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/JacksonHttpMessageConvertersConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/JacksonHttpMessageConvertersConfiguration.java @@ -35,10 +35,10 @@ import org.springframework.http.converter.xml.MappingJackson2XmlHttpMessageConve * @author Andy Wilkinson * @since 1.2.2 */ -@Configuration +@Configuration(proxyBeanMethods = false) class JacksonHttpMessageConvertersConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(ObjectMapper.class) @ConditionalOnBean(ObjectMapper.class) @ConditionalOnProperty(name = HttpMessageConvertersAutoConfiguration.PREFERRED_MAPPER_PROPERTY, havingValue = "jackson", matchIfMissing = true) @@ -55,7 +55,7 @@ class JacksonHttpMessageConvertersConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(XmlMapper.class) @ConditionalOnBean(Jackson2ObjectMapperBuilder.class) protected static class MappingJackson2XmlHttpMessageConverterConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/JsonbHttpMessageConvertersConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/JsonbHttpMessageConvertersConfiguration.java index 78532bb572b..0e30a4e3ad8 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/JsonbHttpMessageConvertersConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/JsonbHttpMessageConvertersConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -36,11 +36,11 @@ import org.springframework.http.converter.json.MappingJackson2HttpMessageConvert * @author Eddú Meléndez * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(Jsonb.class) class JsonbHttpMessageConvertersConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnBean(Jsonb.class) @Conditional(PreferJsonbOrMissingJacksonAndGsonCondition.class) protected static class JsonbHttpMessageConverterConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/codec/CodecsAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/codec/CodecsAutoConfiguration.java index bacc5cef1e7..fca911beda4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/codec/CodecsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/codec/CodecsAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -42,14 +42,14 @@ import org.springframework.util.MimeType; * @author Brian Clozel * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(CodecConfigurer.class) @AutoConfigureAfter(JacksonAutoConfiguration.class) public class CodecsAutoConfiguration { private static final MimeType[] EMPTY_MIME_TYPES = {}; - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(ObjectMapper.class) static class JacksonCodecConfiguration { @@ -68,7 +68,7 @@ public class CodecsAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(HttpProperties.class) static class LoggingCodecConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/influx/InfluxDbAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/influx/InfluxDbAutoConfiguration.java index e4aeb5909d5..8805d32e416 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/influx/InfluxDbAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/influx/InfluxDbAutoConfiguration.java @@ -37,7 +37,7 @@ import org.springframework.context.annotation.Configuration; * @author Eddú Meléndez * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(InfluxDB.class) @EnableConfigurationProperties(InfluxDbProperties.class) public class InfluxDbAutoConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfiguration.java index aaab2f084cc..28e9e41a506 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -48,7 +48,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; * @author Madhura Bhave * @since 1.4.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(ProjectInfoProperties.class) public class ProjectInfoAutoConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java index 6ae8da6ff13..ed074ba15e5 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java @@ -55,7 +55,7 @@ import org.springframework.util.StringUtils; * @author Madhura Bhave * @since 1.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(EnableIntegration.class) @EnableConfigurationProperties(IntegrationProperties.class) @AutoConfigureAfter({ DataSourceAutoConfiguration.class, JmxAutoConfiguration.class }) @@ -64,7 +64,7 @@ public class IntegrationAutoConfiguration { /** * Basic Spring Integration configuration. */ - @Configuration + @Configuration(proxyBeanMethods = false) @EnableIntegration protected static class IntegrationConfiguration { @@ -73,7 +73,7 @@ public class IntegrationAutoConfiguration { /** * Spring Integration JMX configuration. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(EnableIntegrationMBeanExport.class) @ConditionalOnMissingBean(value = IntegrationMBeanExporter.class, search = SearchStrategy.CURRENT) @ConditionalOnBean(MBeanServer.class) @@ -99,12 +99,12 @@ public class IntegrationAutoConfiguration { /** * Integration management configuration. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(EnableIntegrationManagement.class) @ConditionalOnMissingBean(value = IntegrationManagementConfigurer.class, name = IntegrationManagementConfigurer.MANAGEMENT_CONFIGURER_NAME, search = SearchStrategy.CURRENT) protected static class IntegrationManagementConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @EnableIntegrationManagement(defaultCountsEnabled = "true") protected static class EnableIntegrationManagementConfiguration { @@ -115,7 +115,7 @@ public class IntegrationAutoConfiguration { /** * Integration component scan configuration. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(GatewayProxyFactoryBean.class) @Import(IntegrationAutoConfigurationScanRegistrar.class) protected static class IntegrationComponentScanConfiguration { @@ -125,7 +125,7 @@ public class IntegrationAutoConfiguration { /** * Integration JDBC configuration. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(JdbcMessageStore.class) @ConditionalOnSingleCandidate(DataSource.class) protected static class IntegrationJdbcConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java index 709921d67f0..349ce70dbed 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java @@ -78,7 +78,7 @@ import org.springframework.util.ReflectionUtils; * @author Eddú Meléndez * @since 1.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(ObjectMapper.class) public class JacksonAutoConfiguration { @@ -95,7 +95,7 @@ public class JacksonAutoConfiguration { return new JsonComponentModule(); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(Jackson2ObjectMapperBuilder.class) static class JacksonObjectMapperConfiguration { @@ -108,7 +108,7 @@ public class JacksonAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Jackson2ObjectMapperBuilder.class, DateTime.class, DateTimeSerializer.class, JacksonJodaDateFormat.class }) static class JodaDateTimeJacksonConfiguration { @@ -155,7 +155,7 @@ public class JacksonAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(ParameterNamesModule.class) static class ParameterNamesModuleConfiguration { @@ -167,7 +167,7 @@ public class JacksonAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(Jackson2ObjectMapperBuilder.class) static class JacksonObjectMapperBuilderConfiguration { @@ -191,7 +191,7 @@ public class JacksonAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(Jackson2ObjectMapperBuilder.class) @EnableConfigurationProperties(JacksonProperties.class) static class Jackson2ObjectMapperBuilderCustomizerConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java index 4c4e8d2c940..a584347759f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -47,14 +47,14 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; * @author Stephane Nicoll * @author Kazuki Shimizu */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ DataSource.class, EmbeddedDatabaseType.class }) @EnableConfigurationProperties(DataSourceProperties.class) @Import({ DataSourcePoolMetadataProvidersConfiguration.class, DataSourceInitializationConfiguration.class }) public class DataSourceAutoConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @Conditional(EmbeddedDatabaseCondition.class) @ConditionalOnMissingBean({ DataSource.class, XADataSource.class }) @Import(EmbeddedDataSourceConfiguration.class) @@ -62,7 +62,7 @@ public class DataSourceAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @Conditional(PooledDataSourceCondition.class) @ConditionalOnMissingBean({ DataSource.class, XADataSource.class }) @Import({ DataSourceConfiguration.Hikari.class, DataSourceConfiguration.Tomcat.class, diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java index 63d25d933cd..5ae2de9e56e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java @@ -47,7 +47,7 @@ abstract class DataSourceConfiguration { /** * Tomcat Pool DataSource configuration. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(org.apache.tomcat.jdbc.pool.DataSource.class) @ConditionalOnMissingBean(DataSource.class) @ConditionalOnProperty(name = "spring.datasource.type", havingValue = "org.apache.tomcat.jdbc.pool.DataSource", matchIfMissing = true) @@ -74,7 +74,7 @@ abstract class DataSourceConfiguration { /** * Hikari DataSource configuration. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(HikariDataSource.class) @ConditionalOnMissingBean(DataSource.class) @ConditionalOnProperty(name = "spring.datasource.type", havingValue = "com.zaxxer.hikari.HikariDataSource", matchIfMissing = true) @@ -96,7 +96,7 @@ abstract class DataSourceConfiguration { /** * DBCP DataSource configuration. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(org.apache.commons.dbcp2.BasicDataSource.class) @ConditionalOnMissingBean(DataSource.class) @ConditionalOnProperty(name = "spring.datasource.type", havingValue = "org.apache.commons.dbcp2.BasicDataSource", matchIfMissing = true) @@ -115,7 +115,7 @@ abstract class DataSourceConfiguration { /** * Generic DataSource configuration. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(DataSource.class) @ConditionalOnProperty(name = "spring.datasource.type") static class Generic { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializationConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializationConfiguration.java index e7f1854c86d..41cc64a54b8 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializationConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializationConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -29,7 +29,7 @@ import org.springframework.core.type.AnnotationMetadata; * * @author Stephane Nicoll */ -@Configuration +@Configuration(proxyBeanMethods = false) @Import({ DataSourceInitializerInvoker.class, DataSourceInitializationConfiguration.Registrar.class }) class DataSourceInitializationConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfiguration.java index b4986389dd4..2a4d565fcab 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfiguration.java @@ -41,13 +41,13 @@ import org.springframework.jmx.export.MBeanExporter; * * @author Stephane Nicoll */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty(prefix = "spring.jmx", name = "enabled", havingValue = "true", matchIfMissing = true) class DataSourceJmxConfiguration { private static final Log logger = LogFactory.getLog(DataSourceJmxConfiguration.class); - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(HikariDataSource.class) @ConditionalOnSingleCandidate(DataSource.class) static class Hikari { @@ -73,7 +73,7 @@ class DataSourceJmxConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(prefix = "spring.datasource", name = "jmx-enabled") @ConditionalOnClass(DataSourceProxy.class) @ConditionalOnSingleCandidate(DataSource.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java index 7deb2f2ba7f..58e98a3b192 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java @@ -42,13 +42,13 @@ import org.springframework.transaction.PlatformTransactionManager; * @author Andy Wilkinson * @author Kazuki Shimizu */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ JdbcTemplate.class, PlatformTransactionManager.class }) @AutoConfigureOrder(Ordered.LOWEST_PRECEDENCE) @EnableConfigurationProperties(DataSourceProperties.class) public class DataSourceTransactionManagerAutoConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnSingleCandidate(DataSource.class) static class DataSourceTransactionManagerConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/EmbeddedDataSourceConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/EmbeddedDataSourceConfiguration.java index e86cb984497..ce067af6583 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/EmbeddedDataSourceConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/EmbeddedDataSourceConfiguration.java @@ -31,7 +31,7 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; * @author Stephane Nicoll * @see DataSourceAutoConfiguration */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(DataSourceProperties.class) public class EmbeddedDataSourceConfiguration implements BeanClassLoaderAware { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/JdbcTemplateAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/JdbcTemplateAutoConfiguration.java index 9e77c1dfdb0..c05ebb83236 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/JdbcTemplateAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/JdbcTemplateAutoConfiguration.java @@ -43,14 +43,14 @@ import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; * @author Kazuki Shimizu * @since 1.4.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ DataSource.class, JdbcTemplate.class }) @ConditionalOnSingleCandidate(DataSource.class) @AutoConfigureAfter(DataSourceAutoConfiguration.class) @EnableConfigurationProperties(JdbcProperties.class) public class JdbcTemplateAutoConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) static class JdbcTemplateConfiguration { @Bean @@ -71,7 +71,7 @@ public class JdbcTemplateAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(JdbcTemplateConfiguration.class) static class NamedParameterJdbcTemplateConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/JndiDataSourceAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/JndiDataSourceAutoConfiguration.java index f55f19c6d8f..980c28afa45 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/JndiDataSourceAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/JndiDataSourceAutoConfiguration.java @@ -40,7 +40,7 @@ import org.springframework.jmx.support.JmxUtils; * @author Andy Wilkinson * @since 1.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureBefore({ XADataSourceAutoConfiguration.class, DataSourceAutoConfiguration.class }) @ConditionalOnClass({ DataSource.class, EmbeddedDatabaseType.class }) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/XADataSourceAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/XADataSourceAutoConfiguration.java index afe3a9eeb18..609931a24c9 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/XADataSourceAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/XADataSourceAutoConfiguration.java @@ -52,7 +52,7 @@ import org.springframework.util.StringUtils; * @author Madhura Bhave * @since 1.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureBefore(DataSourceAutoConfiguration.class) @EnableConfigurationProperties(DataSourceProperties.class) @ConditionalOnClass({ DataSource.class, TransactionManager.class, diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/metadata/DataSourcePoolMetadataProvidersConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/metadata/DataSourcePoolMetadataProvidersConfiguration.java index 2ccf48de95f..cae26e34f4b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/metadata/DataSourcePoolMetadataProvidersConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/metadata/DataSourcePoolMetadataProvidersConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -35,10 +35,10 @@ import org.springframework.context.annotation.Configuration; * @author Stephane Nicoll * @since 1.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) public class DataSourcePoolMetadataProvidersConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(org.apache.tomcat.jdbc.pool.DataSource.class) static class TomcatDataSourcePoolMetadataProviderConfiguration { @@ -56,7 +56,7 @@ public class DataSourcePoolMetadataProvidersConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(HikariDataSource.class) static class HikariPoolDataSourceMetadataProviderConfiguration { @@ -74,7 +74,7 @@ public class DataSourcePoolMetadataProvidersConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(BasicDataSource.class) static class CommonsDbcp2PoolDataSourceMetadataProviderConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java index b59c2d2d8ea..04d5cd50c48 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java @@ -76,7 +76,7 @@ import org.springframework.web.filter.RequestContextFilter; * @author Eddú Meléndez * @author Stephane Nicoll */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ SpringComponentProvider.class, ServletRegistration.class }) @ConditionalOnBean(type = "org.glassfish.jersey.server.ResourceConfig") @ConditionalOnWebApplication(type = Type.SERVLET) @@ -203,7 +203,7 @@ public class JerseyAutoConfiguration implements ServletContextAware { @ConditionalOnClass(JacksonFeature.class) @ConditionalOnSingleCandidate(ObjectMapper.class) - @Configuration + @Configuration(proxyBeanMethods = false) static class JacksonResourceConfigCustomizer { private static final String JAXB_ANNOTATION_INTROSPECTOR_CLASS_NAME = "com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector"; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java index cd6fe22a89d..5fd1d58d0e7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -40,7 +40,7 @@ import org.springframework.transaction.jta.JtaTransactionManager; * @author Stephane Nicoll * @since 1.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(EnableJms.class) class JmsAnnotationDrivenConfiguration { @@ -84,14 +84,14 @@ class JmsAnnotationDrivenConfiguration { return factory; } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableJms @ConditionalOnMissingBean(name = JmsListenerConfigUtils.JMS_LISTENER_ANNOTATION_PROCESSOR_BEAN_NAME) protected static class EnableJmsConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnJndi protected static class JndiConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfiguration.java index 7d3caac78b7..56930bae328 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -45,14 +45,14 @@ import org.springframework.jms.support.destination.DestinationResolver; * @author Greg Turnquist * @author Stephane Nicoll */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Message.class, JmsTemplate.class }) @ConditionalOnBean(ConnectionFactory.class) @EnableConfigurationProperties(JmsProperties.class) @Import(JmsAnnotationDrivenConfiguration.class) public class JmsAutoConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) protected static class JmsTemplateConfiguration { private final JmsProperties properties; @@ -102,7 +102,7 @@ public class JmsAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(JmsMessagingTemplate.class) @Import(JmsTemplateConfiguration.class) protected static class MessagingTemplateConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JndiConnectionFactoryAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JndiConnectionFactoryAutoConfiguration.java index 3cfae64adac..52b48447eba 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JndiConnectionFactoryAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JndiConnectionFactoryAutoConfiguration.java @@ -43,7 +43,7 @@ import org.springframework.util.StringUtils; * @author Phillip Webb * @since 1.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureBefore(JmsAutoConfiguration.class) @ConditionalOnClass(JmsTemplate.class) @ConditionalOnMissingBean(ConnectionFactory.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfiguration.java index ed1140c83c7..a8ca2ba354e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -41,7 +41,7 @@ import org.springframework.context.annotation.Import; * @author Phillip Webb * @since 1.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureBefore(JmsAutoConfiguration.class) @AutoConfigureAfter({ JndiConnectionFactoryAutoConfiguration.class }) @ConditionalOnClass({ ConnectionFactory.class, ActiveMQConnectionFactory.class }) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java index 09221f82331..d877d1b6367 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java @@ -45,11 +45,11 @@ import org.springframework.jms.connection.CachingConnectionFactory; * @author Aurélien Leboulanger * @since 1.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(ConnectionFactory.class) class ActiveMQConnectionFactoryConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(CachingConnectionFactory.class) @ConditionalOnProperty(prefix = "spring.activemq.pool", name = "enabled", havingValue = "false", matchIfMissing = true) static class SimpleConnectionFactoryConfiguration { @@ -92,7 +92,7 @@ class ActiveMQConnectionFactoryConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ JmsPoolConnectionFactory.class, PooledObject.class }) static class PooledConnectionFactoryConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQXAConnectionFactoryConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQXAConnectionFactoryConfiguration.java index dcb9aa62fe5..c86b5cf0874 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQXAConnectionFactoryConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQXAConnectionFactoryConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -41,7 +41,7 @@ import org.springframework.context.annotation.Primary; * @author Aurélien Leboulanger * @since 1.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(TransactionManager.class) @ConditionalOnBean(XAConnectionFactoryWrapper.class) @ConditionalOnMissingBean(ConnectionFactory.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfiguration.java index 3f312f8e555..f5394821c75 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -43,7 +43,7 @@ import org.springframework.context.annotation.Import; * @since 1.3.0 * @see ArtemisProperties */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureBefore(JmsAutoConfiguration.class) @AutoConfigureAfter({ JndiConnectionFactoryAutoConfiguration.class }) @ConditionalOnClass({ ConnectionFactory.class, ActiveMQConnectionFactory.class }) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisConnectionFactoryConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisConnectionFactoryConfiguration.java index 6fff9c77453..3639600dc7f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisConnectionFactoryConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisConnectionFactoryConfiguration.java @@ -39,11 +39,11 @@ import org.springframework.jms.connection.CachingConnectionFactory; * @author Phillip Webb * @author Stephane Nicoll */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(ConnectionFactory.class) class ArtemisConnectionFactoryConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(CachingConnectionFactory.class) @ConditionalOnProperty(prefix = "spring.artemis.pool", name = "enabled", havingValue = "false", matchIfMissing = true) static class SimpleConnectionFactoryConfiguration { @@ -84,7 +84,7 @@ class ArtemisConnectionFactoryConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ JmsPoolConnectionFactory.class, PooledObject.class }) static class PooledConnectionFactoryConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisEmbeddedServerConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisEmbeddedServerConfiguration.java index a2c263a7261..946bf3a5983 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisEmbeddedServerConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisEmbeddedServerConfiguration.java @@ -41,7 +41,7 @@ import org.springframework.context.annotation.Configuration; * @author Phillip Webb * @author Stephane Nicoll */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(EmbeddedJMS.class) @ConditionalOnProperty(prefix = "spring.artemis.embedded", name = "enabled", havingValue = "true", matchIfMissing = true) class ArtemisEmbeddedServerConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisXAConnectionFactoryConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisXAConnectionFactoryConfiguration.java index 4705fa65c93..3a6efc1a608 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisXAConnectionFactoryConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisXAConnectionFactoryConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -37,7 +37,7 @@ import org.springframework.context.annotation.Primary; * @author Phillip Webb * @since 1.3.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(ConnectionFactory.class) @ConditionalOnClass(TransactionManager.class) @ConditionalOnBean(XAConnectionFactoryWrapper.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfiguration.java index 1de92f0bc30..db092f0e1e3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfiguration.java @@ -48,7 +48,7 @@ import org.springframework.util.StringUtils; * @author Madhura Bhave * @author Artsiom Yudovin */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ MBeanExporter.class }) @ConditionalOnProperty(prefix = "spring.jmx", name = "enabled", havingValue = "true") public class JmxAutoConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/JooqAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/JooqAutoConfiguration.java index c044ddf73d2..2e00944fec8 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/JooqAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/JooqAutoConfiguration.java @@ -57,7 +57,7 @@ import org.springframework.transaction.PlatformTransactionManager; * @author Dmytro Nosan * @since 1.3.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(DSLContext.class) @ConditionalOnBean(DataSource.class) @AutoConfigureAfter({ DataSourceAutoConfiguration.class, @@ -85,7 +85,7 @@ public class JooqAutoConfiguration { return new DefaultExecuteListenerProvider(new JooqExceptionTranslator()); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(DSLContext.class) @EnableConfigurationProperties(JooqProperties.class) public static class DslContextConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jsonb/JsonbAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jsonb/JsonbAutoConfiguration.java index 0f3c08c4697..0302170a454 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jsonb/JsonbAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jsonb/JsonbAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ import org.springframework.context.annotation.Configuration; * @author Eddú Meléndez * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(Jsonb.class) @ConditionalOnResource(resources = { "classpath:META-INF/services/javax.json.bind.spi.JsonbProvider", diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAnnotationDrivenConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAnnotationDrivenConfiguration.java index 00fb5366433..665de28a54c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAnnotationDrivenConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAnnotationDrivenConfiguration.java @@ -42,7 +42,7 @@ import org.springframework.kafka.transaction.KafkaAwareTransactionManager; * @author Eddú Meléndez * @since 1.5.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(EnableKafka.class) class KafkaAnnotationDrivenConfiguration { @@ -102,7 +102,7 @@ class KafkaAnnotationDrivenConfiguration { return factory; } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableKafka @ConditionalOnMissingBean(name = KafkaListenerConfigUtils.KAFKA_LISTENER_ANNOTATION_PROCESSOR_BEAN_NAME) protected static class EnableKafkaConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfiguration.java index 4ba2a32df03..3b383ade624 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfiguration.java @@ -49,7 +49,7 @@ import org.springframework.kafka.transaction.KafkaTransactionManager; * @author Nakul Mishra * @since 1.5.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(KafkaTemplate.class) @EnableConfigurationProperties(KafkaProperties.class) @Import({ KafkaAnnotationDrivenConfiguration.class, diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaStreamsAnnotationDrivenConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaStreamsAnnotationDrivenConfiguration.java index 8639b10b6d7..86aafec3fd4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaStreamsAnnotationDrivenConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaStreamsAnnotationDrivenConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -39,7 +39,7 @@ import org.springframework.kafka.config.StreamsBuilderFactoryBean; * @author Gary Russell * @author Stephane Nicoll */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(StreamsBuilder.class) @ConditionalOnBean(name = KafkaStreamsDefaultConfiguration.DEFAULT_STREAMS_BUILDER_BEAN_NAME) class KafkaStreamsAnnotationDrivenConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfiguration.java index 57b930837ce..9348575b3ac 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfiguration.java @@ -37,7 +37,7 @@ import org.springframework.ldap.core.support.LdapContextSource; * @author Vedran Pavic * @since 1.5.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(ContextSource.class) @EnableConfigurationProperties(LdapProperties.class) public class LdapAutoConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfiguration.java index 61a3bd06be0..a92bedde7c3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfiguration.java @@ -69,7 +69,7 @@ import org.springframework.util.StringUtils; * @author Raja Kolli * @since 1.5.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties({ LdapProperties.class, EmbeddedLdapProperties.class }) @AutoConfigureBefore(LdapAutoConfiguration.class) @ConditionalOnClass(InMemoryDirectoryServer.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java index 4e6a1354ef2..893cf678b32 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java @@ -63,7 +63,7 @@ import org.springframework.util.Assert; * @author Dan Zheng * @since 1.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ SpringLiquibase.class, DatabaseChange.class }) @ConditionalOnBean(DataSource.class) @ConditionalOnProperty(prefix = "spring.liquibase", name = "enabled", matchIfMissing = true) @@ -77,7 +77,7 @@ public class LiquibaseAutoConfiguration { return new LiquibaseSchemaManagementProvider(liquibases); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(SpringLiquibase.class) @EnableConfigurationProperties({ DataSourceProperties.class, LiquibaseProperties.class }) @@ -180,7 +180,7 @@ public class LiquibaseAutoConfiguration { * Additional configuration to ensure that {@link EntityManagerFactory} beans depend * on the liquibase bean. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(LocalContainerEntityManagerFactoryBean.class) @ConditionalOnBean(AbstractEntityManagerFactoryBean.class) protected static class LiquibaseJpaDependencyConfiguration @@ -196,7 +196,7 @@ public class LiquibaseAutoConfiguration { * Additional configuration to ensure that {@link JdbcOperations} beans depend on the * liquibase bean. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(JdbcOperations.class) @ConditionalOnBean(JdbcOperations.class) protected static class LiquibaseJdbcOperationsDependencyConfiguration @@ -212,7 +212,7 @@ public class LiquibaseAutoConfiguration { * Additional configuration to ensure that {@link NamedParameterJdbcOperations} beans * depend on the liquibase bean. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(NamedParameterJdbcOperations.class) @ConditionalOnBean(NamedParameterJdbcOperations.class) protected static class LiquibaseNamedParameterJdbcOperationsDependencyConfiguration diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfiguration.java index aca28f72e23..e18f4cb2958 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -39,7 +39,7 @@ import org.springframework.mail.MailSender; * @author Eddú Meléndez * @since 1.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ MimeMessage.class, MimeType.class, MailSender.class }) @ConditionalOnMissingBean(MailSender.class) @Conditional(MailSenderCondition.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderJndiConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderJndiConfiguration.java index 052f222936c..85cea7e2b9b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderJndiConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderJndiConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -35,7 +35,7 @@ import org.springframework.mail.javamail.JavaMailSenderImpl; * @author Eddú Meléndez * @author Stephane Nicoll */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(Session.class) @ConditionalOnProperty(prefix = "spring.mail", name = "jndi-name") @ConditionalOnJndi diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderPropertiesConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderPropertiesConfiguration.java index c2ebbf7212b..f1d35351596 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderPropertiesConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderPropertiesConfiguration.java @@ -33,7 +33,7 @@ import org.springframework.mail.javamail.JavaMailSenderImpl; * @author Eddú Meléndez * @author Stephane Nicoll */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty(prefix = "spring.mail", name = "host") class MailSenderPropertiesConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderValidatorAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderValidatorAutoConfiguration.java index 8dd3604410b..8e92747266b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderValidatorAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderValidatorAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -34,7 +34,7 @@ import org.springframework.mail.javamail.JavaMailSenderImpl; * @author Stephane Nicoll * @since 1.3.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureAfter(MailSenderAutoConfiguration.class) @ConditionalOnProperty(prefix = "spring.mail", value = "test-connection") @ConditionalOnSingleCandidate(JavaMailSenderImpl.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfiguration.java index 1a015dc688e..9612f72dfda 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfiguration.java @@ -37,7 +37,7 @@ import org.springframework.core.env.Environment; * @author Mark Paluch * @author Stephane Nicoll */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(MongoClient.class) @EnableConfigurationProperties(MongoProperties.class) @ConditionalOnMissingBean(type = "org.springframework.data.mongodb.MongoDbFactory") diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfiguration.java index 47a69775ac6..08335be798e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfiguration.java @@ -42,7 +42,7 @@ import org.springframework.core.env.Environment; * @author Stephane Nicoll * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ MongoClient.class, Flux.class }) @EnableConfigurationProperties(MongoProperties.class) public class MongoReactiveAutoConfiguration { @@ -59,7 +59,7 @@ public class MongoReactiveAutoConfiguration { return factory.createMongoClient(settings.getIfAvailable()); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(SocketChannel.class) static class NettyDriverConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java index 4e2a4ec7fa4..67d46adac3d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java @@ -79,7 +79,7 @@ import org.springframework.data.mongodb.core.ReactiveMongoClientFactoryBean; * @author Mark Paluch * @since 1.3.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties({ MongoProperties.class, EmbeddedMongoProperties.class }) @AutoConfigureBefore(MongoAutoConfiguration.class) @ConditionalOnClass({ MongoClient.class, MongodStarter.class }) @@ -190,7 +190,7 @@ public class EmbeddedMongoAutoConfiguration { return (Map) propertySource.getSource(); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(Logger.class) @ConditionalOnMissingBean(IRuntimeConfig.class) static class RuntimeConfigConfiguration { @@ -229,7 +229,7 @@ public class EmbeddedMongoAutoConfiguration { * Additional configuration to ensure that {@link MongoClient} beans depend on the * {@code embeddedMongoServer} bean. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ MongoClient.class, MongoClientFactoryBean.class }) protected static class EmbeddedMongoDependencyConfiguration extends MongoClientDependsOnBeanFactoryPostProcessor { @@ -244,7 +244,7 @@ public class EmbeddedMongoAutoConfiguration { * Additional configuration to ensure that {@link MongoClient} beans depend on the * {@code embeddedMongoServer} bean. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ com.mongodb.reactivestreams.client.MongoClient.class, ReactiveMongoClientFactoryBean.class }) protected static class EmbeddedReactiveMongoDependencyConfiguration diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfiguration.java index f386374df93..28d9dcc142c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfiguration.java @@ -42,7 +42,7 @@ import org.springframework.core.env.Environment; * @author Brian Clozel * @since 1.2.2 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(Mustache.class) @EnableConfigurationProperties(MustacheProperties.class) @Import({ MustacheServletWebConfiguration.class, MustacheReactiveWebConfiguration.class }) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheReactiveWebConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheReactiveWebConfiguration.java index 70253df6bd3..3d91f163694 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheReactiveWebConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheReactiveWebConfiguration.java @@ -26,7 +26,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.REACTIVE) class MustacheReactiveWebConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheServletWebConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheServletWebConfiguration.java index 774d4dd5e43..1bf9933d4fd 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheServletWebConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheServletWebConfiguration.java @@ -26,7 +26,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.SERVLET) class MustacheServletWebConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java index cec1e7a70d3..75fa7bb1d4d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -48,7 +48,7 @@ import org.springframework.util.ClassUtils; * @author Manuel Doninger * @author Andy Wilkinson */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ LocalContainerEntityManagerFactoryBean.class, EntityManager.class }) @Conditional(HibernateEntityManagerCondition.class) @EnableConfigurationProperties(JpaProperties.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaConfiguration.java index dc9d8f038cb..589d7360de9 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaConfiguration.java @@ -60,7 +60,7 @@ import org.springframework.util.ClassUtils; * @author Stephane Nicoll * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(HibernateProperties.class) @ConditionalOnSingleCandidate(DataSource.class) class HibernateJpaConfiguration extends JpaBaseConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java index e108adf6ace..5dd746d8fbf 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java @@ -70,7 +70,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; * @author Kazuki Shimizu * @author Eddú Meléndez */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(JpaProperties.class) @Import(DataSourceInitializedPublisher.Registrar.class) public abstract class JpaBaseConfiguration implements BeanFactoryAware { @@ -202,7 +202,7 @@ public abstract class JpaBaseConfiguration implements BeanFactoryAware { this.beanFactory = (ConfigurableListableBeanFactory) beanFactory; } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.SERVLET) @ConditionalOnClass(WebMvcConfigurer.class) @ConditionalOnMissingBean({ OpenEntityManagerInViewInterceptor.class, @@ -211,36 +211,36 @@ public abstract class JpaBaseConfiguration implements BeanFactoryAware { @ConditionalOnProperty(prefix = "spring.jpa", name = "open-in-view", havingValue = "true", matchIfMissing = true) protected static class JpaWebConfiguration { - // Defined as a nested config to ensure WebMvcConfigurerAdapter is not read when - // not on the classpath - @Configuration - protected static class JpaWebMvcConfiguration implements WebMvcConfigurer { + private static final Log logger = LogFactory.getLog(JpaWebConfiguration.class); - private static final Log logger = LogFactory - .getLog(JpaWebMvcConfiguration.class); + private final JpaProperties jpaProperties; - private final JpaProperties jpaProperties; + protected JpaWebConfiguration(JpaProperties jpaProperties) { + this.jpaProperties = jpaProperties; + } - protected JpaWebMvcConfiguration(JpaProperties jpaProperties) { - this.jpaProperties = jpaProperties; + @Bean + public OpenEntityManagerInViewInterceptor openEntityManagerInViewInterceptor() { + if (this.jpaProperties.getOpenInView() == null) { + logger.warn("spring.jpa.open-in-view is enabled by default. " + + "Therefore, database queries may be performed during view " + + "rendering. Explicitly configure " + + "spring.jpa.open-in-view to disable this warning"); } + return new OpenEntityManagerInViewInterceptor(); + } - @Bean - public OpenEntityManagerInViewInterceptor openEntityManagerInViewInterceptor() { - if (this.jpaProperties.getOpenInView() == null) { - logger.warn("spring.jpa.open-in-view is enabled by default. " - + "Therefore, database queries may be performed during view " - + "rendering. Explicitly configure " - + "spring.jpa.open-in-view to disable this warning"); + @Bean + public WebMvcConfigurer openEntityManagerInViewInterceptorConfigurer( + OpenEntityManagerInViewInterceptor interceptor) { + return new WebMvcConfigurer() { + + @Override + public void addInterceptors(InterceptorRegistry registry) { + registry.addWebRequestInterceptor(interceptor); } - return new OpenEntityManagerInViewInterceptor(); - } - - @Override - public void addInterceptors(InterceptorRegistry registry) { - registry.addWebRequestInterceptor(openEntityManagerInViewInterceptor()); - } + }; } } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfiguration.java index 97fdd9ae303..50093881916 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfiguration.java @@ -52,7 +52,7 @@ import org.springframework.transaction.PlatformTransactionManager; * @author Stephane Nicoll * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Scheduler.class, SchedulerFactoryBean.class, PlatformTransactionManager.class }) @EnableConfigurationProperties(QuartzProperties.class) @@ -100,7 +100,7 @@ public class QuartzAutoConfiguration { return properties; } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnSingleCandidate(DataSource.class) protected static class JdbcStoreTypeConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/core/ReactorCoreAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/core/ReactorCoreAutoConfiguration.java index ade1b835129..e328e9c561d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/core/ReactorCoreAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/core/ReactorCoreAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ import org.springframework.context.annotation.Configuration; * @author Brian Clozel * @author Eddú Meléndez */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Mono.class, Flux.class }) @EnableConfigurationProperties(ReactorCoreProperties.class) public class ReactorCoreAutoConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityDataConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityDataConfiguration.java index 969f0b35771..df756ff4537 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityDataConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityDataConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ import org.springframework.security.data.repository.query.SecurityEvaluationCont * @author Rob Winch * @since 1.3 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(SecurityEvaluationContextExtension.class) public class SecurityDataConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/reactive/ReactiveOAuth2ClientAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/reactive/ReactiveOAuth2ClientAutoConfiguration.java index ba82b8e221b..270f5dce568 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/reactive/ReactiveOAuth2ClientAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/reactive/ReactiveOAuth2ClientAutoConfiguration.java @@ -51,7 +51,7 @@ import org.springframework.security.oauth2.client.web.server.ServerOAuth2Authori * @author Madhura Bhave * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureBefore(ReactiveSecurityAutoConfiguration.class) @EnableConfigurationProperties(OAuth2ClientProperties.class) @Conditional(ReactiveOAuth2ClientAutoConfiguration.NonServletApplicationCondition.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2ClientAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2ClientAutoConfiguration.java index 3cd23fdbe26..967be8e71ed 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2ClientAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2ClientAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -33,7 +33,7 @@ import org.springframework.security.oauth2.client.registration.ClientRegistratio * @author Phillip Webb * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureBefore(SecurityAutoConfiguration.class) @ConditionalOnClass({ EnableWebSecurity.class, ClientRegistration.class }) @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2ClientRegistrationRepositoryConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2ClientRegistrationRepositoryConfiguration.java index b5d7588fb1f..3eb561af938 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2ClientRegistrationRepositoryConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2ClientRegistrationRepositoryConfiguration.java @@ -37,7 +37,7 @@ import org.springframework.security.oauth2.client.registration.InMemoryClientReg * * @author Madhura Bhave */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(OAuth2ClientProperties.class) @Conditional(ClientsConfiguredCondition.class) class OAuth2ClientRegistrationRepositoryConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfiguration.java index 44acc664d70..d6b93981a6f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -35,7 +35,7 @@ import org.springframework.security.oauth2.client.web.OAuth2AuthorizedClientRepo * @author Phillip Webb * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnBean(ClientRegistrationRepository.class) class OAuth2WebSecurityConfiguration { @@ -54,7 +54,7 @@ class OAuth2WebSecurityConfiguration { authorizedClientService); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(WebSecurityConfigurerAdapter.class) static class OAuth2WebSecurityConfigurerAdapter extends WebSecurityConfigurerAdapter { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerAutoConfiguration.java index 7c240b7d976..fede0b821c6 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -35,7 +35,7 @@ import org.springframework.security.oauth2.server.resource.BearerTokenAuthentica * @author Madhura Bhave * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureBefore(ReactiveSecurityAutoConfiguration.class) @EnableConfigurationProperties(OAuth2ResourceServerProperties.class) @ConditionalOnClass({ EnableWebFluxSecurity.class, BearerTokenAuthenticationToken.class, diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerJwkConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerJwkConfiguration.java index f54f8d15fb6..709cbe443a3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerJwkConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerJwkConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ import org.springframework.security.oauth2.jwt.ReactiveJwtDecoders; * @author Madhura Bhave * @author Artsiom Yudovin */ -@Configuration +@Configuration(proxyBeanMethods = false) class ReactiveOAuth2ResourceServerJwkConfiguration { private final OAuth2ResourceServerProperties properties; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerWebSecurityConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerWebSecurityConfiguration.java index 735c453c8e7..9d0d7edd564 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerWebSecurityConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerWebSecurityConfiguration.java @@ -29,7 +29,7 @@ import org.springframework.security.web.server.SecurityWebFilterChain; * * @author Madhura Bhave */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnBean(ReactiveJwtDecoder.class) class ReactiveOAuth2ResourceServerWebSecurityConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfiguration.java index 52432d77c49..704789b126d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -33,7 +33,7 @@ import org.springframework.security.oauth2.server.resource.authentication.JwtAut * @author Madhura Bhave * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureBefore(SecurityAutoConfiguration.class) @EnableConfigurationProperties(OAuth2ResourceServerProperties.class) @ConditionalOnClass({ JwtAuthenticationToken.class, JwtDecoder.class }) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerJwtConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerJwtConfiguration.java index ea3543a59d4..056f3dc365b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerJwtConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerJwtConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -33,7 +33,7 @@ import org.springframework.security.oauth2.jwt.NimbusJwtDecoderJwkSupport; * @author Madhura Bhave * @author Artsiom Yudovin */ -@Configuration +@Configuration(proxyBeanMethods = false) class OAuth2ResourceServerJwtConfiguration { private final OAuth2ResourceServerProperties.Jwt properties; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerWebSecurityConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerWebSecurityConfiguration.java index 7de7d62be1a..9c76eb1e2a1 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerWebSecurityConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerWebSecurityConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -27,11 +27,11 @@ import org.springframework.security.oauth2.jwt.JwtDecoder; * * @author Madhura Bhave */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(WebSecurityConfigurerAdapter.class) class OAuth2ResourceServerWebSecurityConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnBean(JwtDecoder.class) static class OAuth2WebSecurityConfigurerAdapter extends WebSecurityConfigurerAdapter { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveSecurityAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveSecurityAutoConfiguration.java index 1cdb8766a19..40c5989dbb0 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveSecurityAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveSecurityAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -38,13 +38,13 @@ import org.springframework.security.web.server.WebFilterChainProxy; * @author Madhura Bhave * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(SecurityProperties.class) @ConditionalOnClass({ Flux.class, EnableWebFluxSecurity.class, WebFilterChainProxy.class }) public class ReactiveSecurityAutoConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(WebFilterChainProxy.class) @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE) @EnableWebFluxSecurity diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveUserDetailsServiceAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveUserDetailsServiceAutoConfiguration.java index 064f9765a32..ef1be50b593 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveUserDetailsServiceAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveUserDetailsServiceAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -45,7 +45,7 @@ import org.springframework.util.StringUtils; * * @author Madhura Bhave */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ ReactiveAuthenticationManager.class }) @ConditionalOnMissingBean({ ReactiveAuthenticationManager.class, ReactiveUserDetailsService.class }) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/SecurityAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/SecurityAutoConfiguration.java index 6e7ddc475bc..a939fb21381 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/SecurityAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/SecurityAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -36,7 +36,7 @@ import org.springframework.security.authentication.DefaultAuthenticationEventPub * @author Andy Wilkinson * @author Madhura Bhave */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(DefaultAuthenticationEventPublisher.class) @EnableConfigurationProperties(SecurityProperties.class) @Import({ SpringBootWebSecurityConfiguration.class, WebSecurityEnablerConfiguration.class, diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/SecurityFilterAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/SecurityFilterAutoConfiguration.java index b9864ccf387..a756666b876 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/SecurityFilterAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/SecurityFilterAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -47,7 +47,7 @@ import org.springframework.security.web.context.AbstractSecurityWebApplicationIn * @author Andy Wilkinson * @since 1.3 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.SERVLET) @EnableConfigurationProperties(SecurityProperties.class) @ConditionalOnClass({ AbstractSecurityWebApplicationInitializer.class, diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/SecurityRequestMatcherProviderAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/SecurityRequestMatcherProviderAutoConfiguration.java index 5f786aae2ef..50ae0e91c83 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/SecurityRequestMatcherProviderAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/SecurityRequestMatcherProviderAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -34,12 +34,12 @@ import org.springframework.web.servlet.handler.HandlerMappingIntrospector; * @author Madhura Bhave * @since 2.0.5 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ RequestMatcher.class }) @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) public class SecurityRequestMatcherProviderAutoConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(DispatcherServlet.class) @ConditionalOnBean(HandlerMappingIntrospector.class) public static class MvcRequestMatcherConfiguration { @@ -53,7 +53,7 @@ public class SecurityRequestMatcherProviderAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(ResourceConfig.class) @ConditionalOnMissingClass("org.springframework.web.servlet.DispatcherServlet") @ConditionalOnBean(JerseyApplicationPath.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/SpringBootWebSecurityConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/SpringBootWebSecurityConfiguration.java index 193a918d48e..00d16d92be1 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/SpringBootWebSecurityConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/SpringBootWebSecurityConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -35,13 +35,13 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur * @author Madhura Bhave * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(WebSecurityConfigurerAdapter.class) @ConditionalOnMissingBean(WebSecurityConfigurerAdapter.class) @ConditionalOnWebApplication(type = Type.SERVLET) public class SpringBootWebSecurityConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @Order(SecurityProperties.BASIC_AUTH_ORDER) static class DefaultConfigurerAdapter extends WebSecurityConfigurerAdapter { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/UserDetailsServiceAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/UserDetailsServiceAutoConfiguration.java index 3beedfbb394..4d5e1f8c38f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/UserDetailsServiceAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/UserDetailsServiceAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -51,7 +51,7 @@ import org.springframework.util.StringUtils; * @author Rob Winch * @author Madhura Bhave */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(AuthenticationManager.class) @ConditionalOnBean(ObjectPostProcessor.class) @ConditionalOnMissingBean({ AuthenticationManager.class, AuthenticationProvider.class, diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/WebSecurityEnablerConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/WebSecurityEnablerConfiguration.java index fe00f8bb5be..71647ecf4f5 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/WebSecurityEnablerConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/WebSecurityEnablerConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -35,7 +35,7 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur * @author Madhura Bhave * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnBean(WebSecurityConfigurerAdapter.class) @ConditionalOnMissingBean(name = BeanIds.SPRING_SECURITY_FILTER_CHAIN) @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sendgrid/SendGridAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sendgrid/SendGridAutoConfiguration.java index 49bd63fece3..a2b8f4711e2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sendgrid/SendGridAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sendgrid/SendGridAutoConfiguration.java @@ -37,7 +37,7 @@ import org.springframework.context.annotation.Configuration; * @author Andy Wilkinson * @since 1.3.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(SendGrid.class) @ConditionalOnProperty(prefix = "spring.sendgrid", value = "api-key") @EnableConfigurationProperties(SendGridProperties.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/HazelcastSessionConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/HazelcastSessionConfiguration.java index 0ec14ee267e..b3887d4d4e9 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/HazelcastSessionConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/HazelcastSessionConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -39,7 +39,7 @@ import org.springframework.session.hazelcast.config.annotation.web.http.Hazelcas * @author Stephane Nicoll * @author Vedran Pavic */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(HazelcastSessionRepository.class) @ConditionalOnMissingBean(SessionRepository.class) @ConditionalOnBean(HazelcastInstance.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionConfiguration.java index f85398ee4d0..1b18e8c6e91 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -41,7 +41,7 @@ import org.springframework.session.jdbc.config.annotation.web.http.JdbcHttpSessi * @author Stephane Nicoll * @author Vedran Pavic */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ JdbcTemplate.class, JdbcOperationsSessionRepository.class }) @ConditionalOnMissingBean(SessionRepository.class) @ConditionalOnBean(DataSource.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/MongoReactiveSessionConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/MongoReactiveSessionConfiguration.java index 42965a2de1c..c409e16fcd3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/MongoReactiveSessionConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/MongoReactiveSessionConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -35,7 +35,7 @@ import org.springframework.session.data.mongo.config.annotation.web.reactive.Rea * * @author Andy Wilkinson */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ ReactiveMongoOperations.class, ReactiveMongoOperationsSessionRepository.class }) @ConditionalOnMissingBean(ReactiveSessionRepository.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/MongoSessionConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/MongoSessionConfiguration.java index bf408e3cfce..f2cf0c91401 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/MongoSessionConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/MongoSessionConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -36,7 +36,7 @@ import org.springframework.session.data.mongo.config.annotation.web.http.MongoHt * @author Eddú Meléndez * @author Stephane Nicoll */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ MongoOperations.class, MongoOperationsSessionRepository.class }) @ConditionalOnMissingBean(SessionRepository.class) @ConditionalOnBean(MongoOperations.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/NoOpReactiveSessionConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/NoOpReactiveSessionConfiguration.java index 4f96e45264d..2dc6ea514bf 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/NoOpReactiveSessionConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/NoOpReactiveSessionConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -27,7 +27,7 @@ import org.springframework.session.ReactiveSessionRepository; * @author Tommy Ludwig * @author Andy Wilkinson */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(ReactiveSessionRepository.class) @Conditional(ReactiveSessionCondition.class) class NoOpReactiveSessionConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/NoOpSessionConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/NoOpSessionConfiguration.java index 9894eb01b0d..37c6053cde2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/NoOpSessionConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/NoOpSessionConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ import org.springframework.session.SessionRepository; * * @author Tommy Ludwig */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(SessionRepository.class) @Conditional(ServletSessionCondition.class) class NoOpSessionConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisReactiveSessionConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisReactiveSessionConfiguration.java index 56ddce4386b..7626663f497 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisReactiveSessionConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisReactiveSessionConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -35,7 +35,7 @@ import org.springframework.session.data.redis.config.annotation.web.server.Redis * * @author Andy Wilkinson */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ ReactiveRedisConnectionFactory.class, ReactiveRedisOperationsSessionRepository.class }) @ConditionalOnMissingBean(ReactiveSessionRepository.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisSessionConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisSessionConfiguration.java index 6d577da6cd3..1dd7acc660c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisSessionConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisSessionConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -40,7 +40,7 @@ import org.springframework.session.data.redis.config.annotation.web.http.RedisHt * @author Stephane Nicoll * @author Vedran Pavic */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ RedisTemplate.class, RedisOperationsSessionRepository.class }) @ConditionalOnMissingBean(SessionRepository.class) @ConditionalOnBean(RedisConnectionFactory.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java index 0bb8feef161..733737a28f0 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java @@ -71,7 +71,7 @@ import org.springframework.session.web.http.HttpSessionIdResolver; * @author Vedran Pavic * @since 1.4.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(Session.class) @ConditionalOnWebApplication @EnableConfigurationProperties({ ServerProperties.class, SessionProperties.class }) @@ -82,7 +82,7 @@ import org.springframework.session.web.http.HttpSessionIdResolver; @AutoConfigureBefore(HttpHandlerAutoConfiguration.class) public class SessionAutoConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.SERVLET) @Import({ ServletSessionRepositoryValidator.class, SessionRepositoryFilterConfiguration.class }) @@ -105,7 +105,7 @@ public class SessionAutoConfiguration { return cookieSerializer; } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(SessionRepository.class) @Import({ ServletSessionRepositoryImplementationValidator.class, ServletSessionConfigurationImportSelector.class }) @@ -115,12 +115,12 @@ public class SessionAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.REACTIVE) @Import(ReactiveSessionRepositoryValidator.class) static class ReactiveSessionConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(ReactiveSessionRepository.class) @Import({ ReactiveSessionRepositoryImplementationValidator.class, ReactiveSessionConfigurationImportSelector.class }) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionRepositoryFilterConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionRepositoryFilterConfiguration.java index 23c188dfaa2..1a75adf8c30 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionRepositoryFilterConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionRepositoryFilterConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -33,7 +33,7 @@ import org.springframework.session.web.http.SessionRepositoryFilter; * * @author Andy Wilkinson */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnBean(SessionRepositoryFilter.class) @EnableConfigurationProperties(SessionProperties.class) class SessionRepositoryFilterConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/solr/SolrAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/solr/SolrAutoConfiguration.java index 066727b54f0..8d989aa72f4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/solr/SolrAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/solr/SolrAutoConfiguration.java @@ -37,7 +37,7 @@ import org.springframework.util.StringUtils; * @author Christoph Strobl * @since 1.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ HttpSolrClient.class, CloudSolrClient.class }) @EnableConfigurationProperties(SolrProperties.class) public class SolrAutoConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java index c7d214e9709..dce550b2ad1 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java @@ -42,7 +42,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; * @since 2.1.0 */ @ConditionalOnClass(ThreadPoolTaskExecutor.class) -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(TaskExecutionProperties.class) public class TaskExecutionAutoConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java index 3a67354327c..05a7c274d0e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java @@ -42,7 +42,7 @@ import org.springframework.scheduling.config.TaskManagementConfigUtils; * @since 2.1.0 */ @ConditionalOnClass(ThreadPoolTaskScheduler.class) -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(TaskSchedulingProperties.class) @AutoConfigureAfter(TaskExecutionAutoConfiguration.class) public class TaskSchedulingAutoConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java index 193d796f2d0..eb04c0271cd 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java @@ -74,13 +74,13 @@ import org.springframework.web.servlet.resource.ResourceUrlEncodingFilter; * @author Kazuki Shimizu * @author Artsiom Yudovin */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(ThymeleafProperties.class) @ConditionalOnClass(TemplateMode.class) @AutoConfigureAfter({ WebMvcAutoConfiguration.class, WebFluxAutoConfiguration.class }) public class ThymeleafAutoConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(name = "defaultTemplateResolver") static class DefaultTemplateResolverConfiguration { @@ -132,7 +132,7 @@ public class ThymeleafAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class ThymeleafDefaultConfiguration { @Bean @@ -151,7 +151,7 @@ public class ThymeleafAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.SERVLET) @ConditionalOnProperty(name = "spring.thymeleaf.enabled", matchIfMissing = true) static class ThymeleafWebMvcConfiguration { @@ -166,7 +166,7 @@ public class ThymeleafAutoConfiguration { return registration; } - @Configuration + @Configuration(proxyBeanMethods = false) static class ThymeleafViewResolverConfiguration { @Bean @@ -204,7 +204,7 @@ public class ThymeleafAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.REACTIVE) @ConditionalOnProperty(name = "spring.thymeleaf.enabled", matchIfMissing = true) static class ThymeleafReactiveConfiguration { @@ -225,7 +225,7 @@ public class ThymeleafAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.REACTIVE) @ConditionalOnProperty(name = "spring.thymeleaf.enabled", matchIfMissing = true) static class ThymeleafWebFluxConfiguration { @@ -267,7 +267,7 @@ public class ThymeleafAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(LayoutDialect.class) protected static class ThymeleafWebLayoutConfiguration { @@ -279,7 +279,7 @@ public class ThymeleafAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(DataAttributeDialect.class) protected static class DataAttributeDialectConfiguration { @@ -291,7 +291,7 @@ public class ThymeleafAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ SpringSecurityDialect.class }) protected static class ThymeleafSecurityDialectConfiguration { @@ -303,7 +303,7 @@ public class ThymeleafAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(Java8TimeDialect.class) protected static class ThymeleafJava8TimeDialect { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfiguration.java index 9a234fc1f19..41fb4076b7e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfiguration.java @@ -44,7 +44,7 @@ import org.springframework.transaction.support.TransactionTemplate; * @author Stephane Nicoll * @since 1.3.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(PlatformTransactionManager.class) @AutoConfigureAfter({ JtaAutoConfiguration.class, HibernateJpaAutoConfiguration.class, DataSourceTransactionManagerAutoConfiguration.class, @@ -60,7 +60,7 @@ public class TransactionAutoConfiguration { customizers.orderedStream().collect(Collectors.toList())); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnSingleCandidate(PlatformTransactionManager.class) public static class TransactionTemplateConfiguration { @@ -73,19 +73,19 @@ public class TransactionAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnBean(PlatformTransactionManager.class) @ConditionalOnMissingBean(AbstractTransactionManagementConfiguration.class) public static class EnableTransactionManagementConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @EnableTransactionManagement(proxyTargetClass = false) @ConditionalOnProperty(prefix = "spring.aop", name = "proxy-target-class", havingValue = "false", matchIfMissing = false) public static class JdkDynamicAutoProxyConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableTransactionManagement(proxyTargetClass = true) @ConditionalOnProperty(prefix = "spring.aop", name = "proxy-target-class", havingValue = "true", matchIfMissing = true) public static class CglibAutoProxyConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/AtomikosJtaConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/AtomikosJtaConfiguration.java index 666eb2c78cb..881ce0c352e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/AtomikosJtaConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/AtomikosJtaConfiguration.java @@ -55,7 +55,7 @@ import org.springframework.util.StringUtils; * @author Kazuki Shimizu * @since 1.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties({ AtomikosProperties.class, JtaProperties.class }) @ConditionalOnClass({ JtaTransactionManager.class, UserTransactionManager.class }) @ConditionalOnMissingBean(PlatformTransactionManager.class) @@ -117,7 +117,7 @@ class AtomikosJtaConfiguration { return jtaTransactionManager; } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(Message.class) static class AtomikosJtaJmsConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java index 9874ee42438..d44019ca01f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java @@ -53,7 +53,7 @@ import org.springframework.util.StringUtils; * @author Kazuki Shimizu * @since 1.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(JtaProperties.class) @ConditionalOnClass({ JtaTransactionManager.class, BitronixContext.class }) @ConditionalOnMissingBean(PlatformTransactionManager.class) @@ -113,7 +113,7 @@ class BitronixJtaConfiguration { return jtaTransactionManager; } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(Message.class) static class BitronixJtaJmsConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/JndiJtaConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/JndiJtaConfiguration.java index e19866c4168..ad386225911 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/JndiJtaConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/JndiJtaConfiguration.java @@ -35,7 +35,7 @@ import org.springframework.transaction.jta.JtaTransactionManager; * @author Kazuki Shimizu * @since 1.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(JtaTransactionManager.class) @ConditionalOnJndi({ JtaTransactionManager.DEFAULT_USER_TRANSACTION_NAME, "java:comp/TransactionManager", "java:appserver/TransactionManager", diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfiguration.java index 78e50623bf0..c95e1051ca4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -35,7 +35,7 @@ import org.springframework.context.annotation.Import; * @author Nishant Raut * @since 1.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(javax.transaction.Transaction.class) @ConditionalOnProperty(prefix = "spring.jta", value = "enabled", matchIfMissing = true) @AutoConfigureBefore({ XADataSourceAutoConfiguration.class, diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfiguration.java index ea7820d5155..a8d53123d90 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -42,7 +42,7 @@ import org.springframework.validation.beanvalidation.MethodValidationPostProcess * @author Madhura Bhave * @since 1.5.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(ExecutableValidator.class) @ConditionalOnResource(resources = "classpath:META-INF/services/javax.validation.spi.ValidationProvider") @Import(PrimaryDefaultValidatorPostProcessor.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/client/RestTemplateAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/client/RestTemplateAutoConfiguration.java index 1fdb696c5b6..a7ddc614e2f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/client/RestTemplateAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/client/RestTemplateAutoConfiguration.java @@ -44,7 +44,7 @@ import org.springframework.web.client.RestTemplate; * @author Phillip Webb * @since 1.4.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureAfter(HttpMessageConvertersAutoConfiguration.class) @ConditionalOnClass(RestTemplate.class) @Conditional(NotReactiveWebApplicationCondition.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/EmbeddedWebServerFactoryCustomizerAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/EmbeddedWebServerFactoryCustomizerAutoConfiguration.java index a81f74bc2fc..5c641c1ffae 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/EmbeddedWebServerFactoryCustomizerAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/EmbeddedWebServerFactoryCustomizerAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -41,7 +41,7 @@ import org.springframework.core.env.Environment; * @author Phillip Webb * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication @EnableConfigurationProperties(ServerProperties.class) public class EmbeddedWebServerFactoryCustomizerAutoConfiguration { @@ -49,7 +49,7 @@ public class EmbeddedWebServerFactoryCustomizerAutoConfiguration { /** * Nested configuration if Tomcat is being used. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Tomcat.class, UpgradeProtocol.class }) public static class TomcatWebServerFactoryCustomizerConfiguration { @@ -64,7 +64,7 @@ public class EmbeddedWebServerFactoryCustomizerAutoConfiguration { /** * Nested configuration if Jetty is being used. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Server.class, Loader.class, WebAppContext.class }) public static class JettyWebServerFactoryCustomizerConfiguration { @@ -79,7 +79,7 @@ public class EmbeddedWebServerFactoryCustomizerAutoConfiguration { /** * Nested configuration if Undertow is being used. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Undertow.class, SslClientAuthMode.class }) public static class UndertowWebServerFactoryCustomizerConfiguration { @@ -94,7 +94,7 @@ public class EmbeddedWebServerFactoryCustomizerAutoConfiguration { /** * Nested configuration if Netty is being used. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(HttpServer.class) public static class NettyWebServerFactoryCustomizerConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/HttpHandlerAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/HttpHandlerAutoConfiguration.java index f5dec008d2c..6bcbb3d1bd3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/HttpHandlerAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/HttpHandlerAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -37,7 +37,7 @@ import org.springframework.web.server.adapter.WebHttpHandlerBuilder; * @author Stephane Nicoll * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ DispatcherHandler.class, HttpHandler.class }) @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE) @ConditionalOnMissingBean(HttpHandler.class) @@ -45,7 +45,7 @@ import org.springframework.web.server.adapter.WebHttpHandlerBuilder; @AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE + 10) public class HttpHandlerAutoConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) public static class AnnotationConfig { private ApplicationContext applicationContext; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryAutoConfiguration.java index a656bec54d5..baf877ba8a6 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -45,7 +45,7 @@ import org.springframework.util.ObjectUtils; * @since 2.0.0 */ @AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE) -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(ReactiveHttpInputMessage.class) @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE) @EnableConfigurationProperties(ServerProperties.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryConfiguration.java index 632f64bca00..0077cbb4971 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryConfiguration.java @@ -47,7 +47,7 @@ import org.springframework.http.client.reactive.ReactorResourceFactory; */ abstract class ReactiveWebServerFactoryConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(ReactiveWebServerFactory.class) @ConditionalOnClass({ HttpServer.class }) static class EmbeddedNetty { @@ -68,7 +68,7 @@ abstract class ReactiveWebServerFactoryConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(ReactiveWebServerFactory.class) @ConditionalOnClass({ org.apache.catalina.startup.Tomcat.class }) static class EmbeddedTomcat { @@ -87,7 +87,7 @@ abstract class ReactiveWebServerFactoryConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(ReactiveWebServerFactory.class) @ConditionalOnClass({ org.eclipse.jetty.server.Server.class }) static class EmbeddedJetty { @@ -108,7 +108,7 @@ abstract class ReactiveWebServerFactoryConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(ReactiveWebServerFactory.class) @ConditionalOnClass({ Undertow.class }) static class EmbeddedUndertow { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfiguration.java index 8c6477227c8..b60f44f4200 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -78,7 +78,7 @@ import org.springframework.web.reactive.result.view.ViewResolver; * @author Artsiom Yudovin * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE) @ConditionalOnClass(WebFluxConfigurer.class) @ConditionalOnMissingBean({ WebFluxConfigurationSupport.class }) @@ -94,7 +94,7 @@ public class WebFluxAutoConfiguration { return new OrderedHiddenHttpMethodFilter(); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties({ ResourceProperties.class, WebFluxProperties.class }) @Import({ EnableWebFluxConfiguration.class }) public static class WebFluxConfig implements WebFluxConfigurer { @@ -263,7 +263,7 @@ public class WebFluxAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnEnabledResourceChain static class ResourceChainCustomizerConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/ErrorWebFluxAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/ErrorWebFluxAutoConfiguration.java index 72e5f9f2790..e29b08ec88b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/ErrorWebFluxAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/ErrorWebFluxAutoConfiguration.java @@ -47,7 +47,7 @@ import org.springframework.web.reactive.result.view.ViewResolver; * @author Brian Clozel * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE) @ConditionalOnClass(WebFluxConfigurer.class) @AutoConfigureBefore(WebFluxAutoConfiguration.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/function/client/ClientHttpConnectorAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/function/client/ClientHttpConnectorAutoConfiguration.java index e25157fc006..ef3e1ae06b4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/function/client/ClientHttpConnectorAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/function/client/ClientHttpConnectorAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -37,7 +37,7 @@ import org.springframework.web.reactive.function.client.WebClient; * @author Brian Clozel * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(WebClient.class) @Import({ ClientHttpConnectorConfiguration.ReactorNetty.class, ClientHttpConnectorConfiguration.JettyClient.class }) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/function/client/ClientHttpConnectorConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/function/client/ClientHttpConnectorConfiguration.java index c5d8a856fae..606c3f6ca91 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/function/client/ClientHttpConnectorConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/function/client/ClientHttpConnectorConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -36,10 +36,10 @@ import org.springframework.http.client.reactive.ReactorResourceFactory; * * @author Brian Clozel */ -@Configuration +@Configuration(proxyBeanMethods = false) class ClientHttpConnectorConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(reactor.netty.http.client.HttpClient.class) @ConditionalOnMissingBean(ClientHttpConnector.class) public static class ReactorNetty { @@ -59,7 +59,7 @@ class ClientHttpConnectorConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(org.eclipse.jetty.reactive.client.ReactiveRequest.class) @ConditionalOnMissingBean(ClientHttpConnector.class) public static class JettyClient { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/function/client/WebClientAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/function/client/WebClientAutoConfiguration.java index 81123298e2d..75f13b2407e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/function/client/WebClientAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/function/client/WebClientAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -44,7 +44,7 @@ import org.springframework.web.reactive.function.client.WebClient; * @author Brian Clozel * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(WebClient.class) @AutoConfigureAfter({ CodecsAutoConfiguration.class, ClientHttpConnectorAutoConfiguration.class }) @@ -66,7 +66,7 @@ public class WebClientAutoConfiguration { return this.webClientBuilder.clone(); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnBean(CodecCustomizer.class) protected static class WebClientCodecsConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/DispatcherServletAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/DispatcherServletAutoConfiguration.java index 8a7c85d99a4..e6cb5881d97 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/DispatcherServletAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/DispatcherServletAutoConfiguration.java @@ -63,7 +63,7 @@ import org.springframework.web.servlet.DispatcherServlet; * @author Brian Clozel */ @AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE) -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.SERVLET) @ConditionalOnClass(DispatcherServlet.class) @AutoConfigureAfter(ServletWebServerFactoryAutoConfiguration.class) @@ -79,7 +79,7 @@ public class DispatcherServletAutoConfiguration { */ public static final String DEFAULT_DISPATCHER_SERVLET_REGISTRATION_BEAN_NAME = "dispatcherServletRegistration"; - @Configuration + @Configuration(proxyBeanMethods = false) @Conditional(DefaultDispatcherServletCondition.class) @ConditionalOnClass(ServletRegistration.class) @EnableConfigurationProperties({ HttpProperties.class, WebMvcProperties.class }) @@ -110,7 +110,7 @@ public class DispatcherServletAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @Conditional(DispatcherServletRegistrationCondition.class) @ConditionalOnClass(ServletRegistration.class) @EnableConfigurationProperties(WebMvcProperties.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/HttpEncodingAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/HttpEncodingAutoConfiguration.java index 933b5b4c576..b45c621c6a4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/HttpEncodingAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/HttpEncodingAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -40,7 +40,7 @@ import org.springframework.web.filter.CharacterEncodingFilter; * @author Brian Clozel * @since 1.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(HttpProperties.class) @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) @ConditionalOnClass(CharacterEncodingFilter.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/MultipartAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/MultipartAutoConfiguration.java index 57d83752264..b116bc8883c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/MultipartAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/MultipartAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -48,7 +48,7 @@ import org.springframework.web.servlet.DispatcherServlet; * @author Josh Long * @author Toshiaki Maki */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Servlet.class, StandardServletMultipartResolver.class, MultipartConfigElement.class }) @ConditionalOnProperty(prefix = "spring.servlet.multipart", name = "enabled", matchIfMissing = true) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryAutoConfiguration.java index fe45ace0c88..e1a97a315c1 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -50,7 +50,7 @@ import org.springframework.util.ObjectUtils; * @author Brian Clozel * @author Stephane Nicoll */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE) @ConditionalOnClass(ServletRequest.class) @ConditionalOnWebApplication(type = Type.SERVLET) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryConfiguration.java index 891ff204b3a..a329e5061d4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -54,10 +54,10 @@ import org.springframework.context.annotation.Configuration; * @author Stephane Nicoll * @author Raheela Asalm */ -@Configuration +@Configuration(proxyBeanMethods = false) class ServletWebServerFactoryConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Servlet.class, Tomcat.class, UpgradeProtocol.class }) @ConditionalOnMissingBean(value = ServletWebServerFactory.class, search = SearchStrategy.CURRENT) public static class EmbeddedTomcat { @@ -79,7 +79,7 @@ class ServletWebServerFactoryConfiguration { /** * Nested configuration if Jetty is being used. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Servlet.class, Server.class, Loader.class, WebAppContext.class }) @ConditionalOnMissingBean(value = ServletWebServerFactory.class, search = SearchStrategy.CURRENT) @@ -95,7 +95,7 @@ class ServletWebServerFactoryConfiguration { /** * Nested configuration if Undertow is being used. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Servlet.class, Undertow.class, SslClientAuthMode.class }) @ConditionalOnMissingBean(value = ServletWebServerFactory.class, search = SearchStrategy.CURRENT) public static class EmbeddedUndertow { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java index d3ed83cc5f9..465b805997f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java @@ -137,7 +137,7 @@ import org.springframework.web.servlet.view.InternalResourceViewResolver; * @author Bruce Brouwer * @author Artsiom Yudovin */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.SERVLET) @ConditionalOnClass({ Servlet.class, DispatcherServlet.class, WebMvcConfigurer.class }) @ConditionalOnMissingBean(WebMvcConfigurationSupport.class) @@ -168,7 +168,7 @@ public class WebMvcAutoConfiguration { // Defined as a nested config to ensure WebMvcConfigurer is not read when not // on the classpath - @Configuration + @Configuration(proxyBeanMethods = false) @Import(EnableWebMvcConfiguration.class) @EnableConfigurationProperties({ WebMvcProperties.class, ResourceProperties.class }) @Order(0) @@ -406,7 +406,7 @@ public class WebMvcAutoConfiguration { return new OrderedRequestContextFilter(); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "spring.mvc.favicon.enabled", matchIfMissing = true) public static class FaviconConfiguration implements ResourceLoaderAware { @@ -424,19 +424,17 @@ public class WebMvcAutoConfiguration { } @Bean - public SimpleUrlHandlerMapping faviconHandlerMapping() { + public SimpleUrlHandlerMapping faviconHandlerMapping( + FaviconRequestHandler handler) { SimpleUrlHandlerMapping mapping = new SimpleUrlHandlerMapping(); mapping.setOrder(Ordered.HIGHEST_PRECEDENCE + 1); - mapping.setUrlMap(Collections.singletonMap("**/favicon.ico", - faviconRequestHandler())); + mapping.setUrlMap(Collections.singletonMap("**/favicon.ico", handler)); return mapping; } @Bean - public ResourceHttpRequestHandler faviconRequestHandler() { - ResourceHttpRequestHandler requestHandler = new ResourceHttpRequestHandler(); - requestHandler.setLocations(resolveFaviconLocations()); - return requestHandler; + public FaviconRequestHandler faviconRequestHandler() { + return new FaviconRequestHandler(resolveFaviconLocations()); } private List resolveFaviconLocations() { @@ -451,6 +449,15 @@ public class WebMvcAutoConfiguration { } + private static final class FaviconRequestHandler + extends ResourceHttpRequestHandler { + + private FaviconRequestHandler(List locations) { + setLocations(locations); + } + + } + } /** @@ -582,7 +589,7 @@ public class WebMvcAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnEnabledResourceChain static class ResourceChainCustomizerConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/ErrorMvcAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/ErrorMvcAutoConfiguration.java index b3d56398e6d..3ffbf0a3d87 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/ErrorMvcAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/ErrorMvcAutoConfiguration.java @@ -80,7 +80,7 @@ import org.springframework.web.util.HtmlUtils; * @author Stephane Nicoll * @author Brian Clozel */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.SERVLET) @ConditionalOnClass({ Servlet.class, DispatcherServlet.class }) // Load before the main WebMvcAutoConfiguration so that the error View is available @@ -121,7 +121,7 @@ public class ErrorMvcAutoConfiguration { return new PreserveErrorControllerTargetClassPostProcessor(); } - @Configuration + @Configuration(proxyBeanMethods = false) static class DefaultErrorViewResolverConfiguration { private final ApplicationContext applicationContext; @@ -144,7 +144,7 @@ public class ErrorMvcAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(prefix = "server.error.whitelabel", name = "enabled", matchIfMissing = true) @Conditional(ErrorTemplateMissingCondition.class) protected static class WhitelabelErrorViewConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/webservices/WebServicesAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/webservices/WebServicesAutoConfiguration.java index 5ec0e954341..dc33d85a02c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/webservices/WebServicesAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/webservices/WebServicesAutoConfiguration.java @@ -58,7 +58,7 @@ import org.springframework.xml.xsd.SimpleXsdSchema; * @author Stephane Nicoll * @since 1.4.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.SERVLET) @ConditionalOnClass(MessageDispatcherServlet.class) @ConditionalOnMissingBean(WsConfigurationSupport.class) @@ -87,7 +87,7 @@ public class WebServicesAutoConfiguration { return new WsdlDefinitionBeanFactoryPostProcessor(); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWs protected static class WsConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/webservices/client/WebServiceTemplateAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/webservices/client/WebServiceTemplateAutoConfiguration.java index 60050defa30..cc626aff8bd 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/webservices/client/WebServiceTemplateAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/webservices/client/WebServiceTemplateAutoConfiguration.java @@ -37,7 +37,7 @@ import org.springframework.ws.client.core.WebServiceTemplate; * @author Dmytro Nosan * @since 2.1.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ WebServiceTemplate.class, Unmarshaller.class, Marshaller.class }) public class WebServiceTemplateAutoConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/reactive/WebSocketReactiveAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/reactive/WebSocketReactiveAutoConfiguration.java index ed33ed4f82f..249deedc64c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/reactive/WebSocketReactiveAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/reactive/WebSocketReactiveAutoConfiguration.java @@ -41,13 +41,13 @@ import org.springframework.context.annotation.Configuration; * @author Brian Clozel * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Servlet.class, ServerContainer.class }) @ConditionalOnWebApplication(type = Type.REACTIVE) @AutoConfigureBefore(ReactiveWebServerFactoryAutoConfiguration.class) public class WebSocketReactiveAutoConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Tomcat.class, WsSci.class }) static class TomcatWebSocketConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/servlet/WebSocketMessagingAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/servlet/WebSocketMessagingAutoConfiguration.java index 9374f13a543..a168e01d48e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/servlet/WebSocketMessagingAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/servlet/WebSocketMessagingAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -44,13 +44,13 @@ import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerCo * @author Andy Wilkinson * @since 1.3.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.SERVLET) @ConditionalOnClass(WebSocketMessageBrokerConfigurer.class) @AutoConfigureAfter(JacksonAutoConfiguration.class) public class WebSocketMessagingAutoConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnBean({ DelegatingWebSocketMessageBrokerConfiguration.class, ObjectMapper.class }) @ConditionalOnClass({ ObjectMapper.class, AbstractMessageBrokerConfiguration.class }) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/servlet/WebSocketServletAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/servlet/WebSocketServletAutoConfiguration.java index 5ed885c5209..024bd261f9a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/servlet/WebSocketServletAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/servlet/WebSocketServletAutoConfiguration.java @@ -52,13 +52,13 @@ import org.springframework.context.annotation.Configuration; * @author Phillip Webb * @author Andy Wilkinson */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Servlet.class, ServerContainer.class }) @ConditionalOnWebApplication(type = Type.SERVLET) @AutoConfigureBefore(ServletWebServerFactoryAutoConfiguration.class) public class WebSocketServletAutoConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Tomcat.class, WsSci.class }) static class TomcatWebSocketConfiguration { @@ -70,7 +70,7 @@ public class WebSocketServletAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(WebSocketServerContainerInitializer.class) static class JettyWebSocketConfiguration { @@ -82,7 +82,7 @@ public class WebSocketServletAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(io.undertow.websockets.jsr.Bootstrap.class) static class UndertowWebSocketConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationExcludeFilterTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationExcludeFilterTests.java index eb7fd629b83..a7b0655492f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationExcludeFilterTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationExcludeFilterTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -60,7 +60,7 @@ public class AutoConfigurationExcludeFilterTests { .isThrownBy(() -> this.context.getBean(FILTERED)); } - @Configuration + @Configuration(proxyBeanMethods = false) @ComponentScan(basePackageClasses = ExampleConfiguration.class, excludeFilters = @ComponentScan.Filter(type = FilterType.CUSTOM, classes = TestAutoConfigurationExcludeFilter.class)) static class Config { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationImportSelectorIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationImportSelectorIntegrationTests.java index 33efcf2a2e4..adac6f459ac 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationImportSelectorIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationImportSelectorIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -100,24 +100,24 @@ public class AutoConfigurationImportSelectorIntegrationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ConfigA { } - @Configuration + @Configuration(proxyBeanMethods = false) @AutoConfigureAfter(ConfigA.class) @AutoConfigureBefore(ConfigC.class) static class ConfigB { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ConfigC { } - @Configuration + @Configuration(proxyBeanMethods = false) @AutoConfigureAfter(ConfigC.class) static class ConfigD { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationImportSelectorTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationImportSelectorTests.java index 2f83bc11735..4a3939bbbba 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationImportSelectorTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationImportSelectorTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -283,7 +283,7 @@ public class AutoConfigurationImportSelectorTests { } - @Configuration + @Configuration(proxyBeanMethods = false) private class TestConfiguration { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationPackagesTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationPackagesTests.java index 682a86d9ffc..d88ae2a9468 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationPackagesTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationPackagesTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -67,13 +67,13 @@ public class AutoConfigurationPackagesTests { assertThat(packages).containsOnly(package1.getName(), package2.getName()); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(AutoConfigurationPackages.Registrar.class) static class ConfigWithRegistrar { } - @Configuration + @Configuration(proxyBeanMethods = false) static class EmptyConfig { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReproTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReproTests.java index ae418b6f722..96d3de193a7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReproTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReproTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -54,12 +54,12 @@ public class AutoConfigurationReproTests { assertThat(bean).isEqualTo("bucket"); } - @Configuration + @Configuration(proxyBeanMethods = false) public static class Config { } - @Configuration + @Configuration(proxyBeanMethods = false) @ImportResource("classpath:/early-init-test.xml") public static class EarlyInitConfig { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationTests.java index 9aa926d9fab..c9b8cb4cbf2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -130,24 +130,24 @@ public class ImportAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ConfigA { } - @Configuration + @Configuration(proxyBeanMethods = false) @AutoConfigureAfter(ConfigA.class) static class ConfigB { } - @Configuration + @Configuration(proxyBeanMethods = false) @AutoConfigureAfter(ConfigB.class) static class ConfigC { } - @Configuration + @Configuration(proxyBeanMethods = false) @AutoConfigureAfter(ConfigC.class) static class ConfigD { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/SpringJUnitTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/SpringJUnitTests.java index a7653e9ee6c..2b22e5c503b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/SpringJUnitTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/SpringJUnitTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -55,7 +55,7 @@ public class SpringJUnitTests { assertThat(this.foo).isEqualTo("bucket"); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import({ PropertyPlaceholderAutoConfiguration.class }) public static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/admin/SpringApplicationAdminJmxAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/admin/SpringApplicationAdminJmxAutoConfigurationTests.java index 45819fe3404..56d2438c285 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/admin/SpringApplicationAdminJmxAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/admin/SpringApplicationAdminJmxAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -158,7 +158,7 @@ public class SpringApplicationAdminJmxAutoConfigurationTests { new Object[] { key }, new String[] { String.class.getName() }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class MultipleMBeanExportersConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java index 50d3c66a2eb..77f7d2da2a0 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java @@ -806,12 +806,12 @@ public class RabbitAutoConfigurationTests { return rabbitTemplate.isMandatoryFor(mock(Message.class)); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TestConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TestConfiguration2 { @Bean @@ -821,13 +821,14 @@ public class RabbitAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TestConfiguration3 { @Bean - RabbitTemplate rabbitTemplate(ConnectionFactory connectionFactory) { + RabbitTemplate rabbitTemplate(ConnectionFactory connectionFactory, + MessageConverter messageConverter) { RabbitTemplate rabbitTemplate = new RabbitTemplate(connectionFactory); - rabbitTemplate.setMessageConverter(testMessageConverter()); + rabbitTemplate.setMessageConverter(messageConverter); return rabbitTemplate; } @@ -838,7 +839,7 @@ public class RabbitAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TestConfiguration4 { @Bean @@ -851,7 +852,7 @@ public class RabbitAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TestConfiguration5 { @Bean @@ -861,7 +862,7 @@ public class RabbitAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class MessageConvertersConfiguration { @Bean @@ -877,7 +878,7 @@ public class RabbitAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class MessageRecoverersConfiguration { @Bean @@ -893,7 +894,7 @@ public class RabbitAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class ConnectionNameStrategyConfiguration { private final AtomicInteger counter = new AtomicInteger(); @@ -905,7 +906,7 @@ public class RabbitAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class RabbitRetryTemplateCustomizerConfiguration { private final BackOffPolicy backOffPolicy = new ExponentialBackOffPolicy(); @@ -932,13 +933,13 @@ public class RabbitAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableRabbit protected static class EnableRabbitConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class NoEnableRabbitConfiguration { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/aop/AopAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/aop/AopAutoConfigurationTests.java index 27b81dd774d..d473b353389 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/aop/AopAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/aop/AopAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -102,13 +102,13 @@ public class AopAutoConfigurationTests { } @EnableAspectJAutoProxy - @Configuration + @Configuration(proxyBeanMethods = false) @Import(TestConfiguration.class) protected static class CustomTestConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TestConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java index b1a5fa901cb..d485a523f16 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java @@ -257,7 +257,7 @@ public class BatchAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class EmptyConfiguration { } @@ -307,7 +307,7 @@ public class BatchAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableBatchProcessing protected static class NamedJobConfigurationWithRegisteredJob { @@ -349,7 +349,7 @@ public class BatchAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableBatchProcessing protected static class NamedJobConfigurationWithLocalJob { @@ -381,7 +381,7 @@ public class BatchAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableBatchProcessing protected static class JobConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunnerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunnerTests.java index e2bbc56998a..825da0933cf 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunnerTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunnerTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -212,7 +212,7 @@ public class JobLauncherCommandLineRunnerTests { }; } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableBatchProcessing protected static class BatchConfiguration implements BatchConfigurer { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/AbstractCacheAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/AbstractCacheAutoConfigurationTests.java index 32e34136b1d..0c1c83a7971 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/AbstractCacheAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/AbstractCacheAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -79,7 +79,7 @@ abstract class AbstractCacheAutoConfigurationTests { }; } - @Configuration + @Configuration(proxyBeanMethods = false) static class CacheManagerCustomizersConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java index f6f3cfb5d6f..a6e08b0733b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -793,25 +793,25 @@ public class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationT "defaultCacheConfig"); } - @Configuration + @Configuration(proxyBeanMethods = false) static class EmptyConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableCaching static class DefaultCacheConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableCaching @Import(CacheManagerCustomizersConfiguration.class) static class DefaultCacheAndCustomizersConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableCaching static class GenericCacheConfiguration { @@ -827,14 +827,14 @@ public class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationT } - @Configuration + @Configuration(proxyBeanMethods = false) @Import({ GenericCacheConfiguration.class, CacheManagerCustomizersConfiguration.class }) static class GenericCacheAndCustomizersConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableCaching @Import({ HazelcastAutoConfiguration.class, CacheManagerCustomizersConfiguration.class }) @@ -842,7 +842,7 @@ public class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationT } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableCaching static class CouchbaseCacheConfiguration { @@ -856,14 +856,14 @@ public class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationT } - @Configuration + @Configuration(proxyBeanMethods = false) @Import({ CouchbaseCacheConfiguration.class, CacheManagerCustomizersConfiguration.class }) static class CouchbaseCacheAndCustomizersConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableCaching static class RedisConfiguration { @@ -874,7 +874,7 @@ public class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationT } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(RedisConfiguration.class) static class RedisWithCacheConfigurationConfiguration { @@ -887,13 +887,13 @@ public class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationT } - @Configuration + @Configuration(proxyBeanMethods = false) @Import({ RedisConfiguration.class, CacheManagerCustomizersConfiguration.class }) static class RedisWithCustomizersConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableCaching static class JCacheCustomConfiguration { @@ -904,7 +904,7 @@ public class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationT } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableCaching static class JCacheCustomCacheManager { @@ -917,7 +917,7 @@ public class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationT } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableCaching static class JCacheWithCustomizerConfiguration { @@ -935,7 +935,7 @@ public class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationT } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableCaching static class EhCacheCustomCacheManager { @@ -950,7 +950,7 @@ public class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationT } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableCaching static class HazelcastCustomHazelcastInstance { @@ -961,7 +961,7 @@ public class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationT } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableCaching static class InfinispanCustomConfiguration { @@ -974,7 +974,7 @@ public class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationT } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableCaching static class CustomCacheManagerConfiguration { @@ -985,7 +985,7 @@ public class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationT } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableCaching static class CustomCacheManagerFromSupportConfiguration extends CachingConfigurerSupport { @@ -999,7 +999,7 @@ public class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationT } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableCaching static class CustomCacheResolverFromSupportConfiguration extends CachingConfigurerSupport { @@ -1014,7 +1014,7 @@ public class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationT } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableCaching static class SpecificCacheResolverConfiguration { @@ -1025,7 +1025,7 @@ public class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationT } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableCaching static class CaffeineCacheBuilderConfiguration { @@ -1036,7 +1036,7 @@ public class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationT } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableCaching static class CaffeineCacheSpecConfiguration { @@ -1047,7 +1047,7 @@ public class CacheAutoConfigurationTests extends AbstractCacheAutoConfigurationT } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableCaching static class CacheManagerPostProcessorConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationTests.java index b5aaf4ea882..c6f75303c91 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -115,7 +115,7 @@ public class CassandraAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class MockCustomizerConfig { @Bean @@ -125,7 +125,7 @@ public class CassandraAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class SimpleCustomizerConfig { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AbstractNestedConditionTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AbstractNestedConditionTests.java index 98f15a08321..e35b4484417 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AbstractNestedConditionTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AbstractNestedConditionTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -67,7 +67,7 @@ public class AbstractNestedConditionTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) @Conditional(ValidNestedCondition.class) public static class ValidConfig { @@ -97,7 +97,7 @@ public class AbstractNestedConditionTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Conditional(InvalidNestedCondition.class) public static class InvalidConfig { @@ -127,7 +127,7 @@ public class AbstractNestedConditionTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Conditional(DoubleNestedCondition.class) public static class DoubleNestedConfig { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AllNestedConditionsTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AllNestedConditionsTests.java index 3d443a97994..f325110708f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AllNestedConditionsTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AllNestedConditionsTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -71,7 +71,7 @@ public class AllNestedConditionsTests { }; } - @Configuration + @Configuration(proxyBeanMethods = false) @Conditional(OnPropertyAAndBCondition.class) public static class Config { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AnyNestedConditionTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AnyNestedConditionTests.java index 6d1a9d2823c..c47234e3ecf 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AnyNestedConditionTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AnyNestedConditionTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -74,7 +74,7 @@ public class AnyNestedConditionTests { }; } - @Configuration + @Configuration(proxyBeanMethods = false) @Conditional(OnPropertyAorBCondition.class) public static class Config { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReportTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReportTests.java index 54b1e3416ed..65e15c63cd5 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReportTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReportTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -278,24 +278,24 @@ public class ConditionEvaluationReportTests { return numberOfOutcomesAdded; } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(WebMvcAutoConfiguration.class) static class Config { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(MultipartAutoConfiguration.class) static class DuplicateConfig { } - @Configuration + @Configuration(proxyBeanMethods = false) @Conditional({ ConditionEvaluationReportTests.MatchParseCondition.class, ConditionEvaluationReportTests.NoMatchBeanCondition.class }) public static class NegativeOuterConfig { - @Configuration + @Configuration(proxyBeanMethods = false) @Conditional({ ConditionEvaluationReportTests.MatchParseCondition.class }) public static class PositiveInnerConfig { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBeanTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBeanTests.java index 4b0bb1e08c3..68f89126eeb 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBeanTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBeanTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -235,7 +235,7 @@ public class ConditionalOnBeanTests { }; } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnBean(name = "foo") protected static class OnBeanNameConfiguration { @@ -246,7 +246,7 @@ public class ConditionalOnBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnBean(name = "foo", value = Date.class) protected static class OnBeanNameAndTypeConfiguration { @@ -257,7 +257,7 @@ public class ConditionalOnBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnBean(annotation = EnableScheduling.class) protected static class OnAnnotationConfiguration { @@ -268,7 +268,7 @@ public class ConditionalOnBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnBean(String.class) protected static class OnBeanClassConfiguration { @@ -279,7 +279,7 @@ public class ConditionalOnBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnBean(type = "java.lang.String") protected static class OnBeanClassNameConfiguration { @@ -290,7 +290,7 @@ public class ConditionalOnBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnBean(type = "some.type.Missing") protected static class OnBeanMissingClassConfiguration { @@ -301,7 +301,7 @@ public class ConditionalOnBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableScheduling protected static class FooConfiguration { @@ -312,26 +312,26 @@ public class ConditionalOnBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ImportResource("org/springframework/boot/autoconfigure/condition/foo.xml") protected static class XmlConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ImportResource("org/springframework/boot/autoconfigure/condition/foo.xml") @Import(OnBeanNameConfiguration.class) protected static class CombinedXmlConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(WithPropertyPlaceholderClassNameRegistrar.class) protected static class WithPropertyPlaceholderClassName { } - @Configuration + @Configuration(proxyBeanMethods = false) static class FactoryBeanConfiguration { @Bean @@ -341,7 +341,7 @@ public class ConditionalOnBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnBean(annotation = TestAnnotation.class) static class OnAnnotationWithFactoryBeanConfiguration { @@ -384,7 +384,7 @@ public class ConditionalOnBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class OriginalDefinition { @Bean @@ -394,7 +394,7 @@ public class ConditionalOnBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnBean(String.class) public static class OverridingDefinition { @@ -405,7 +405,7 @@ public class ConditionalOnBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnBean(String.class) public static class ConsumingConfiguration { @@ -414,7 +414,7 @@ public class ConditionalOnBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ParameterizedWithCustomConfig { @Bean @@ -424,7 +424,7 @@ public class ConditionalOnBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ParameterizedWithoutCustomConfig { @Bean @@ -434,7 +434,7 @@ public class ConditionalOnBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ParameterizedWithoutCustomContainerConfig { @Bean @@ -444,7 +444,7 @@ public class ConditionalOnBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ParameterizedWithCustomContainerConfig { @Bean @@ -454,7 +454,7 @@ public class ConditionalOnBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ParameterizedConditionWithValueConfig { @Bean @@ -465,7 +465,7 @@ public class ConditionalOnBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ParameterizedConditionWithReturnTypeConfig { @Bean @@ -476,7 +476,7 @@ public class ConditionalOnBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ParameterizedConditionWithReturnRegistrationTypeConfig { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnClassTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnClassTests.java index eae706fa930..11723ef26a3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnClassTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnClassTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -89,7 +89,7 @@ public class ConditionalOnClassTests { assertThat(context.getBean("bar")).isEqualTo("bar"); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(ConditionalOnClassTests.class) protected static class BasicConfiguration { @@ -100,7 +100,7 @@ public class ConditionalOnClassTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(name = "FOO") protected static class MissingConfiguration { @@ -111,7 +111,7 @@ public class ConditionalOnClassTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class FooConfiguration { @Bean @@ -121,13 +121,13 @@ public class ConditionalOnClassTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ImportResource("org/springframework/boot/autoconfigure/condition/foo.xml") protected static class XmlConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BasicConfiguration.class) @ImportResource("org/springframework/boot/autoconfigure/condition/foo.xml") protected static class CombinedXmlConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnCloudPlatformTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnCloudPlatformTests.java index 0a5b1141411..e55dc969786 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnCloudPlatformTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnCloudPlatformTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -52,7 +52,7 @@ public class ConditionalOnCloudPlatformTests { .run((context) -> assertThat(context).hasBean("foo")); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnCloudPlatform(CloudPlatform.CLOUD_FOUNDRY) static class CloudFoundryPlatformConfig { @@ -63,7 +63,7 @@ public class ConditionalOnCloudPlatformTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CloudFoundryPlatformOnMethodConfig { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnExpressionTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnExpressionTests.java index 400b0924c7e..cb48ee63c55 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnExpressionTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnExpressionTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -79,7 +79,7 @@ public class ConditionalOnExpressionTests { return metadata; } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnExpression("false") protected static class MissingConfiguration { @@ -90,7 +90,7 @@ public class ConditionalOnExpressionTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnExpression("true") protected static class BasicConfiguration { @@ -101,7 +101,7 @@ public class ConditionalOnExpressionTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnExpression("true ? null : false") protected static class NullConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJavaTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJavaTests.java index 7ae65d09a4a..5b8759f7169 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJavaTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJavaTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -121,7 +121,7 @@ public class ConditionalOnJavaTests { assertThat(outcome.isMatch()).as(outcome.getMessage()).isEqualTo(expected); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnJava(JavaVersion.NINE) static class Java9Required { @@ -132,7 +132,7 @@ public class ConditionalOnJavaTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnJava(range = Range.OLDER_THAN, value = JavaVersion.EIGHT) static class Java7Required { @@ -143,7 +143,7 @@ public class ConditionalOnJavaTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnJava(JavaVersion.EIGHT) static class Java8Required { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJndiTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJndiTests.java index c485243e4bd..ad6ec53dde8 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJndiTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJndiTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -135,7 +135,7 @@ public class ConditionalOnJndiTests { return metadata; } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnJndi static class JndiAvailableConfiguration { @@ -146,7 +146,7 @@ public class ConditionalOnJndiTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnJndi("java:/FooManager") static class JndiConditionConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java index 69bf9fbe28c..9eeb5013ffb 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -390,7 +390,7 @@ public class ConditionalOnMissingBeanTests { }; } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class OnBeanInAncestorsConfiguration { @Bean @@ -401,7 +401,7 @@ public class ConditionalOnMissingBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(name = "foo") protected static class OnBeanNameConfiguration { @@ -412,7 +412,7 @@ public class ConditionalOnMissingBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(name = "foo", value = Date.class) @ConditionalOnBean(name = "foo", value = Date.class) protected static class OnBeanNameAndTypeConfiguration { @@ -424,7 +424,7 @@ public class ConditionalOnMissingBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class FactoryBeanConfiguration { @Bean @@ -434,19 +434,19 @@ public class ConditionalOnMissingBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ComponentScan(basePackages = "org.springframework.boot.autoconfigure.condition.scan", includeFilters = @Filter(type = FilterType.ASSIGNABLE_TYPE, classes = ScannedFactoryBeanConfiguration.class)) protected static class ComponentScannedFactoryBeanBeanMethodConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ComponentScan(basePackages = "org.springframework.boot.autoconfigure.condition.scan", includeFilters = @Filter(type = FilterType.ASSIGNABLE_TYPE, classes = ScannedFactoryBeanWithBeanMethodArgumentsConfiguration.class)) protected static class ComponentScannedFactoryBeanBeanMethodWithArgumentsConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class FactoryBeanWithBeanMethodArgumentsConfiguration { @Bean @@ -457,7 +457,7 @@ public class ConditionalOnMissingBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class ConcreteFactoryBeanConfiguration { @Bean @@ -467,7 +467,7 @@ public class ConditionalOnMissingBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class UnhelpfulFactoryBeanConfiguration { @Bean @@ -478,7 +478,7 @@ public class ConditionalOnMissingBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(NonspecificFactoryBeanClassAttributeRegistrar.class) protected static class NonspecificFactoryBeanClassAttributeConfiguration { @@ -501,7 +501,7 @@ public class ConditionalOnMissingBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(NonspecificFactoryBeanClassAttributeRegistrar.class) protected static class NonspecificFactoryBeanStringAttributeConfiguration { @@ -525,7 +525,7 @@ public class ConditionalOnMissingBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(FactoryBeanRegistrar.class) protected static class RegisteredFactoryBeanConfiguration { @@ -545,13 +545,13 @@ public class ConditionalOnMissingBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ImportResource("org/springframework/boot/autoconfigure/condition/factorybean.xml") protected static class FactoryBeanXmlConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class ConditionalOnFactoryBean { @Bean @@ -562,7 +562,7 @@ public class ConditionalOnMissingBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class ConditionalOnIgnoredSubclass { @Bean @@ -573,7 +573,7 @@ public class ConditionalOnMissingBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class ConditionalOnIgnoredSubclassByName { @Bean @@ -584,7 +584,7 @@ public class ConditionalOnMissingBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class CustomExampleBeanConfiguration { @Bean @@ -594,7 +594,7 @@ public class ConditionalOnMissingBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(annotation = EnableScheduling.class) protected static class OnAnnotationConfiguration { @@ -605,7 +605,7 @@ public class ConditionalOnMissingBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(annotation = TestAnnotation.class) protected static class OnAnnotationWithFactoryBeanConfiguration { @@ -616,7 +616,7 @@ public class ConditionalOnMissingBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableScheduling protected static class FooConfiguration { @@ -627,7 +627,7 @@ public class ConditionalOnMissingBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(name = "foo") protected static class HierarchyConsidered { @@ -638,7 +638,7 @@ public class ConditionalOnMissingBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingBean(name = "foo", search = SearchStrategy.CURRENT) protected static class HierarchyNotConsidered { @@ -649,7 +649,7 @@ public class ConditionalOnMissingBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class ExampleBeanConfiguration { @Bean @@ -659,7 +659,7 @@ public class ConditionalOnMissingBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class ImpliedOnBeanMethod { @Bean @@ -716,7 +716,7 @@ public class ConditionalOnMissingBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ParameterizedWithCustomConfig { @Bean @@ -726,7 +726,7 @@ public class ConditionalOnMissingBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ParameterizedWithoutCustomConfig { @Bean @@ -736,7 +736,7 @@ public class ConditionalOnMissingBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ParameterizedWithoutCustomContainerConfig { @Bean @@ -746,7 +746,7 @@ public class ConditionalOnMissingBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ParameterizedWithCustomContainerConfig { @Bean @@ -756,7 +756,7 @@ public class ConditionalOnMissingBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ParameterizedConditionWithValueConfig { @Bean @@ -767,7 +767,7 @@ public class ConditionalOnMissingBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ParameterizedConditionWithReturnTypeConfig { @Bean @@ -778,7 +778,7 @@ public class ConditionalOnMissingBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ParameterizedConditionWithReturnRegistrationTypeConfig { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanWithFilteredClasspathTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanWithFilteredClasspathTests.java index c5c810ac11f..f87df9beb1e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanWithFilteredClasspathTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanWithFilteredClasspathTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -53,7 +53,7 @@ public class ConditionalOnMissingBeanWithFilteredClasspathTests { assertThat(this.context.containsBean("foo")).isTrue(); } - @Configuration + @Configuration(proxyBeanMethods = false) static class OnBeanTypeConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingClassTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingClassTests.java index 1bad4f49bf4..ca270b8d92f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingClassTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingClassTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -49,7 +49,7 @@ public class ConditionalOnMissingClassTests { assertThat(this.context.getBean("foo")).isEqualTo("foo"); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingClass("org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClassTests") protected static class BasicConfiguration { @@ -60,7 +60,7 @@ public class ConditionalOnMissingClassTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMissingClass("FOO") protected static class MissingConfiguration { @@ -71,7 +71,7 @@ public class ConditionalOnMissingClassTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class FooConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnNotWebApplicationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnNotWebApplicationTests.java index 9de6144b7dc..869045ef74f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnNotWebApplicationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnNotWebApplicationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -62,7 +62,7 @@ public class ConditionalOnNotWebApplicationTests { .containsExactly(entry("none", "none"))); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class ReactiveApplicationConfig { @Bean @@ -77,7 +77,7 @@ public class ConditionalOnNotWebApplicationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnNotWebApplication protected static class NotWebApplicationConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnPropertyTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnPropertyTests.java index 048679684f9..28798c5ce67 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnPropertyTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnPropertyTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -261,7 +261,7 @@ public class ConditionalOnPropertyTests { .web(WebApplicationType.NONE).run(); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(name = { "property1", "property2" }) protected static class MultiplePropertiesRequiredConfiguration { @@ -272,7 +272,7 @@ public class ConditionalOnPropertyTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(prefix = "spring.", name = "the-relaxed-property") protected static class RelaxedPropertiesRequiredConfiguration { @@ -283,7 +283,7 @@ public class ConditionalOnPropertyTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(prefix = "spring", name = "property") protected static class RelaxedPropertiesRequiredConfigurationWithShortPrefix { @@ -294,7 +294,7 @@ public class ConditionalOnPropertyTests { } - @Configuration + @Configuration(proxyBeanMethods = false) // i.e ${simple.myProperty:true} @ConditionalOnProperty(prefix = "simple", name = "my-property", havingValue = "true", matchIfMissing = true) static class EnabledIfNotConfiguredOtherwiseConfig { @@ -306,7 +306,7 @@ public class ConditionalOnPropertyTests { } - @Configuration + @Configuration(proxyBeanMethods = false) // i.e ${simple.myProperty:false} @ConditionalOnProperty(prefix = "simple", name = "my-property", havingValue = "true", matchIfMissing = false) static class DisabledIfNotConfiguredOtherwiseConfig { @@ -318,7 +318,7 @@ public class ConditionalOnPropertyTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(prefix = "simple", name = "my-property", havingValue = "bar") static class SimpleValueConfig { @@ -329,7 +329,7 @@ public class ConditionalOnPropertyTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(name = "simple.myProperty", havingValue = "bar", matchIfMissing = true) static class DefaultValueConfig { @@ -340,7 +340,7 @@ public class ConditionalOnPropertyTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(prefix = "simple", name = "my-property", havingValue = "bar") static class PrefixValueConfig { @@ -351,7 +351,7 @@ public class ConditionalOnPropertyTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(prefix = "simple", name = { "my-property", "my-another-property" }, havingValue = "bar") static class MultiValuesConfig { @@ -363,7 +363,7 @@ public class ConditionalOnPropertyTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnProperty("some.property") protected static class ValueAttribute { @@ -374,7 +374,7 @@ public class ConditionalOnPropertyTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnProperty protected static class NoNameOrValueAttribute { @@ -385,7 +385,7 @@ public class ConditionalOnPropertyTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "x", name = "y") protected static class NameAndValueAttribute { @@ -396,7 +396,7 @@ public class ConditionalOnPropertyTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMyFeature protected static class MetaAnnotation { @@ -407,7 +407,7 @@ public class ConditionalOnPropertyTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnMyFeature @ConditionalOnProperty(prefix = "my.other.feature", name = "enabled", havingValue = "true", matchIfMissing = false) protected static class MetaAnnotationAndDirectAnnotation { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnResourceTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnResourceTests.java index 0af999992ee..90b080ef65f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnResourceTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnResourceTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -58,7 +58,7 @@ public class ConditionalOnResourceTests { assertThat(this.context.containsBean("foo")).isFalse(); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnResource(resources = "foo") protected static class MissingConfiguration { @@ -69,7 +69,7 @@ public class ConditionalOnResourceTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnResource(resources = "schema.sql") protected static class BasicConfiguration { @@ -80,7 +80,7 @@ public class ConditionalOnResourceTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnResource(resources = "${schema}") protected static class PlaceholderConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnSingleCandidateTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnSingleCandidateTests.java index 376b6adeb9c..c025a6d3ecb 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnSingleCandidateTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnSingleCandidateTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -156,7 +156,7 @@ public class ConditionalOnSingleCandidateTests { this.context.refresh(); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnSingleCandidate(String.class) protected static class OnBeanSingleCandidateConfiguration { @@ -167,7 +167,7 @@ public class ConditionalOnSingleCandidateTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnSingleCandidate(value = String.class, search = SearchStrategy.ANCESTORS) protected static class OnBeanSingleCandidateInAncestorsConfiguration { @@ -178,19 +178,19 @@ public class ConditionalOnSingleCandidateTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnSingleCandidate(value = String.class, type = "java.lang.String") protected static class OnBeanSingleCandidateTwoTypesConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnSingleCandidate protected static class OnBeanSingleCandidateNoTypeConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class FooConfiguration { @Bean @@ -200,7 +200,7 @@ public class ConditionalOnSingleCandidateTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class FooPrimaryConfiguration { @Bean @@ -211,7 +211,7 @@ public class ConditionalOnSingleCandidateTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class BarConfiguration { @Bean @@ -221,7 +221,7 @@ public class ConditionalOnSingleCandidateTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class BarPrimaryConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnWebApplicationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnWebApplicationTests.java index 01a27f07011..1f041ccd8ce 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnWebApplicationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnWebApplicationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -88,7 +88,7 @@ public class ConditionalOnWebApplicationTests { assertThat(this.context.getBeansOfType(String.class)).isEmpty(); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication protected static class AnyWebApplicationConfiguration { @@ -99,7 +99,7 @@ public class ConditionalOnWebApplicationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.SERVLET) protected static class ServletWebApplicationConfiguration { @@ -110,7 +110,7 @@ public class ConditionalOnWebApplicationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.REACTIVE) protected static class ReactiveWebApplicationConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/NoneNestedConditionsTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/NoneNestedConditionsTests.java index e996296d65d..32c584de98b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/NoneNestedConditionsTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/NoneNestedConditionsTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -70,7 +70,7 @@ public class NoneNestedConditionsTests { return context; } - @Configuration + @Configuration(proxyBeanMethods = false) @Conditional(NeitherPropertyANorPropertyBCondition.class) public static class Config { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnBeanConditionTypeDeductionFailureTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnBeanConditionTypeDeductionFailureTests.java index b0e95570460..d9639b5ff61 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnBeanConditionTypeDeductionFailureTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnBeanConditionTypeDeductionFailureTests.java @@ -71,13 +71,13 @@ public class OnBeanConditionTypeDeductionFailureTests { return null; } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(OnMissingBeanImportSelector.class) static class ImportingConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) static class OnMissingBeanConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnPropertyListConditionTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnPropertyListConditionTests.java index d3ca046ecce..b6e3c51e312 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnPropertyListConditionTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnPropertyListConditionTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -64,7 +64,7 @@ public class OnPropertyListConditionTests { .run((context) -> assertThat(context).hasBean("foo")); } - @Configuration + @Configuration(proxyBeanMethods = false) @Conditional(TestPropertyListCondition.class) protected static class TestConfig { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ResourceConditionTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ResourceConditionTests.java index a6d8a5610e3..fdd9a3ba133 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ResourceConditionTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ResourceConditionTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -71,7 +71,7 @@ public class ResourceConditionTests { this.context = applicationContext; } - @Configuration + @Configuration(proxyBeanMethods = false) @Conditional(DefaultLocationResourceCondition.class) static class DefaultLocationConfiguration { @@ -82,7 +82,7 @@ public class ResourceConditionTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Conditional(UnknownDefaultLocationResourceCondition.class) static class UnknownDefaultLocationConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/SpringBootConditionTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/SpringBootConditionTests.java index ec19e8bba38..52c0f6974ee 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/SpringBootConditionTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/SpringBootConditionTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -53,13 +53,13 @@ public class SpringBootConditionTests { + ErrorOnMethod.class.getName() + ".myBean"); } - @Configuration + @Configuration(proxyBeanMethods = false) @Conditional(AlwaysThrowsCondition.class) public static class ErrorOnClass { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class ErrorOnMethod { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/scan/ScannedFactoryBeanConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/scan/ScannedFactoryBeanConfiguration.java index 48ad3331161..1f08e967021 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/scan/ScannedFactoryBeanConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/scan/ScannedFactoryBeanConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ import org.springframework.context.annotation.Configuration; * * @author Andy Wilkinson */ -@Configuration +@Configuration(proxyBeanMethods = false) public class ScannedFactoryBeanConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/scan/ScannedFactoryBeanWithBeanMethodArgumentsConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/scan/ScannedFactoryBeanWithBeanMethodArgumentsConfiguration.java index 869d5b39407..754ce6c3825 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/scan/ScannedFactoryBeanWithBeanMethodArgumentsConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/scan/ScannedFactoryBeanWithBeanMethodArgumentsConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ import org.springframework.context.annotation.Configuration; * * @author Andy Wilkinson */ -@Configuration +@Configuration(proxyBeanMethods = false) public class ScannedFactoryBeanWithBeanMethodArgumentsConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/ConfigurationPropertiesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/ConfigurationPropertiesAutoConfigurationTests.java index 35fac0403e7..6952a82f15c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/ConfigurationPropertiesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/ConfigurationPropertiesAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -63,7 +63,7 @@ public class ConfigurationPropertiesAutoConfigurationTests { this.context.refresh(); } - @Configuration + @Configuration(proxyBeanMethods = false) @ImportAutoConfiguration(ConfigurationPropertiesAutoConfiguration.class) static class AutoConfig { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationIntegrationTests.java index 8ad6bf7380f..68d54aa00e7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -53,7 +53,7 @@ public class MessageSourceAutoConfigurationIntegrationTests { .isEqualTo("bar"); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class Config { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationProfileTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationProfileTests.java index 6c0e11f2fb9..f0d5c11c93c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationProfileTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationProfileTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -55,7 +55,7 @@ public class MessageSourceAutoConfigurationProfileTests { .isEqualTo("bar"); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class Config { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationTests.java index 2160f9f0ec9..5431b32b1ba 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -206,13 +206,13 @@ public class MessageSourceAutoConfigurationTests { .isEqualTo("bar")); } - @Configuration + @Configuration(proxyBeanMethods = false) @PropertySource("classpath:/switch-messages.properties") protected static class Config { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class CustomMessageSourceConfiguration { @Bean @@ -222,7 +222,7 @@ public class MessageSourceAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class CustomBeanNameMessageSourceConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/PropertyPlaceholderAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/PropertyPlaceholderAutoConfigurationTests.java index 7f39bdaa645..a26898d7141 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/PropertyPlaceholderAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/PropertyPlaceholderAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -65,7 +65,7 @@ public class PropertyPlaceholderAutoConfigurationTests { .isEqualTo("spam"); } - @Configuration + @Configuration(proxyBeanMethods = false) static class PlaceholderConfig { @Value("${foo:bar}") @@ -77,7 +77,7 @@ public class PropertyPlaceholderAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class PlaceholdersOverride { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/filtersample/ExampleConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/filtersample/ExampleConfiguration.java index d33577fa168..2801e1892bc 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/filtersample/ExampleConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/filtersample/ExampleConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ package org.springframework.boot.autoconfigure.context.filtersample; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -@Configuration +@Configuration(proxyBeanMethods = false) public class ExampleConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/filtersample/ExampleFilteredAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/filtersample/ExampleFilteredAutoConfiguration.java index 5960cfe7bbe..52e330aa684 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/filtersample/ExampleFilteredAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/filtersample/ExampleFilteredAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ package org.springframework.boot.autoconfigure.context.filtersample; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -@Configuration +@Configuration(proxyBeanMethods = false) public class ExampleFilteredAutoConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationIntegrationTests.java index 6bcbf8690a8..9156ff1dec0 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -70,7 +70,7 @@ public class CouchbaseAutoConfigurationIntegrationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationTests.java index 9471a68249a..d016314b8ea 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -164,7 +164,7 @@ public class CouchbaseAutoConfigurationTests { CouchbaseProperties properties = context .getBean(CouchbaseProperties.class); DefaultCouchbaseEnvironment env = new CouchbaseConfiguration( - properties).couchbaseEnvironment(); + properties).initializeEnvironmentBuilder(properties).build(); environmentConsumer.accept(env); }); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/OnBootstrapHostsConditionTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/OnBootstrapHostsConditionTests.java index d26fdb51f53..2779d376dd0 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/OnBootstrapHostsConditionTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/OnBootstrapHostsConditionTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -53,7 +53,7 @@ public class OnBootstrapHostsConditionTests { .run((context) -> assertThat(context).hasBean("foo")); } - @Configuration + @Configuration(proxyBeanMethods = false) @Conditional(OnBootstrapHostsCondition.class) protected static class TestConfig { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfigurationTests.java index 8b545153c4e..a6b1b9c2472 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -109,7 +109,7 @@ public class PersistenceExceptionTranslationAutoConfigurationTests { () -> this.context.getBean(TestRepository.class).doSomething()); } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ConditionalOnRepositoryTypeTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ConditionalOnRepositoryTypeTests.java index ba56812cd35..68b50142f10 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ConditionalOnRepositoryTypeTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ConditionalOnRepositoryTypeTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -116,13 +116,13 @@ public class ConditionalOnRepositoryTypeTests { .run((context) -> assertThat(context).hasFailed()); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnRepositoryType(store = "test", type = RepositoryType.IMPERATIVE) protected static class ImperativeRepository { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnRepositoryType(store = "test", type = RepositoryType.REACTIVE) protected static class ReactiveRepository { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationTests.java index 1404d0cd0eb..12f47cbbaf6 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -118,14 +118,14 @@ public class CassandraDataAutoConfigurationTests { this.context = ctx; } - @Configuration + @Configuration(proxyBeanMethods = false) @ComponentScan(excludeFilters = @ComponentScan.Filter(classes = { Session.class }, type = FilterType.ASSIGNABLE_TYPE)) static class TestExcludeConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestConfiguration { @Bean @@ -135,13 +135,13 @@ public class CassandraDataAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EntityScan("org.springframework.boot.autoconfigure.data.cassandra.city") static class EntityScanConfig { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomConversionConfig { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveDataAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveDataAutoConfigurationTests.java index 08e12e88085..c369044f552 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveDataAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveDataAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -99,7 +99,7 @@ public class CassandraReactiveDataAutoConfigurationTests { this.context = ctx; } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestConfiguration { @Bean @@ -109,7 +109,7 @@ public class CassandraReactiveDataAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EntityScan("org.springframework.boot.autoconfigure.data.cassandra.city") static class EntityScanConfig { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveRepositoriesAutoConfigurationTests.java index aa771eba9eb..13b46958ff5 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveRepositoriesAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -118,7 +118,7 @@ public class CassandraReactiveRepositoriesAutoConfigurationTests { "initialEntitySet"); } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) static class TestConfiguration { @@ -129,20 +129,20 @@ public class CassandraReactiveRepositoriesAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(EmptyDataPackage.class) static class EmptyConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(CassandraReactiveRepositoriesAutoConfigurationTests.class) @EnableReactiveCassandraRepositories(basePackageClasses = ReactiveCityCassandraRepository.class) static class CustomizedConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ComponentScan(excludeFilters = @Filter(classes = { ReactiveSession.class }, type = FilterType.ASSIGNABLE_TYPE)) static class TestExcludeConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraRepositoriesAutoConfigurationTests.java index ccdad72d83b..806fab91ae8 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraRepositoriesAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -112,7 +112,7 @@ public class CassandraRepositoriesAutoConfigurationTests { "initialEntitySet"); } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) static class TestConfiguration { @@ -123,20 +123,20 @@ public class CassandraRepositoriesAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(EmptyDataPackage.class) static class EmptyConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(CassandraRepositoriesAutoConfigurationTests.class) @EnableCassandraRepositories(basePackageClasses = CityCassandraRepository.class) static class CustomizedConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ComponentScan(excludeFilters = @ComponentScan.Filter(classes = { Session.class }, type = FilterType.ASSIGNABLE_TYPE)) static class TestExcludeConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataAutoConfigurationTests.java index 96d5df9f13d..b5d58f927dc 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -161,7 +161,7 @@ public class CouchbaseDataAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(CouchbaseTestConfigurer.class) static class CustomConversionsConfig { @@ -173,7 +173,7 @@ public class CouchbaseDataAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EntityScan("org.springframework.boot.autoconfigure.data.couchbase.city") @Import(CustomCouchbaseConfiguration.class) static class EntityScanConfig { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveAndImperativeRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveAndImperativeRepositoriesAutoConfigurationTests.java index a873a20c7a4..97cdf94906b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveAndImperativeRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveAndImperativeRepositoriesAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -67,7 +67,7 @@ public class CouchbaseReactiveAndImperativeRepositoriesAutoConfigurationTests { assertThat(this.context.getBean(ReactiveCityRepository.class)).isNotNull(); } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(CouchbaseAutoConfigurationTests.class) @EnableCouchbaseRepositories(basePackageClasses = CityRepository.class) @EnableReactiveCouchbaseRepositories(basePackageClasses = ReactiveCityRepository.class) @@ -75,7 +75,7 @@ public class CouchbaseReactiveAndImperativeRepositoriesAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import({ CouchbaseTestConfigurer.class, Registrar.class }) protected static class BaseConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveDataAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveDataAutoConfigurationTests.java index 53e54c8ff7a..4fcc59f7765 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveDataAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveDataAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -136,7 +136,7 @@ public class CouchbaseReactiveDataAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(CouchbaseTestConfigurer.class) static class CustomConversionsConfig { @@ -148,7 +148,7 @@ public class CouchbaseReactiveDataAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EntityScan("org.springframework.boot.autoconfigure.data.couchbase.city") @Import(CustomCouchbaseConfiguration.class) static class EntityScanConfig { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveRepositoriesAutoConfigurationTests.java index 8260b40c13b..cc42859cc03 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveRepositoriesAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -105,21 +105,21 @@ public class CouchbaseReactiveRepositoriesAutoConfigurationTests { this.context = context; } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) @Import(CouchbaseTestConfigurer.class) static class DefaultConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(EmptyDataPackage.class) @Import(CouchbaseTestConfigurer.class) protected static class NoRepositoryConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(CouchbaseReactiveRepositoriesAutoConfigurationTests.class) @EnableCouchbaseRepositories(basePackageClasses = CityCouchbaseRepository.class) @Import(CouchbaseDataAutoConfigurationTests.CustomCouchbaseConfiguration.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseRepositoriesAutoConfigurationTests.java index a8cbda2ce8d..c1de8ee9673 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseRepositoriesAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -94,20 +94,20 @@ public class CouchbaseRepositoriesAutoConfigurationTests { this.context = context; } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) static class CouchbaseNotAvailableConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) @Import(CouchbaseTestConfigurer.class) static class DefaultConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(EmptyDataPackage.class) @Import(CouchbaseTestConfigurer.class) protected static class NoRepositoryConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchAutoConfigurationTests.java index f27902e55ba..72d13c10307 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -82,7 +82,7 @@ public class ElasticsearchAutoConfigurationTests { assertThat(connectedNodes).hasSize(1); } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java index 8bc54b69cb8..d08a94c037b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -90,19 +90,19 @@ public class ElasticsearchRepositoriesAutoConfigurationTests { "spring.data.elasticsearch.cluster-name:docker-cluster").applyTo(context); } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) protected static class TestConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(EmptyDataPackage.class) protected static class EmptyConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(ElasticsearchRepositoriesAutoConfigurationTests.class) @EnableElasticsearchRepositories(basePackageClasses = CityElasticsearchDbRepository.class) protected static class CustomizedConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfigurationTests.java index 346a22ba6d3..2d43e3c9860 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfigurationTests.java @@ -123,7 +123,7 @@ public class JdbcRepositoriesAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(EmptyDataPackage.class) protected static class EmptyConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfigurationTests.java index b3e74a1e8ef..36902ffcde1 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfigurationTests.java @@ -143,14 +143,14 @@ public class JpaRepositoriesAutoConfigurationTests { .getBootstrapExecutor()).isNull()); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableScheduling @Import(TestConfiguration.class) protected static class MultipleAsyncTaskExecutorConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(TestConfiguration.class) protected static class SingleAsyncTaskExecutorConfiguration { @@ -161,13 +161,13 @@ public class JpaRepositoriesAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) protected static class TestConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableJpaRepositories(basePackageClasses = org.springframework.boot.autoconfigure.data.alt.jpa.CityJpaRepository.class, excludeFilters = { @Filter(type = FilterType.ASSIGNABLE_TYPE, value = CityMongoDbRepository.class), @Filter(type = FilterType.ASSIGNABLE_TYPE, value = CitySolrRepository.class) }) @@ -176,7 +176,7 @@ public class JpaRepositoriesAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) // To not find any repositories @EnableJpaRepositories("foo.bar") @TestAutoConfigurationPackage(City.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/JpaWebAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/JpaWebAutoConfigurationTests.java index 0ba545f858a..d73e9a1a59e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/JpaWebAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/JpaWebAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -68,7 +68,7 @@ public class JpaWebAutoConfigurationTests { .canConvert(Long.class, City.class)).isTrue(); } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) @EnableWebMvc protected static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ldap/LdapRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ldap/LdapRepositoriesAutoConfigurationTests.java index c316bc96e30..2d1f093d5f7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ldap/LdapRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ldap/LdapRepositoriesAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -78,19 +78,19 @@ public class LdapRepositoriesAutoConfigurationTests { this.context.refresh(); } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(Person.class) protected static class TestConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(EmptyDataPackage.class) protected static class EmptyConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(LdapRepositoriesAutoConfigurationTests.class) @EnableLdapRepositories(basePackageClasses = PersonLdapRepository.class) protected static class CustomizedConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MixedMongoRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MixedMongoRepositoriesAutoConfigurationTests.java index d435901437a..648e1430449 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MixedMongoRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MixedMongoRepositoriesAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -113,7 +113,7 @@ public class MixedMongoRepositoriesAutoConfigurationTests { assertThat(this.context.getBean(CityRepository.class)).isNotNull(); } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(MongoAutoConfigurationTests.class) // Not this package or its parent @EnableMongoRepositories(basePackageClasses = Country.class) @@ -121,7 +121,7 @@ public class MixedMongoRepositoriesAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(MongoAutoConfigurationTests.class) @EnableMongoRepositories(basePackageClasses = Country.class) @EntityScan(basePackageClasses = City.class) @@ -130,7 +130,7 @@ public class MixedMongoRepositoriesAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(MongoAutoConfigurationTests.class) @EntityScan(basePackageClasses = City.class) @EnableJpaRepositories(basePackageClasses = CityRepository.class) @@ -140,14 +140,14 @@ public class MixedMongoRepositoriesAutoConfigurationTests { // In this one the Jpa repositories and the auto-configuration packages overlap, so // Mongo will try and configure the same repositories - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(CityRepository.class) @EnableJpaRepositories(basePackageClasses = CityRepository.class) protected static class OverlapConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(Registrar.class) protected static class BaseConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfigurationTests.java index 432f99c3db1..7f467fd1b2f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -202,7 +202,7 @@ public class MongoDataAutoConfigurationTests { assertThat(initialEntitySet).containsOnly(types); } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomConversionsConfig { @Bean @@ -212,13 +212,13 @@ public class MongoDataAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EntityScan("org.springframework.boot.autoconfigure.data.mongo") static class EntityScanConfig { } - @Configuration + @Configuration(proxyBeanMethods = false) static class FallbackMongoClientConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveAndBlockingRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveAndBlockingRepositoriesAutoConfigurationTests.java index 279b22815fb..9642b6ed60c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveAndBlockingRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveAndBlockingRepositoriesAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -67,7 +67,7 @@ public class MongoReactiveAndBlockingRepositoriesAutoConfigurationTests { assertThat(this.context.getBean(ReactiveCityRepository.class)).isNotNull(); } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(MongoAutoConfigurationTests.class) @EnableMongoRepositories(basePackageClasses = ReactiveCityRepository.class) @EnableReactiveMongoRepositories(basePackageClasses = ReactiveCityRepository.class) @@ -75,7 +75,7 @@ public class MongoReactiveAndBlockingRepositoriesAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(Registrar.class) protected static class BaseConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveRepositoriesAutoConfigurationTests.java index b37744de1e5..4a6e8e188b3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveRepositoriesAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -107,26 +107,26 @@ public class MongoReactiveRepositoriesAutoConfigurationTests { .doesNotHaveBean(ReactiveCityRepository.class)); } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) protected static class TestConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(EmptyDataPackage.class) protected static class EmptyConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(MongoReactiveRepositoriesAutoConfigurationTests.class) @EnableMongoRepositories(basePackageClasses = CityMongoDbRepository.class) protected static class CustomizedConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) // To not find any repositories @EnableReactiveMongoRepositories("foo.bar") @TestAutoConfigurationPackage(MongoReactiveRepositoriesAutoConfigurationTests.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoRepositoriesAutoConfigurationTests.java index 5a001ba213f..0d376067b3f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoRepositoriesAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -102,26 +102,26 @@ public class MongoRepositoriesAutoConfigurationTests { .doesNotHaveBean(CityRepository.class)); } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) protected static class TestConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(EmptyDataPackage.class) protected static class EmptyConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(MongoRepositoriesAutoConfigurationTests.class) @EnableMongoRepositories(basePackageClasses = CityMongoDbRepository.class) protected static class CustomizedConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) // To not find any repositories @EnableMongoRepositories("foo.bar") @TestAutoConfigurationPackage(MongoRepositoriesAutoConfigurationTests.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/MixedNeo4jRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/MixedNeo4jRepositoriesAutoConfigurationTests.java index 2f5553139ae..c749a5c3733 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/MixedNeo4jRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/MixedNeo4jRepositoriesAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -106,7 +106,7 @@ public class MixedNeo4jRepositoriesAutoConfigurationTests { this.context = context; } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(EmptyMarker.class) // Not this package or its parent @EnableNeo4jRepositories(basePackageClasses = Country.class) @@ -114,7 +114,7 @@ public class MixedNeo4jRepositoriesAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(EmptyMarker.class) @EnableNeo4jRepositories(basePackageClasses = Country.class) @EntityScan(basePackageClasses = City.class) @@ -123,7 +123,7 @@ public class MixedNeo4jRepositoriesAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(EmptyMarker.class) @EntityScan(basePackageClasses = City.class) @EnableJpaRepositories(basePackageClasses = CityRepository.class) @@ -133,7 +133,7 @@ public class MixedNeo4jRepositoriesAutoConfigurationTests { // In this one the Jpa repositories and the auto-configuration packages overlap, so // Neo4j will try and configure the same repositories - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(CityRepository.class) @EnableJpaRepositories(basePackageClasses = CityRepository.class) protected static class OverlapConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java index 3455a4cc88f..08011f3ce8c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java @@ -245,13 +245,13 @@ public class Neo4jDataAutoConfigurationTests { } } - @Configuration + @Configuration(proxyBeanMethods = false) @EntityScan(basePackageClasses = Country.class) static class TestConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomSessionFactory { @Bean @@ -261,7 +261,7 @@ public class Neo4jDataAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomConfiguration { @Bean @@ -272,13 +272,13 @@ public class Neo4jDataAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableBookmarkManagement static class BookmarkManagementEnabledConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) static class EventListenerConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jPropertiesTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jPropertiesTests.java index 2fbb6277393..4541da001a5 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jPropertiesTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jPropertiesTests.java @@ -199,7 +199,7 @@ public class Neo4jPropertiesTests { return this.context.getBean(Neo4jProperties.class); } - @org.springframework.context.annotation.Configuration + @org.springframework.context.annotation.Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(Neo4jProperties.class) static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfigurationTests.java index ced29400605..01bd76012d8 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -93,26 +93,26 @@ public class Neo4jRepositoriesAutoConfigurationTests { this.context.refresh(); } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) protected static class TestConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(EmptyDataPackage.class) protected static class EmptyConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(Neo4jRepositoriesAutoConfigurationTests.class) @EnableNeo4jRepositories(basePackageClasses = CityNeo4jRepository.class) protected static class CustomizedConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) // To not find any repositories @EnableNeo4jRepositories("foo.bar") @TestAutoConfigurationPackage(Neo4jRepositoriesAutoConfigurationTests.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationJedisTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationJedisTests.java index 801311f226b..12d9316ef2d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationJedisTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationJedisTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -200,7 +200,7 @@ public class RedisAutoConfigurationJedisTests { .getClusterConnection()).isNotNull()); } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomConfiguration { @Bean @@ -210,7 +210,7 @@ public class RedisAutoConfigurationJedisTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class JedisConnectionFactoryCaptorConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java index c48bd3f2f7c..9e2b665b4e3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -265,7 +265,7 @@ public class RedisAutoConfigurationTests { "clientConfiguration"); } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisRepositoriesAutoConfigurationTests.java index 69825da0e2c..492235535da 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisRepositoriesAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -85,19 +85,19 @@ public class RedisRepositoriesAutoConfigurationTests { assertThat(this.context.getBean(CityRedisRepository.class)).isNotNull(); } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) protected static class TestConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(EmptyDataPackage.class) protected static class EmptyConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(RedisRepositoriesAutoConfigurationTests.class) @EnableRedisRepositories(basePackageClasses = CityRedisRepository.class) static class CustomizedConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfigurationTests.java index f7896b37d15..d19deabdb18 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -151,7 +151,7 @@ public class RepositoryRestMvcAutoConfigurationTests { this.context = applicationContext; } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(EmbeddedDataSourceConfiguration.class) @ImportAutoConfiguration({ HibernateJpaAutoConfiguration.class, JpaRepositoriesAutoConfiguration.class, @@ -161,7 +161,7 @@ public class RepositoryRestMvcAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) @EnableWebMvc protected static class TestConfiguration { @@ -178,7 +178,7 @@ public class RepositoryRestMvcAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) @EnableWebMvc static class TestConfigurationWithObjectMapperBuilder { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfigurationTests.java index c1c5ddd51f7..142198af73b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -88,26 +88,26 @@ public class SolrRepositoriesAutoConfigurationTests { this.context.refresh(); } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) static class TestConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(EmptyDataPackage.class) static class EmptyConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(SolrRepositoriesAutoConfigurationTests.class) @EnableSolrRepositories(basePackageClasses = CitySolrRepository.class) protected static class CustomizedConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(SolrRepositoriesAutoConfigurationTests.class) // To not find any repositories @EnableSolrRepositories("foo.bar") diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzerTests.java index d14175f3313..36dc7f2e563 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzerTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzerTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -257,28 +257,28 @@ public class NoSuchBeanDefinitionFailureAnalyzerTests { return analysis; } - @Configuration + @Configuration(proxyBeanMethods = false) @ImportAutoConfiguration(TestPropertyAutoConfiguration.class) @Import(StringHandler.class) protected static class StringPropertyTypeConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ImportAutoConfiguration(TestPropertyAutoConfiguration.class) @Import(NumberHandler.class) protected static class IntegerPropertyTypeConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ImportAutoConfiguration(TestTypeClassAutoConfiguration.class) @Import(StringHandler.class) protected static class MissingClassOnAutoConfigurationConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ImportAutoConfiguration({ TestPropertyAutoConfiguration.class, TestTypeClassAutoConfiguration.class }) @Import(StringHandler.class) @@ -286,21 +286,21 @@ public class NoSuchBeanDefinitionFailureAnalyzerTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ImportAutoConfiguration(TestMissingBeanAutoConfiguration.class) @Import(StringNameHandler.class) protected static class StringMissingBeanNameConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ImportAutoConfiguration(TestNullBeanConfiguration.class) @Import(StringHandler.class) protected static class StringNullBeanConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class TestPropertyAutoConfiguration { @ConditionalOnProperty("spring.string.enabled") @@ -317,7 +317,7 @@ public class NoSuchBeanDefinitionFailureAnalyzerTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(name = "com.example.FooBar") public static class TestTypeClassAutoConfiguration { @@ -328,7 +328,7 @@ public class NoSuchBeanDefinitionFailureAnalyzerTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class TestMissingBeanAutoConfiguration { @ConditionalOnBean(Integer.class) @@ -339,7 +339,7 @@ public class NoSuchBeanDefinitionFailureAnalyzerTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class TestNullBeanConfiguration { @Bean @@ -349,7 +349,7 @@ public class NoSuchBeanDefinitionFailureAnalyzerTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class QualifiedBeanConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/domain/EntityScanPackagesTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/domain/EntityScanPackagesTests.java index 2958999470f..7e24d951d17 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/domain/EntityScanPackagesTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/domain/EntityScanPackagesTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -159,31 +159,31 @@ public class EntityScanPackagesTests { assertThat(packages.getPackageNames()).containsExactly("a", "b"); } - @Configuration + @Configuration(proxyBeanMethods = false) @EntityScan("a") static class EntityScanValueConfig { } - @Configuration + @Configuration(proxyBeanMethods = false) @EntityScan(basePackages = "b") static class EntityScanBasePackagesConfig { } - @Configuration + @Configuration(proxyBeanMethods = false) @EntityScan(value = "a", basePackages = "b") static class EntityScanValueAndBasePackagesConfig { } - @Configuration + @Configuration(proxyBeanMethods = false) @EntityScan(basePackageClasses = EntityScanPackagesTests.class) static class EntityScanBasePackageClassesConfig { } - @Configuration + @Configuration(proxyBeanMethods = false) @EntityScan static class EntityScanNoAttributesConfig { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/domain/EntityScannerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/domain/EntityScannerTests.java index 124822ac0e8..9bd67319e2d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/domain/EntityScannerTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/domain/EntityScannerTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -83,19 +83,19 @@ public class EntityScannerTests { context.close(); } - @Configuration + @Configuration(proxyBeanMethods = false) @EntityScan("org.springframework.boot.autoconfigure.domain.scan") static class ScanConfig { } - @Configuration + @Configuration(proxyBeanMethods = false) @EntityScan(basePackageClasses = EntityA.class) static class ScanAConfig { } - @Configuration + @Configuration(proxyBeanMethods = false) @EntityScan(basePackageClasses = EntityB.class) static class ScanBConfig { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestAutoConfigurationTests.java index 5f87d1a41f8..936efb55619 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -143,7 +143,7 @@ public class JestAutoConfigurationTests { } } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomJestClient { @Bean @@ -153,7 +153,7 @@ public class JestAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomGson { @Bean @@ -163,7 +163,7 @@ public class JestAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(CustomGson.class) static class BuilderCustomizer { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/rest/RestClientAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/rest/RestClientAutoConfigurationTests.java index 86b22824093..3890fb5d1f4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/rest/RestClientAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/rest/RestClientAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -94,7 +94,7 @@ public class RestClientAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomRestClientConfiguration { @Bean @@ -104,7 +104,7 @@ public class RestClientAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class BuilderCustomizerConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java index 87263c1ecc7..f570c0bd353 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java @@ -380,7 +380,7 @@ public class FlywayAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class FlywayDataSourceConfiguration { @Bean @@ -399,7 +399,7 @@ public class FlywayAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class CustomFlywayMigrationInitializer { @Bean @@ -412,7 +412,7 @@ public class FlywayAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class CustomFlywayWithJpaConfiguration { private final DataSource dataSource; @@ -454,7 +454,7 @@ public class FlywayAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CallbackConfiguration { @Bean @@ -478,7 +478,7 @@ public class FlywayAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class LegacyCallbackConfiguration { @Bean @@ -495,7 +495,7 @@ public class FlywayAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ConfigurationCustomizerConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationServletIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationServletIntegrationTests.java index a29be890c7c..b7fa585f7a5 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationServletIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationServletIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -230,14 +230,14 @@ public class FreeMarkerAutoConfigurationServletIntegrationTests { return response; } - @Configuration + @Configuration(proxyBeanMethods = false) @ImportAutoConfiguration({ FreeMarkerAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) static class BaseConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class FilterRegistrationResourceConfiguration { @@ -251,7 +251,7 @@ public class FreeMarkerAutoConfigurationServletIntegrationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class FilterRegistrationOtherConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/gson/GsonAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/gson/GsonAutoConfigurationTests.java index 57b1ac7f082..af3b064b6e3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/gson/GsonAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/gson/GsonAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -221,7 +221,7 @@ public class GsonAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class GsonBuilderCustomizerConfig { @Bean @@ -242,7 +242,7 @@ public class GsonAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class GsonBuilderConfig { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfigurationTests.java index 3614a95c7eb..393b751af14 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfigurationTests.java @@ -139,7 +139,7 @@ public class HypermediaAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableHypermediaSupport(type = HypermediaType.HAL) static class EnableHypermediaSupportConfig { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationClientTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationClientTests.java index 93b7cb3fe53..624a5a3ebb1 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationClientTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationClientTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -116,7 +116,7 @@ public class HazelcastAutoConfigurationClientTests { "Name starts with " + prefix); } - @Configuration + @Configuration(proxyBeanMethods = false) static class HazelcastServerAndClientConfig { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationServerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationServerTests.java index 59443f2b043..23153af25c4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationServerTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationServerTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -135,7 +135,7 @@ public class HazelcastAutoConfigurationServerTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class HazelcastConfigWithName { @Bean @@ -145,7 +145,7 @@ public class HazelcastAutoConfigurationServerTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class HazelcastConfigNoName { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastJpaDependencyAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastJpaDependencyAutoConfigurationTests.java index 7cc6b73b787..7b33dd0c7db 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastJpaDependencyAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastJpaDependencyAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -105,7 +105,7 @@ public class HazelcastJpaDependencyAutoConfigurationTests { return (dependsOn != null) ? Arrays.asList(dependsOn) : Collections.emptyList(); } - @Configuration + @Configuration(proxyBeanMethods = false) static class HazelcastConfiguration { @Bean @@ -115,7 +115,7 @@ public class HazelcastJpaDependencyAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class HazelcastCustomNameConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersAutoConfigurationTests.java index ec5aec969f2..a3225e516fa 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersAutoConfigurationTests.java @@ -306,7 +306,7 @@ public class HttpMessageConvertersAutoConfigurationTests { assertThat(converters.getConverters()).contains(converter); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class JacksonObjectMapperConfig { @Bean @@ -316,7 +316,7 @@ public class HttpMessageConvertersAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class JacksonObjectMapperBuilderConfig { @Bean @@ -331,7 +331,7 @@ public class HttpMessageConvertersAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class JacksonConverterConfig { @Bean @@ -344,7 +344,7 @@ public class HttpMessageConvertersAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class GsonConverterConfig { @Bean @@ -356,7 +356,7 @@ public class HttpMessageConvertersAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class JsonbConverterConfig { @Bean @@ -368,7 +368,7 @@ public class HttpMessageConvertersAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class StringConverterConfig { @Bean @@ -378,7 +378,7 @@ public class HttpMessageConvertersAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TypeConstrainedConverterConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/codec/CodecsAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/codec/CodecsAutoConfigurationTests.java index abe0bde6921..1af292c25c7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/codec/CodecsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/codec/CodecsAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -115,7 +115,7 @@ public class CodecsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ObjectMapperConfiguration { @Bean @@ -125,7 +125,7 @@ public class CodecsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CodecCustomizerConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/influx/InfluxDbAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/influx/InfluxDbAutoConfigurationTests.java index 52775d8f688..83f212d28d3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/influx/InfluxDbAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/influx/InfluxDbAutoConfigurationTests.java @@ -94,7 +94,7 @@ public class InfluxDbAutoConfigurationTests { return callFactory.readTimeoutMillis(); } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomOkHttpClientBuilderProviderConfig { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfigurationTests.java index af16c2efdba..070fc44c9b6 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -162,7 +162,7 @@ public class ProjectInfoAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomInfoPropertiesConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java index f42edc72c50..90ad09a9ece 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java @@ -216,7 +216,7 @@ public class IntegrationAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomMBeanExporter { @Bean @@ -227,7 +227,7 @@ public class IntegrationAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @IntegrationComponentScan static class CustomIntegrationComponentScanConfiguration { @@ -238,7 +238,7 @@ public class IntegrationAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class MessageSourceConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java index 6ae72f64823..433968e2115 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -490,7 +490,7 @@ public class JacksonAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class MockObjectMapperConfig { @Bean @@ -501,7 +501,7 @@ public class JacksonAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BazSerializer.class) protected static class ModuleConfig { @@ -541,7 +541,7 @@ public class JacksonAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class ParameterNamesModuleConfig { @Bean @@ -551,7 +551,7 @@ public class JacksonAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class ObjectMapperBuilderCustomConfig { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java index f16dd6f56a9..6c83c7e8c13 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -235,7 +235,7 @@ public class DataSourceAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestDataSourceConfiguration { private BasicDataSource pool; @@ -251,7 +251,7 @@ public class DataSourceAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestInitializedDataSourceConfiguration { private boolean called; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceBeanCreationFailureAnalyzerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceBeanCreationFailureAnalyzerTests.java index 9bea0d17042..90f13659a41 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceBeanCreationFailureAnalyzerTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceBeanCreationFailureAnalyzerTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -85,7 +85,7 @@ public class DataSourceBeanCreationFailureAnalyzerTests { } } - @Configuration + @Configuration(proxyBeanMethods = false) @ImportAutoConfiguration(DataSourceAutoConfiguration.class) static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerInvokerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerInvokerTests.java index 0ecb68940c4..744513b66cd 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerInvokerTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerInvokerTests.java @@ -282,7 +282,7 @@ public class DataSourceInitializerInvokerTests { return ClassUtils.addResourcePathToPackagePath(getClass(), resource); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class OneDataSource { @Bean @@ -292,7 +292,7 @@ public class DataSourceInitializerInvokerTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TwoDataSources extends OneDataSource { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfigurationTests.java index ca0952a8cfd..ba13c9d0b95 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfigurationTests.java @@ -191,7 +191,7 @@ public class DataSourceJmxConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class DataSourceProxyConfiguration { @Bean @@ -213,7 +213,7 @@ public class DataSourceJmxConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class DataSourceDelegateConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java index 3a3c6622e26..d0310c3a19d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -123,7 +123,7 @@ public class DataSourceTransactionManagerAutoConfigurationTests { assertThat(transactionManager.isRollbackOnCommitFailure()).isTrue(); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TransactionManagerConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/HikariDriverConfigurationFailureAnalyzerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/HikariDriverConfigurationFailureAnalyzerTests.java index f604e1b11a4..f87d52dd379 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/HikariDriverConfigurationFailureAnalyzerTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/HikariDriverConfigurationFailureAnalyzerTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -77,7 +77,7 @@ public class HikariDriverConfigurationFailureAnalyzerTests { } } - @Configuration + @Configuration(proxyBeanMethods = false) @ImportAutoConfiguration(DataSourceAutoConfiguration.class) static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JdbcTemplateAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JdbcTemplateAutoConfigurationTests.java index ad083edbbb3..5249b76f751 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JdbcTemplateAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JdbcTemplateAutoConfigurationTests.java @@ -234,7 +234,7 @@ public class JdbcTemplateAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomConfiguration { @Bean @@ -250,7 +250,7 @@ public class JdbcTemplateAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestDataSourceConfiguration { @Bean @@ -260,7 +260,7 @@ public class JdbcTemplateAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class MultiJdbcTemplateConfiguration { @Bean @@ -275,7 +275,7 @@ public class JdbcTemplateAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class MultiJdbcTemplateUsingPrimaryConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JndiDataSourceAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JndiDataSourceAutoConfigurationTests.java index 547e8f9a006..bc8dbc28b04 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JndiDataSourceAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JndiDataSourceAutoConfigurationTests.java @@ -162,7 +162,7 @@ public class JndiDataSourceAutoConfigurationTests { TestableInitialContextFactory.bind(name, dataSource); } - @Configuration + @Configuration(proxyBeanMethods = false) static class MBeanExporterConfiguration { @Bean @@ -172,7 +172,7 @@ public class JndiDataSourceAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class AnotherMBeanExporterConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/MultiDataSourceConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/MultiDataSourceConfiguration.java index 33bc53aa20d..13f52b40cf6 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/MultiDataSourceConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/MultiDataSourceConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -27,7 +27,7 @@ import org.springframework.context.annotation.Configuration; * @author Phillip Webb * @author Kazuki Shimizu */ -@Configuration +@Configuration(proxyBeanMethods = false) class MultiDataSourceConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/MultiDataSourceUsingPrimaryConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/MultiDataSourceUsingPrimaryConfiguration.java index ba9c39ea8b6..21519f59f99 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/MultiDataSourceUsingPrimaryConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/MultiDataSourceUsingPrimaryConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ import org.springframework.context.annotation.Primary; * @author Phillip Webb * @author Kazuki Shimizu */ -@Configuration +@Configuration(proxyBeanMethods = false) class MultiDataSourceUsingPrimaryConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java index 6d13593bbca..5414e2310eb 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -112,7 +112,7 @@ public class TomcatDataSourceConfigurationTests { assertThat(ds.getValidationInterval()).isEqualTo(3000L); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties @EnableMBeanExport protected static class TomcatDataSourceConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/XADataSourceAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/XADataSourceAutoConfigurationTests.java index 9d3819c8594..d4eaac6d4e8 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/XADataSourceAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/XADataSourceAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -81,7 +81,7 @@ public class XADataSourceAutoConfigurationTests { return context; } - @Configuration + @Configuration(proxyBeanMethods = false) static class WrapExisting { @Bean @@ -96,7 +96,7 @@ public class XADataSourceAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class FromProperties { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomApplicationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomApplicationTests.java index 0c57ff2cb20..57f20dec4df 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomApplicationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomApplicationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -77,12 +77,12 @@ public class JerseyAutoConfigurationCustomApplicationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import({ ServletWebServerFactoryAutoConfiguration.class, JerseyAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) static class TestConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) public class JerseyConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterContextPathTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterContextPathTests.java index 51b9f041774..4b2851cfafa 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterContextPathTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterContextPathTests.java @@ -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"); * you may not use this file except in compliance with the License. diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterPathTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterPathTests.java index 1f320d7528a..715d6a84051 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterPathTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterPathTests.java @@ -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"); * you may not use this file except in compliance with the License. diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomLoadOnStartupTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomLoadOnStartupTests.java index 27d44fd5687..0b1b4f3c392 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomLoadOnStartupTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomLoadOnStartupTests.java @@ -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"); * you may not use this file except in compliance with the License. diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomObjectMapperProviderTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomObjectMapperProviderTests.java index 80d7f767601..205de5f114f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomObjectMapperProviderTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomObjectMapperProviderTests.java @@ -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"); * you may not use this file except in compliance with the License. diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletContextPathTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletContextPathTests.java index cb300a19f92..82e68d5abc5 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletContextPathTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletContextPathTests.java @@ -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"); * you may not use this file except in compliance with the License. diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletPathTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletPathTests.java index b2016f78052..63e9e4d6ed0 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletPathTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletPathTests.java @@ -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"); * you may not use this file except in compliance with the License. diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultFilterPathTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultFilterPathTests.java index e4b90e02758..e2db7bbe384 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultFilterPathTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultFilterPathTests.java @@ -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"); * you may not use this file except in compliance with the License. diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultServletPathTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultServletPathTests.java index d98b4a65a72..e5013d9b56b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultServletPathTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultServletPathTests.java @@ -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"); * you may not use this file except in compliance with the License. diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationObjectMapperProviderTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationObjectMapperProviderTests.java index c78897b5192..4e375c5d01b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationObjectMapperProviderTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationObjectMapperProviderTests.java @@ -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"); * you may not use this file except in compliance with the License. diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationServletContainerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationServletContainerTests.java index 81fb7e5721d..681acba4901 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationServletContainerTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationServletContainerTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -89,7 +89,7 @@ public class JerseyAutoConfigurationServletContainerTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class ContainerConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationTests.java index c13e44975ee..6ec75f1484e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationTests.java @@ -72,7 +72,7 @@ public class JerseyAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class ResourceConfigConfiguration { @Bean @@ -82,7 +82,7 @@ public class JerseyAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class RequestContextFilterConfiguration { @Bean @@ -92,7 +92,7 @@ public class JerseyAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class RequestContextFilterRegistrationConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationWithoutApplicationPathTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationWithoutApplicationPathTests.java index 3be0df24dab..653634f9481 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationWithoutApplicationPathTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationWithoutApplicationPathTests.java @@ -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"); * you may not use this file except in compliance with the License. diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java index aeba195bab6..2845111f67c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -432,12 +432,12 @@ public class JmsAutoConfigurationTests { JmsListenerConfigUtils.JMS_LISTENER_ENDPOINT_REGISTRY_BEAN_NAME)); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TestConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TestConfiguration2 { @Bean @@ -451,7 +451,7 @@ public class JmsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TestConfiguration3 { @Bean @@ -463,7 +463,7 @@ public class JmsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TestConfiguration4 implements BeanPostProcessor { @Override @@ -484,7 +484,7 @@ public class JmsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TestConfiguration5 { @Bean @@ -497,7 +497,7 @@ public class JmsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TestConfiguration6 { @Bean @@ -510,7 +510,7 @@ public class JmsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TestConfiguration7 { @Bean @@ -520,7 +520,7 @@ public class JmsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TestConfiguration8 { @Bean @@ -530,7 +530,7 @@ public class JmsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class MessageConvertersConfiguration { @Bean @@ -546,7 +546,7 @@ public class JmsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class DestinationResolversConfiguration { @Bean @@ -562,7 +562,7 @@ public class JmsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TestConfiguration9 { @Bean @@ -578,7 +578,7 @@ public class JmsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TestConfiguration10 { @Bean @@ -593,13 +593,13 @@ public class JmsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableJms protected static class EnableJmsConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class NoEnableJmsConfiguration { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTests.java index cbf49074620..de8e0e79db9 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTests.java @@ -229,12 +229,12 @@ public class ActiveMQAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class EmptyConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomConnectionFactoryConfiguration { @Bean @@ -244,7 +244,7 @@ public class ActiveMQAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomizerConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java index a5aa850437e..f1789a77e39 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java @@ -489,12 +489,12 @@ public class ArtemisAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class EmptyConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class DestinationConfiguration { @Bean @@ -517,7 +517,7 @@ public class ArtemisAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class CustomJmsConfiguration { @Bean @@ -532,7 +532,7 @@ public class ArtemisAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class CustomArtemisConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfigurationTests.java index 61c7ba9ce24..8c6352d03b0 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfigurationTests.java @@ -144,13 +144,13 @@ public class JmxAutoConfigurationTests { assertThat(mbeanExporter).hasFieldOrPropertyWithValue("domain", "foo.my"); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableIntegrationMBeanExport(defaultDomain = "foo.my") public static class CustomJmxDomainConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class TestConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqAutoConfigurationTests.java index 927060fa032..c63927c8d3c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqAutoConfigurationTests.java @@ -207,7 +207,7 @@ public class JooqAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class JooqDataSourceConfiguration { @Bean @@ -218,7 +218,7 @@ public class JooqAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TxManagerConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqPropertiesTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqPropertiesTests.java index d6f66597471..f2af5f37013 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqPropertiesTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqPropertiesTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -116,7 +116,7 @@ public class JooqPropertiesTests { return this.context.getBean(JooqProperties.class); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(JooqProperties.class) static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationIntegrationTests.java index 35eeab6e488..e9116f2920d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationIntegrationTests.java @@ -113,7 +113,7 @@ public class KafkaAutoConfigurationIntegrationTests { return embeddedKafka.getEmbeddedKafka().getBrokersAsString(); } - @Configuration + @Configuration(proxyBeanMethods = false) static class KafkaConfig { @Bean @@ -128,7 +128,7 @@ public class KafkaAutoConfigurationIntegrationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableKafkaStreams static class KafkaStreamsConfig { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java index 96ff42dd966..c3df8a44ba8 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java @@ -604,7 +604,7 @@ public class KafkaAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class MessageConverterConfiguration { @Bean @@ -614,7 +614,7 @@ public class KafkaAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class BatchMessageConverterConfiguration { @Bean @@ -624,7 +624,7 @@ public class KafkaAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class ErrorHandlerConfiguration { @Bean @@ -634,7 +634,7 @@ public class KafkaAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TransactionManagerConfiguration { @Bean @@ -647,7 +647,7 @@ public class KafkaAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class AfterRollbackProcessorConfiguration { @Bean @@ -659,13 +659,13 @@ public class KafkaAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableKafkaStreams protected static class EnableKafkaStreamsConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TestKafkaStreamsConfiguration { @Bean(name = KafkaStreamsDefaultConfiguration.DEFAULT_STREAMS_CONFIG_BEAN_NAME) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfigurationTests.java index b62ef5a2571..054eb951372 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfigurationTests.java @@ -116,7 +116,7 @@ public class LdapAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class PooledContextSourceConfig { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfigurationTests.java index 3669137d514..d83a4c858cf 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -185,7 +185,7 @@ public class EmbeddedLdapAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class LdapClientConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java index abdc52cdb12..378550a57f1 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java @@ -319,7 +319,7 @@ public class LiquibaseAutoConfigurationTests { }; } - @Configuration + @Configuration(proxyBeanMethods = false) static class LiquibaseDataSourceConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportLoggingListenerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportLoggingListenerTests.java index 61e80f5882e..4a988657d7e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportLoggingListenerTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportLoggingListenerTests.java @@ -171,14 +171,14 @@ public class ConditionEvaluationReportLoggingListenerTests { } } - @Configuration + @Configuration(proxyBeanMethods = false) @Import({ WebMvcAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) static class Config { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(WebMvcAutoConfiguration.class) static class ErrorConfig { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfigurationTests.java index 5c5881aa41e..70171fb5f13 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -272,7 +272,7 @@ public class MailSenderAutoConfigurationTests { return session; } - @Configuration + @Configuration(proxyBeanMethods = false) static class ManualMailConfiguration { @Bean @@ -282,7 +282,7 @@ public class MailSenderAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class MockMailConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfigurationTests.java index d06994d4548..01763e2b59c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -85,7 +85,7 @@ public class MongoAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class OptionsConfig { @Bean @@ -95,13 +95,13 @@ public class MongoAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class SslOptionsConfig { @Bean - public MongoClientOptions mongoClientOptions() { + public MongoClientOptions mongoClientOptions(SocketFactory socketFactory) { return MongoClientOptions.builder().sslEnabled(true) - .socketFactory(mySocketFactory()).build(); + .socketFactory(socketFactory).build(); } @Bean @@ -111,7 +111,7 @@ public class MongoAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class FallbackMongoClientConfig { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoClientFactoryTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoClientFactoryTests.java index 416b6329779..c5de3c77183 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoClientFactoryTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoClientFactoryTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -142,7 +142,7 @@ public class MongoClientFactoryTests { assertThat(credentials.getSource()).isEqualTo(expectedSource); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(MongoProperties.class) static class Config { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoPropertiesTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoPropertiesTests.java index b831c4ce773..5a9781ebc45 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoPropertiesTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoPropertiesTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -161,7 +161,7 @@ public class MongoPropertiesTests { assertThat(serverAddress.getPort()).isEqualTo(expectedPort); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(MongoProperties.class) static class Config { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java index db6ba9a8e53..c63b7531e03 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -117,7 +117,7 @@ public class MongoReactiveAutoConfigurationTests { "wrapped"); } - @Configuration + @Configuration(proxyBeanMethods = false) static class OptionsConfig { @Bean @@ -130,13 +130,14 @@ public class MongoReactiveAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class SslOptionsConfig { @Bean - public MongoClientSettings mongoClientSettings() { + public MongoClientSettings mongoClientSettings( + StreamFactoryFactory streamFactoryFactory) { return MongoClientSettings.builder().applicationName("test-config") - .streamFactoryFactory(myStreamFactoryFactory()).build(); + .streamFactoryFactory(streamFactoryFactory).build(); } @Bean @@ -149,7 +150,7 @@ public class MongoReactiveAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class SimpleCustomizerConfig { private static final StreamFactoryFactory streamFactoryFactory = new AsynchronousSocketChannelStreamFactoryFactory.Builder() diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java index 95d36ad53ee..cabaf630628 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java @@ -237,7 +237,7 @@ public class EmbeddedMongoAutoConfigurationTests { return File.separatorChar == '\\'; } - @Configuration + @Configuration(proxyBeanMethods = false) static class MongoClientConfiguration { @Bean @@ -247,7 +247,7 @@ public class EmbeddedMongoAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class DownloadConfigBuilderCustomizerConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationReactiveIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationReactiveIntegrationTests.java index 5a362f802a6..7218ea70074 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationReactiveIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationReactiveIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -71,7 +71,7 @@ public class MustacheAutoConfigurationReactiveIntegrationTests { assertThat(result).contains("Hello App").contains("Hello World"); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import({ ReactiveWebServerFactoryAutoConfiguration.class, WebFluxAutoConfiguration.class, HttpHandlerAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationServletIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationServletIntegrationTests.java index e81800e8688..25f496bef46 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationServletIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationServletIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -97,7 +97,7 @@ public class MustacheAutoConfigurationServletIntegrationTests { assertThat(body.contains("Hello World")).isTrue(); } - @Configuration + @Configuration(proxyBeanMethods = false) @MinimalWebConfiguration @Controller public static class Application { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationTests.java index 77676acd9ca..7f503abe24d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -112,13 +112,13 @@ public class MustacheAutoConfigurationTests { this.reactiveWebContext.refresh(); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import({ MustacheAutoConfiguration.class }) protected static class BaseConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class CustomCompilerConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheStandaloneIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheStandaloneIntegrationTests.java index 1d638737189..d9c6735b38f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheStandaloneIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheStandaloneIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -73,7 +73,7 @@ public class MustacheStandaloneIntegrationTests { .isEqualTo("Hello: World"); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import({ MustacheAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected static class Application { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java index 17b7b098741..e48e328ca8f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java @@ -264,7 +264,7 @@ public abstract class AbstractJpaAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TestTwoDataSourcesConfiguration { @Bean @@ -284,7 +284,7 @@ public abstract class AbstractJpaAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestTwoDataSourcesAndPrimaryConfiguration { @Bean @@ -305,13 +305,13 @@ public abstract class AbstractJpaAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) protected static class TestConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) protected static class TestFilterConfiguration { @@ -322,7 +322,7 @@ public abstract class AbstractJpaAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) protected static class TestFilterRegistrationConfiguration { @@ -333,7 +333,7 @@ public abstract class AbstractJpaAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) protected static class TestInterceptorManualConfiguration { @@ -349,7 +349,7 @@ public abstract class AbstractJpaAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TestConfigurationWithLocalContainerEntityManagerFactoryBean extends TestConfiguration { @@ -369,7 +369,7 @@ public abstract class AbstractJpaAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TestConfigurationWithEntityManagerFactory extends TestConfiguration { @@ -397,7 +397,7 @@ public abstract class AbstractJpaAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) protected static class TestConfigurationWithTransactionManager { @@ -408,7 +408,7 @@ public abstract class AbstractJpaAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(AbstractJpaAutoConfigurationTests.class) public static class TestConfigurationWithCustomPersistenceUnitManager { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java index bb65355b300..32678ec67df 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -121,13 +121,13 @@ public class CustomHibernateJpaAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) protected static class TestConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class MockDataSourceConfiguration { @Bean @@ -146,7 +146,7 @@ public class CustomHibernateJpaAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class NamingStrategyConfiguration { static final ImplicitNamingStrategy implicitNamingStrategy = new ImplicitNamingStrategyJpaCompliantImpl(); @@ -165,7 +165,7 @@ public class CustomHibernateJpaAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class HibernatePropertiesCustomizerConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/Hibernate2ndLevelCacheIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/Hibernate2ndLevelCacheIntegrationTests.java index 5ba6de41d18..f414f0137a2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/Hibernate2ndLevelCacheIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/Hibernate2ndLevelCacheIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -60,7 +60,7 @@ public class Hibernate2ndLevelCacheIntegrationTests { .run((context) -> assertThat(context).hasNotFailed()); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableCaching static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java index 844ec4c8c73..c29098d3ecc 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -435,7 +435,7 @@ public class HibernateJpaAutoConfigurationTests return false; } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) static class TestInitializedJpaConfiguration { @@ -455,7 +455,7 @@ public class HibernateJpaAutoConfigurationTests } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestImplicitNamingStrategyConfiguration { @Bean @@ -465,7 +465,7 @@ public class HibernateJpaAutoConfigurationTests } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestPhysicalNamingStrategyConfiguration { @Bean @@ -475,7 +475,7 @@ public class HibernateJpaAutoConfigurationTests } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestHibernatePropertiesCustomizerConfiguration { private final PhysicalNamingStrategy physicalNamingStrategy = new SpringPhysicalNamingStrategy(); @@ -494,7 +494,7 @@ public class HibernateJpaAutoConfigurationTests } - @Configuration + @Configuration(proxyBeanMethods = false) static class DisableBeanContainerConfiguration { @Bean @@ -558,7 +558,7 @@ public class HibernateJpaAutoConfigurationTests } - @org.springframework.context.annotation.Configuration + @org.springframework.context.annotation.Configuration(proxyBeanMethods = false) static class JpaUsingApplicationListenerConfiguration { @Bean @@ -581,7 +581,7 @@ public class HibernateJpaAutoConfigurationTests } - @Configuration + @Configuration(proxyBeanMethods = false) static class AsyncBootstrappingConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernatePropertiesTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernatePropertiesTests.java index 1340a3627f2..5cee702d7c3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernatePropertiesTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernatePropertiesTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -176,7 +176,7 @@ public class HibernatePropertiesTests { }; } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties({ JpaProperties.class, HibernateProperties.class }) static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/JpaPropertiesTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/JpaPropertiesTests.java index 2932e389283..140ba0ed57c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/JpaPropertiesTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/JpaPropertiesTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -126,7 +126,7 @@ public class JpaPropertiesTests { }; } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(JpaProperties.class) static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/packagestest/one/FirstConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/packagestest/one/FirstConfiguration.java index 99d06f5864e..201366476c9 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/packagestest/one/FirstConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/packagestest/one/FirstConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ import org.springframework.context.annotation.Import; * * @author Oliver Gierke */ -@Configuration +@Configuration(proxyBeanMethods = false) @Import(TestRegistrar.class) public class FirstConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/packagestest/two/SecondConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/packagestest/two/SecondConfiguration.java index fc6b22582da..3ab335409fe 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/packagestest/two/SecondConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/packagestest/two/SecondConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ import org.springframework.context.annotation.Import; * * @author Oliver Gierke */ -@Configuration +@Configuration(proxyBeanMethods = false) @Import(TestRegistrar.class) public class SecondConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfigurationTests.java index c5b7b03bfb5..34e45c020ea 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -308,12 +308,12 @@ public class QuartzAutoConfigurationTests { } @Import(ComponentThatUsesScheduler.class) - @Configuration + @Configuration(proxyBeanMethods = false) protected static class BaseQuartzConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class QuartzJobsConfiguration extends BaseQuartzConfiguration { @Bean @@ -330,7 +330,7 @@ public class QuartzAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class QuartzFullConfiguration extends BaseQuartzConfiguration { @Bean @@ -340,17 +340,17 @@ public class QuartzAutoConfigurationTests { } @Bean - public Trigger fooTrigger() { + public Trigger fooTrigger(JobDetail jobDetail) { SimpleScheduleBuilder scheduleBuilder = SimpleScheduleBuilder.simpleSchedule() .withIntervalInSeconds(10).repeatForever(); - return TriggerBuilder.newTrigger().forJob(fooJob()).withIdentity("fooTrigger") - .withSchedule(scheduleBuilder).build(); + return TriggerBuilder.newTrigger().forJob(jobDetail) + .withIdentity("fooTrigger").withSchedule(scheduleBuilder).build(); } } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(QuartzFullConfiguration.class) protected static class OverwriteTriggerConfiguration extends BaseQuartzConfiguration { @@ -365,7 +365,7 @@ public class QuartzAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class QuartzCalendarsConfiguration extends BaseQuartzConfiguration { @Bean @@ -380,7 +380,7 @@ public class QuartzAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class MockExecutorConfiguration extends BaseQuartzConfiguration { @Bean @@ -390,7 +390,7 @@ public class QuartzAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class QuartzCustomConfiguration extends BaseQuartzConfiguration { @Bean @@ -401,7 +401,7 @@ public class QuartzAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class ManualSchedulerConfiguration { @Bean @@ -411,7 +411,7 @@ public class QuartzAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class MultipleDataSourceConfiguration extends BaseQuartzConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/quartz/QuartzDataSourceInitializerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/quartz/QuartzDataSourceInitializerTests.java index 83b5702c891..58b8d4c2edb 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/quartz/QuartzDataSourceInitializerTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/quartz/QuartzDataSourceInitializerTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -61,7 +61,7 @@ public class QuartzDataSourceInitializerTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(QuartzProperties.class) static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/reactive/ReactiveOAuth2ClientAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/reactive/ReactiveOAuth2ClientAutoConfigurationTests.java index 5e17730132e..87980f2ba76 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/reactive/ReactiveOAuth2ClientAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/reactive/ReactiveOAuth2ClientAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -162,7 +162,7 @@ public class ReactiveOAuth2ClientAutoConfigurationTests { .doesNotHaveBean(ReactiveOAuth2ClientAutoConfiguration.class)); } - @Configuration + @Configuration(proxyBeanMethods = false) static class ReactiveClientRepositoryConfiguration { @Bean @@ -189,7 +189,7 @@ public class ReactiveOAuth2ClientAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(ReactiveClientRepositoryConfiguration.class) static class ReactiveOAuth2AuthorizedClientServiceConfiguration { @@ -202,7 +202,7 @@ public class ReactiveOAuth2ClientAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(ReactiveOAuth2AuthorizedClientServiceConfiguration.class) static class ReactiveOAuth2AuthorizedClientRepositoryConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfigurationTests.java index 39f590e574a..b351c6dc9c0 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -200,7 +200,7 @@ public class OAuth2WebSecurityConfigurationTests { return result; } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWebSecurity protected static class TestConfig { @@ -211,7 +211,7 @@ public class OAuth2WebSecurityConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(TestConfig.class) static class ClientRegistrationRepositoryConfiguration { @@ -239,13 +239,13 @@ public class OAuth2WebSecurityConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(ClientRegistrationRepositoryConfiguration.class) static class TestWebSecurityConfigurerConfig extends WebSecurityConfigurerAdapter { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(ClientRegistrationRepositoryConfiguration.class) static class OAuth2AuthorizedClientServiceConfiguration { @@ -258,7 +258,7 @@ public class OAuth2WebSecurityConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(ClientRegistrationRepositoryConfiguration.class) static class OAuth2AuthorizedClientRepositoryConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerAutoConfigurationTests.java index 2717d5f4fcb..63de0365aa2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerAutoConfigurationTests.java @@ -236,7 +236,7 @@ public class ReactiveOAuth2ResourceServerAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class JwtDecoderConfig { @Bean @@ -246,7 +246,7 @@ public class ReactiveOAuth2ResourceServerAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class SecurityWebFilterChainConfig { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfigurationTests.java index a1aecb88245..f738746f848 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfigurationTests.java @@ -228,13 +228,13 @@ public class OAuth2ResourceServerAutoConfigurationTests { return response; } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWebSecurity static class TestConfig { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWebSecurity static class JwtDecoderConfig { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveSecurityAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveSecurityAutoConfigurationTests.java index a903745aac3..4baecd14a4e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveSecurityAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveSecurityAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -56,7 +56,7 @@ public class ReactiveSecurityAutoConfigurationTests { .isNotNull()); } - @Configuration + @Configuration(proxyBeanMethods = false) static class WebFilterChainProxyConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveUserDetailsServiceAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveUserDetailsServiceAutoConfigurationTests.java index f1e87866e85..d5446598ec6 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveUserDetailsServiceAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveUserDetailsServiceAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -128,14 +128,14 @@ public class ReactiveUserDetailsServiceAutoConfigurationTests { })); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWebFluxSecurity @EnableConfigurationProperties(SecurityProperties.class) protected static class TestSecurityConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) static class UserConfig { @Bean @@ -149,7 +149,7 @@ public class ReactiveUserDetailsServiceAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class AuthenticationManagerConfig { @Bean @@ -159,7 +159,7 @@ public class ReactiveUserDetailsServiceAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(TestSecurityConfiguration.class) protected static class TestConfigWithPasswordEncoder { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityAutoConfigurationTests.java index 79f92c0fc83..9124be0a2cf 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -197,13 +197,13 @@ public class SecurityAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) protected static class EntityConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) static class AuthenticationEventPublisherConfiguration { @Bean @@ -228,7 +228,7 @@ public class SecurityAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWebSecurity static class WebSecurity extends WebSecurityConfigurerAdapter { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityFilterAutoConfigurationEarlyInitializationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityFilterAutoConfigurationEarlyInitializationTests.java index 50d604f284f..cb117e72ec0 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityFilterAutoConfigurationEarlyInitializationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityFilterAutoConfigurationEarlyInitializationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -72,7 +72,7 @@ public class SecurityFilterAutoConfigurationEarlyInitializationTests { } } - @Configuration + @Configuration(proxyBeanMethods = false) @Import({ DeserializerBean.class, JacksonModuleBean.class, ExampleController.class, ConverterBean.class }) @ImportAutoConfiguration({ WebMvcAutoConfiguration.class, diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityFilterAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityFilterAutoConfigurationTests.java index cc9f3edae5f..c781efd813a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityFilterAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityFilterAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -50,7 +50,7 @@ public class SecurityFilterAutoConfigurationTests { } } - @Configuration + @Configuration(proxyBeanMethods = false) @Import({ DeserializerBean.class, JacksonModuleBean.class, ExampleController.class, ConverterBean.class }) @ImportAutoConfiguration({ WebMvcAutoConfiguration.class, diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityRequestMatcherProviderAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityRequestMatcherProviderAutoConfigurationTests.java index deaf49c3b52..21a2ad7b80f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityRequestMatcherProviderAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityRequestMatcherProviderAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -115,7 +115,7 @@ public class SecurityRequestMatcherProviderAutoConfigurationTests { .doesNotHaveBean(JerseyRequestMatcherProvider.class)); } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestMvcConfiguration { @Bean @@ -125,7 +125,7 @@ public class SecurityRequestMatcherProviderAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestJerseyConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/UserDetailsServiceAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/UserDetailsServiceAutoConfigurationTests.java index 1d92a7e4cb2..f72eb55af02 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/UserDetailsServiceAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/UserDetailsServiceAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -172,7 +172,7 @@ public class UserDetailsServiceAutoConfigurationTests { })); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TestAuthenticationManagerConfiguration { private AuthenticationManager authenticationManager; @@ -187,7 +187,7 @@ public class UserDetailsServiceAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TestUserDetailsServiceConfiguration { @Bean @@ -198,7 +198,7 @@ public class UserDetailsServiceAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TestAuthenticationProviderConfiguration { @Bean @@ -208,14 +208,14 @@ public class UserDetailsServiceAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWebSecurity @EnableConfigurationProperties(SecurityProperties.class) protected static class TestSecurityConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(TestSecurityConfiguration.class) protected static class TestConfigWithPasswordEncoder { @@ -226,7 +226,7 @@ public class UserDetailsServiceAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(TestSecurityConfiguration.class) protected static class TestConfigWithClientRegistrationRepository { @@ -237,7 +237,7 @@ public class UserDetailsServiceAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(TestSecurityConfiguration.class) protected static class TestConfigWithAuthenticationManagerBuilder { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/sendgrid/SendGridAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/sendgrid/SendGridAutoConfigurationTests.java index 9b397948841..5933a2d66ee 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/sendgrid/SendGridAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/sendgrid/SendGridAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -96,7 +96,7 @@ public class SendGridAutoConfigurationTests { this.context.refresh(); } - @Configuration + @Configuration(proxyBeanMethods = false) static class ManualSendGridConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationHazelcastTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationHazelcastTests.java index 83714c463bb..e333254e2c4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationHazelcastTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationHazelcastTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -98,7 +98,7 @@ public class SessionAutoConfigurationHazelcastTests }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class HazelcastConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationIntegrationTests.java index 5eb2cd3a856..3e8f7038a58 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -82,7 +82,7 @@ public class SessionAutoConfigurationIntegrationTests JdbcOperationsSessionRepository.class)); } - @Configuration + @Configuration(proxyBeanMethods = false) static class HazelcastConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationTests.java index 58ec4ea9022..338f7c932d3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -245,7 +245,7 @@ public class SessionAutoConfigurationTests extends AbstractSessionAutoConfigurat context.getBeansOfType(DefaultCookieSerializer.class)).isEmpty()); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableSpringHttpSession static class SessionRepositoryConfiguration { @@ -261,7 +261,7 @@ public class SessionAutoConfigurationTests extends AbstractSessionAutoConfigurat } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableSpringHttpSession static class UserProvidedCookieSerializerConfiguration extends SessionRepositoryConfiguration { @@ -273,7 +273,7 @@ public class SessionAutoConfigurationTests extends AbstractSessionAutoConfigurat } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableSpringHttpSession static class UserProvidedCookieHttpSessionStrategyConfiguration extends SessionRepositoryConfiguration { @@ -285,7 +285,7 @@ public class SessionAutoConfigurationTests extends AbstractSessionAutoConfigurat } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableSpringHttpSession static class UserProvidedHeaderHttpSessionStrategyConfiguration extends SessionRepositoryConfiguration { @@ -297,7 +297,7 @@ public class SessionAutoConfigurationTests extends AbstractSessionAutoConfigurat } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableSpringHttpSession static class UserProvidedCustomHttpSessionStrategyConfiguration extends SessionRepositoryConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfigurationTests.java index 7e5256401c3..818be224094 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfigurationTests.java @@ -183,7 +183,7 @@ public class TaskExecutionAutoConfigurationTests { }; } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomTaskExecutorBuilderConfig { private final TaskExecutorBuilder taskExecutorBuilder = new TaskExecutorBuilder(); @@ -195,7 +195,7 @@ public class TaskExecutionAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class TaskExecutorCustomizerConfig { @Bean @@ -205,7 +205,7 @@ public class TaskExecutionAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class TaskDecoratorConfig { @Bean @@ -215,7 +215,7 @@ public class TaskExecutionAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomTaskExecutorConfig { @Bean @@ -225,13 +225,13 @@ public class TaskExecutionAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAsync static class AsyncConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableScheduling static class SchedulingConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfigurationTests.java index 04c3dc9d313..383d2dc9763 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfigurationTests.java @@ -129,13 +129,13 @@ public class TaskSchedulingAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableScheduling static class SchedulingConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) static class TaskSchedulerConfiguration { @Bean @@ -145,7 +145,7 @@ public class TaskSchedulingAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ScheduledExecutorServiceConfiguration { @Bean @@ -155,7 +155,7 @@ public class TaskSchedulingAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class TaskSchedulerCustomizerConfiguration { @Bean @@ -166,7 +166,7 @@ public class TaskSchedulingAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class SchedulingConfigurerConfiguration implements SchedulingConfigurer { private final TaskScheduler taskScheduler = new TestTaskScheduler(); @@ -178,7 +178,7 @@ public class TaskSchedulingAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java index 6719ecf1ebe..d97a12a0a9a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -260,14 +260,14 @@ public class ThymeleafReactiveAutoConfigurationTests { this.context.refresh(); } - @Configuration + @Configuration(proxyBeanMethods = false) @ImportAutoConfiguration({ ThymeleafAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected static class BaseConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class LayoutDialectConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java index c1a212ec3e0..cc42e3fcc9a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -338,14 +338,14 @@ public class ThymeleafServletAutoConfigurationTests { this.context.refresh(); } - @Configuration + @Configuration(proxyBeanMethods = false) @ImportAutoConfiguration({ ThymeleafAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) static class BaseConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class LayoutDialectConfiguration { @@ -356,7 +356,7 @@ public class ThymeleafServletAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class FilterRegistrationResourceConfiguration { @@ -370,7 +370,7 @@ public class ThymeleafServletAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class FilterRegistrationOtherConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfigurationTests.java index ffccb0ee0ba..949f8397c4e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -156,12 +156,12 @@ public class TransactionAutoConfigurationTests { this.context = applicationContext; } - @Configuration + @Configuration(proxyBeanMethods = false) static class EmptyConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) static class SeveralTransactionManagersConfiguration { @Bean @@ -176,12 +176,13 @@ public class TransactionAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomTransactionManagerConfiguration { @Bean - public TransactionTemplate transactionTemplateFoo() { - return new TransactionTemplate(transactionManagerFoo()); + public TransactionTemplate transactionTemplateFoo( + PlatformTransactionManager transactionManager) { + return new TransactionTemplate(transactionManager); } @Bean @@ -191,7 +192,7 @@ public class TransactionAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class BaseConfiguration { @Bean @@ -206,13 +207,13 @@ public class TransactionAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class TransactionManagersConfiguration { @Bean - public DataSourceTransactionManager transactionManager() { - return new DataSourceTransactionManager(dataSource()); + public DataSourceTransactionManager transactionManager(DataSource dataSource) { + return new DataSourceTransactionManager(dataSource); } @Bean @@ -224,7 +225,7 @@ public class TransactionAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableTransactionManagement(proxyTargetClass = false) static class CustomTransactionManagementConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfigurationTests.java index ee67abce932..d1b696efec6 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -257,7 +257,7 @@ public class JtaAutoConfigurationTests { assertThat(transactionManager.isRollbackOnCommitFailure()).isTrue(); } - @Configuration + @Configuration(proxyBeanMethods = false) public static class CustomTransactionManagerConfig { @Bean @@ -267,7 +267,7 @@ public class JtaAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class PoolConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationTests.java index 58354841c99..f77a0a3103e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -221,12 +221,12 @@ public class ValidationAutoConfigurationTests { this.context = ctx; } - @Configuration + @Configuration(proxyBeanMethods = false) static class Config { } - @Configuration + @Configuration(proxyBeanMethods = false) static class UserDefinedValidatorConfig { @Bean @@ -236,7 +236,7 @@ public class ValidationAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class UserDefinedDefaultValidatorConfig { @Bean @@ -246,7 +246,7 @@ public class ValidationAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class UserDefinedJsrValidatorConfig { @Bean @@ -256,7 +256,7 @@ public class ValidationAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class UserDefinedSpringValidatorConfig { @Bean @@ -271,7 +271,7 @@ public class ValidationAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class UserDefinedPrimarySpringValidatorConfig { @Bean @@ -312,7 +312,7 @@ public class ValidationAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class AnotherSampleServiceConfiguration { @Bean @@ -322,7 +322,7 @@ public class ValidationAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class SampleConfiguration { @Bean @@ -332,7 +332,7 @@ public class ValidationAutoConfigurationTests { } - @org.springframework.context.annotation.Configuration + @org.springframework.context.annotation.Configuration(proxyBeanMethods = false) static class CustomValidatorConfiguration { CustomValidatorConfiguration(SomeService someService) { @@ -349,7 +349,7 @@ public class ValidationAutoConfigurationTests { return new TestBeanPostProcessor(); } - @Configuration + @Configuration(proxyBeanMethods = false) static class SomeServiceConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidatorAdapterTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidatorAdapterTests.java index cac7b03ad88..bf8a7e7a763 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidatorAdapterTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidatorAdapterTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -97,7 +97,7 @@ public class ValidatorAdapterTests { return this.context.getBean(ValidatorAdapter.class); } - @Configuration + @Configuration(proxyBeanMethods = false) static class LocalValidatorFactoryBeanConfig { @Bean @@ -106,13 +106,13 @@ public class ValidatorAdapterTests { } @Bean - public ValidatorAdapter wrapper() { - return new ValidatorAdapter(validator(), true); + public ValidatorAdapter wrapper(LocalValidatorFactoryBean validator) { + return new ValidatorAdapter(validator, true); } } - @Configuration + @Configuration(proxyBeanMethods = false) static class NonManagedBeanConfig { private final LocalValidatorFactoryBean validator = mock( @@ -125,7 +125,7 @@ public class ValidatorAdapterTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ManagedBeanConfig { private final LocalValidatorFactoryBean validator = mock( diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ConditionalOnEnabledResourceChainTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ConditionalOnEnabledResourceChainTests.java index 45ab7cc71a6..b55193ea073 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ConditionalOnEnabledResourceChainTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ConditionalOnEnabledResourceChainTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -76,7 +76,7 @@ public class ConditionalOnEnabledResourceChainTests { this.context.refresh(); } - @Configuration + @Configuration(proxyBeanMethods = false) static class Config { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ResourcePropertiesBindingTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ResourcePropertiesBindingTests.java index d187d2bb787..24e681bdf64 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ResourcePropertiesBindingTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ResourcePropertiesBindingTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -63,7 +63,7 @@ public class ResourcePropertiesBindingTests { }; } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(ResourceProperties.class) static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/client/RestTemplateAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/client/RestTemplateAutoConfigurationTests.java index 6d4bf7dcb73..989462e732b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/client/RestTemplateAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/client/RestTemplateAutoConfigurationTests.java @@ -144,7 +144,7 @@ public class RestTemplateAutoConfigurationTests { .doesNotHaveBean(RestTemplateBuilder.class)); } - @Configuration + @Configuration(proxyBeanMethods = false) static class RestTemplateConfig { @Bean @@ -154,7 +154,7 @@ public class RestTemplateAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class DirtyRestTemplateConfig { @Bean @@ -185,7 +185,7 @@ public class RestTemplateAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomRestTemplateBuilderConfig { @Bean @@ -196,7 +196,7 @@ public class RestTemplateAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class RestTemplateCustomizerConfig { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/HttpHandlerAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/HttpHandlerAutoConfigurationTests.java index 28e4614b4da..2f9f2d168c7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/HttpHandlerAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/HttpHandlerAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -59,7 +59,7 @@ public class HttpHandlerAutoConfigurationTests { .run((context) -> assertThat(context).hasSingleBean(HttpHandler.class)); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class CustomHttpHandler { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryAutoConfigurationTests.java index 24564084495..3c2865dc3bd 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -131,7 +131,7 @@ public class ReactiveWebServerFactoryAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class HttpHandlerConfiguration { @Bean @@ -141,7 +141,7 @@ public class ReactiveWebServerFactoryAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TooManyHttpHandlers { @Bean @@ -151,7 +151,7 @@ public class ReactiveWebServerFactoryAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class ReactiveWebServerCustomization { @Bean @@ -161,7 +161,7 @@ public class ReactiveWebServerFactoryAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class MockWebServerConfiguration { @Bean @@ -171,7 +171,7 @@ public class ReactiveWebServerFactoryAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class TomcatConnectorCustomizerConfiguration { @Bean @@ -182,7 +182,7 @@ public class ReactiveWebServerFactoryAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class TomcatContextCustomizerConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java index 8a7bb63fc7a..4255d1e38ab 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java @@ -457,7 +457,7 @@ public class WebFluxAutoConfigurationTests { return Collections.emptyMap(); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class CustomArgumentResolvers { @Bean @@ -472,7 +472,7 @@ public class WebFluxAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class CustomCodecCustomizers { @Bean @@ -482,7 +482,7 @@ public class WebFluxAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class ViewResolvers { @Bean @@ -498,7 +498,7 @@ public class WebFluxAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class Config { @Bean @@ -508,7 +508,7 @@ public class WebFluxAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class CustomHttpHandler { @Bean @@ -518,7 +518,7 @@ public class WebFluxAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class ValidatorWebFluxConfigurer implements WebFluxConfigurer { private final Validator validator = mock(Validator.class); @@ -530,7 +530,7 @@ public class WebFluxAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class ValidatorJsr303WebFluxConfigurer implements WebFluxConfigurer { private final LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); @@ -542,7 +542,7 @@ public class WebFluxAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomJsr303Validator { @Bean @@ -552,7 +552,7 @@ public class WebFluxAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomSpringValidator { @Bean @@ -562,7 +562,7 @@ public class WebFluxAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomHiddenHttpMethodFilter { @Bean @@ -572,7 +572,7 @@ public class WebFluxAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomRequestMappingHandlerAdapter { @Bean @@ -594,14 +594,14 @@ public class WebFluxAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import({ WebFluxAutoConfigurationTests.CustomRequestMappingHandlerMapping.class, WebFluxAutoConfigurationTests.CustomRequestMappingHandlerAdapter.class }) static class MultipleWebFluxRegistrations { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomRequestMappingHandlerMapping { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandlerIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandlerIntegrationTests.java index 450410cd6ba..7a92699fd4c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandlerIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandlerIntegrationTests.java @@ -317,7 +317,7 @@ public class DefaultErrorWebExceptionHandlerIntegrationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) public static class Application { @RestController diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/function/client/ClientHttpConnectorAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/function/client/ClientHttpConnectorAutoConfigurationTests.java index 56fad97f655..6570d8bff78 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/function/client/ClientHttpConnectorAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/function/client/ClientHttpConnectorAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -84,7 +84,7 @@ public class ClientHttpConnectorAutoConfigurationTests { .hasBean("customReactorResourceFactory")); } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomClientHttpConnectorConfig { @Bean @@ -94,7 +94,7 @@ public class ClientHttpConnectorAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomReactorResourceConfig { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/function/client/WebClientAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/function/client/WebClientAutoConfigurationTests.java index 14db6498c05..0fc8a653236 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/function/client/WebClientAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/function/client/WebClientAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -133,7 +133,7 @@ public class WebClientAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class CodecConfiguration { @Bean @@ -143,7 +143,7 @@ public class WebClientAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class WebClientCustomizerConfig { @Bean @@ -153,7 +153,7 @@ public class WebClientAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomWebClientBuilderConfig { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/ConditionalOnMissingFilterBeanTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/ConditionalOnMissingFilterBeanTests.java index e17b1fa724e..5b90f97058b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/ConditionalOnMissingFilterBeanTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/ConditionalOnMissingFilterBeanTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -129,7 +129,7 @@ public class ConditionalOnMissingFilterBeanTests { }; } - @Configuration + @Configuration(proxyBeanMethods = false) static class WithTestFilterConfig { @Bean @@ -139,7 +139,7 @@ public class ConditionalOnMissingFilterBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class WithoutTestFilterConfig { @Bean @@ -149,7 +149,7 @@ public class ConditionalOnMissingFilterBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class WithoutTestFilterRegistrationConfig { @Bean @@ -159,7 +159,7 @@ public class ConditionalOnMissingFilterBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class WithTestFilterRegistrationConfig { @Bean @@ -169,7 +169,7 @@ public class ConditionalOnMissingFilterBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class OnMissingWithValueConfig { @Bean @@ -180,7 +180,7 @@ public class ConditionalOnMissingFilterBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class OnMissingWithReturnTypeConfig { @Bean @@ -191,7 +191,7 @@ public class ConditionalOnMissingFilterBeanTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class OnMissingWithReturnRegistrationTypeConfig { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/DispatcherServletAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/DispatcherServletAutoConfigurationTests.java index 832956bba18..37cdeeaf63b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/DispatcherServletAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/DispatcherServletAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -204,7 +204,7 @@ public class DispatcherServletAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class MultipartConfiguration { @Bean @@ -217,7 +217,7 @@ public class DispatcherServletAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class CustomDispatcherServletDifferentName { @Bean @@ -227,7 +227,7 @@ public class DispatcherServletAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class CustomDispatcherServletPath { @Bean @@ -237,7 +237,7 @@ public class DispatcherServletAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class CustomAutowiredRegistration { @Bean @@ -256,7 +256,7 @@ public class DispatcherServletAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class NonServletConfiguration { @Bean @@ -266,7 +266,7 @@ public class DispatcherServletAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class MultipartResolverConfiguration { @Bean @@ -276,7 +276,7 @@ public class DispatcherServletAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class CustomDispatcherServletSameName { @Bean(name = DispatcherServletAutoConfiguration.DEFAULT_DISPATCHER_SERVLET_BEAN_NAME) @@ -286,7 +286,7 @@ public class DispatcherServletAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class CustomDispatcherServletRegistration { @Bean(name = DispatcherServletAutoConfiguration.DEFAULT_DISPATCHER_SERVLET_REGISTRATION_BEAN_NAME) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/FilterOrderingIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/FilterOrderingIntegrationTests.java index a1c5b562516..1a9a76c6905 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/FilterOrderingIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/FilterOrderingIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -96,7 +96,7 @@ public class FilterOrderingIntegrationTests { this.context.refresh(); } - @Configuration + @Configuration(proxyBeanMethods = false) static class MockWebServerConfiguration { @Bean @@ -111,7 +111,7 @@ public class FilterOrderingIntegrationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableSpringHttpSession static class TestSessionConfiguration { @@ -122,7 +122,7 @@ public class FilterOrderingIntegrationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestRedisConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/HttpEncodingAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/HttpEncodingAutoConfigurationTests.java index 31bcde0d68d..24f56947651 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/HttpEncodingAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/HttpEncodingAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -191,12 +191,12 @@ public class HttpEncodingAutoConfigurationTests { return applicationContext; } - @Configuration + @Configuration(proxyBeanMethods = false) static class EmptyConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) static class FilterConfiguration { @Bean @@ -209,7 +209,7 @@ public class HttpEncodingAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class OrderedConfiguration { @Bean @@ -224,7 +224,7 @@ public class HttpEncodingAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class MinimalWebAutoConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/MultipartAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/MultipartAutoConfigurationTests.java index a23ca55c545..04e693fe47d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/MultipartAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/MultipartAutoConfigurationTests.java @@ -255,12 +255,12 @@ public class MultipartAutoConfigurationTests { assertThat(restTemplate.getForObject(url, String.class)).isEqualTo("Hello"); } - @Configuration + @Configuration(proxyBeanMethods = false) public static class WebServerWithNothing { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class WebServerWithNoMultipartJetty { @Bean @@ -275,7 +275,7 @@ public class MultipartAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class WebServerWithNoMultipartUndertow { @Bean @@ -290,7 +290,7 @@ public class MultipartAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import({ ServletWebServerFactoryAutoConfiguration.class, DispatcherServletAutoConfiguration.class, MultipartAutoConfiguration.class }) @EnableConfigurationProperties(MultipartProperties.class) @@ -305,7 +305,7 @@ public class MultipartAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class WebServerWithNoMultipartTomcat { @Bean @@ -320,7 +320,7 @@ public class MultipartAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class WebServerWithEverythingJetty { @Bean @@ -340,7 +340,7 @@ public class MultipartAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWebMvc public static class WebServerWithEverythingTomcat { @@ -361,7 +361,7 @@ public class MultipartAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWebMvc public static class WebServerWithEverythingUndertow { @@ -382,7 +382,7 @@ public class MultipartAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class WebServerWithCustomMultipartResolver { @Bean @@ -392,7 +392,7 @@ public class MultipartAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class ContainerWithCommonsMultipartResolver { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryAutoConfigurationTests.java index 01ae953bee1..cfd29653c51 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -183,7 +183,7 @@ public class ServletWebServerFactoryAutoConfigurationTests { verify(factory.getServletContext()).addServlet("dispatcherServlet", servlet); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnExpression("true") public static class WebServerConfiguration { @@ -194,7 +194,7 @@ public class ServletWebServerFactoryAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class DispatcherServletConfiguration { @Bean @@ -204,7 +204,7 @@ public class ServletWebServerFactoryAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class SpringServletConfiguration { @Bean @@ -214,7 +214,7 @@ public class ServletWebServerFactoryAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class NonSpringServletConfiguration { @Bean @@ -229,7 +229,7 @@ public class ServletWebServerFactoryAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class NonServletConfiguration { @Bean @@ -239,7 +239,7 @@ public class ServletWebServerFactoryAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class DispatcherServletWithRegistrationConfiguration { @Bean(name = DispatcherServletAutoConfiguration.DEFAULT_DISPATCHER_SERVLET_BEAN_NAME) @@ -248,8 +248,9 @@ public class ServletWebServerFactoryAutoConfigurationTests { } @Bean(name = DispatcherServletAutoConfiguration.DEFAULT_DISPATCHER_SERVLET_REGISTRATION_BEAN_NAME) - public ServletRegistrationBean dispatcherRegistration() { - return new ServletRegistrationBean<>(dispatcherServlet(), "/app/*"); + public ServletRegistrationBean dispatcherRegistration( + DispatcherServlet dispatcherServlet) { + return new ServletRegistrationBean<>(dispatcherServlet, "/app/*"); } } @@ -285,7 +286,7 @@ public class ServletWebServerFactoryAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class TomcatConnectorCustomizerConfiguration { @Bean @@ -296,7 +297,7 @@ public class ServletWebServerFactoryAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class TomcatContextCustomizerConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerServletContextListenerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerServletContextListenerTests.java index 8131fa1441f..6f42013118f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerServletContextListenerTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerServletContextListenerTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -91,7 +91,7 @@ public class ServletWebServerServletContextListenerTests { context.close(); } - @Configuration + @Configuration(proxyBeanMethods = false) static class TomcatConfiguration { @Bean @@ -101,7 +101,7 @@ public class ServletWebServerServletContextListenerTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class JettyConfiguration { @Bean @@ -111,7 +111,7 @@ public class ServletWebServerServletContextListenerTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class UndertowConfiguration { @Bean @@ -121,7 +121,7 @@ public class ServletWebServerServletContextListenerTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ServletContextListenerBeanConfiguration { @Bean @@ -131,7 +131,7 @@ public class ServletWebServerServletContextListenerTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ServletListenerRegistrationBeanConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java index 04cd1765c5e..f77183d49aa 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java @@ -1003,7 +1003,7 @@ public class WebMvcAutoConfigurationTests { return Collections.emptyMap(); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class ViewConfig { @Bean @@ -1022,7 +1022,7 @@ public class WebMvcAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class WebJars implements WebMvcConfigurer { @Override @@ -1033,7 +1033,7 @@ public class WebMvcAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class AllResources implements WebMvcConfigurer { @Override @@ -1043,7 +1043,7 @@ public class WebMvcAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class Config { @Bean @@ -1058,7 +1058,7 @@ public class WebMvcAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class CustomViewResolver { @Bean @@ -1068,7 +1068,7 @@ public class WebMvcAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class CustomContentNegotiatingViewResolver { @Bean @@ -1087,7 +1087,7 @@ public class WebMvcAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomConfigurableWebBindingInitializer { @Bean @@ -1103,7 +1103,7 @@ public class WebMvcAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomFormContentFilter { @Bean @@ -1113,7 +1113,7 @@ public class WebMvcAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomRequestMappingHandlerMapping { @Bean @@ -1135,7 +1135,7 @@ public class WebMvcAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomRequestMappingHandlerAdapter { @Bean @@ -1157,14 +1157,14 @@ public class WebMvcAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import({ CustomRequestMappingHandlerMapping.class, CustomRequestMappingHandlerAdapter.class }) static class MultipleWebMvcRegistrations { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class MvcValidator implements WebMvcConfigurer { private final Validator validator = mock(Validator.class); @@ -1176,7 +1176,7 @@ public class WebMvcAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class MvcJsr303Validator implements WebMvcConfigurer { private final LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); @@ -1188,7 +1188,7 @@ public class WebMvcAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomJsr303Validator { @Bean @@ -1198,7 +1198,7 @@ public class WebMvcAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomSpringValidator { @Bean @@ -1208,7 +1208,7 @@ public class WebMvcAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomHttpMessageConverter { @Bean @@ -1219,7 +1219,7 @@ public class WebMvcAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomConfigurer implements WebMvcConfigurer { @Override @@ -1229,7 +1229,7 @@ public class WebMvcAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomApplicationTaskExecutorConfig { @Bean @@ -1239,7 +1239,7 @@ public class WebMvcAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomAsyncTaskExecutorConfig { @Bean @@ -1249,7 +1249,7 @@ public class WebMvcAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomAsyncTaskExecutorConfigurer implements WebMvcConfigurer { private final AsyncTaskExecutor taskExecutor = mock(AsyncTaskExecutor.class); @@ -1261,7 +1261,7 @@ public class WebMvcAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class RequestContextFilterConfiguration { @Bean @@ -1271,7 +1271,7 @@ public class WebMvcAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class RequestContextFilterRegistrationConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WelcomePageHandlerMappingTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WelcomePageHandlerMappingTests.java index 6d6092ad9fa..e4bfa6b7cd1 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WelcomePageHandlerMappingTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WelcomePageHandlerMappingTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -165,7 +165,7 @@ public class WelcomePageHandlerMappingTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class HandlerMappingConfiguration { @Bean @@ -185,7 +185,7 @@ public class WelcomePageHandlerMappingTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class StaticResourceConfiguration { @Bean @@ -195,7 +195,7 @@ public class WelcomePageHandlerMappingTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class TemplateConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/BasicErrorControllerDirectMockMvcTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/BasicErrorControllerDirectMockMvcTests.java index fe30c5320cd..e7f13a79481 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/BasicErrorControllerDirectMockMvcTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/BasicErrorControllerDirectMockMvcTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -131,13 +131,13 @@ public class BasicErrorControllerDirectMockMvcTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @MinimalWebConfiguration protected static class ParentConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @MinimalWebConfiguration @EnableWebMvc protected static class WebMvcIncludedConfiguration { @@ -149,7 +149,7 @@ public class BasicErrorControllerDirectMockMvcTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @MinimalWebConfiguration protected static class VanillaConfiguration { @@ -160,7 +160,7 @@ public class BasicErrorControllerDirectMockMvcTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @MinimalWebConfiguration protected static class ChildConfiguration { @@ -172,7 +172,7 @@ public class BasicErrorControllerDirectMockMvcTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAspectJAutoProxy(proxyTargetClass = false) @MinimalWebConfiguration @Aspect diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/BasicErrorControllerIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/BasicErrorControllerIntegrationTests.java index 474727646c7..1cec7a61ca6 100755 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/BasicErrorControllerIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/BasicErrorControllerIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -258,7 +258,7 @@ public class BasicErrorControllerIntegrationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @MinimalWebConfiguration @ImportAutoConfiguration(FreeMarkerAutoConfiguration.class) public static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/BasicErrorControllerMockMvcTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/BasicErrorControllerMockMvcTests.java index fb96762db5a..1f7d4e0dad2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/BasicErrorControllerMockMvcTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/BasicErrorControllerMockMvcTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -138,7 +138,7 @@ public class BasicErrorControllerMockMvcTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @MinimalWebConfiguration public static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/DefaultErrorViewIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/DefaultErrorViewIntegrationTests.java index 8069cb6d853..3218d61910d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/DefaultErrorViewIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/DefaultErrorViewIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -123,7 +123,7 @@ public class DefaultErrorViewIntegrationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @MinimalWebConfiguration public static class TestConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/RemappedErrorViewIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/RemappedErrorViewIntegrationTests.java index da991d0a7ea..425484b2044 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/RemappedErrorViewIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/RemappedErrorViewIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -73,7 +73,7 @@ public class RemappedErrorViewIntegrationTests { assertThat(content).contains("500"); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import({ PropertyPlaceholderAutoConfiguration.class, WebMvcAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, ServletWebServerFactoryAutoConfiguration.class, diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/webservices/OnWsdlLocationsConditionTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/webservices/OnWsdlLocationsConditionTests.java index 4de3a6f673f..ee859a4df7a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/webservices/OnWsdlLocationsConditionTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/webservices/OnWsdlLocationsConditionTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -54,7 +54,7 @@ public class OnWsdlLocationsConditionTests { .run((context) -> assertThat(context).hasBean("foo")); } - @Configuration + @Configuration(proxyBeanMethods = false) @Conditional(OnWsdlLocationsCondition.class) protected static class TestConfig { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/webservices/client/WebServiceTemplateAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/webservices/client/WebServiceTemplateAutoConfigurationTests.java index 8703e110fb7..bc3dc29f34f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/webservices/client/WebServiceTemplateAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/webservices/client/WebServiceTemplateAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -104,7 +104,7 @@ public class WebServiceTemplateAutoConfigurationTests { }; } - @Configuration + @Configuration(proxyBeanMethods = false) static class DirtyWebServiceTemplateConfig { @Bean @@ -137,7 +137,7 @@ public class WebServiceTemplateAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CustomWebServiceTemplateBuilderConfig { private static final Marshaller marshaller = new Jaxb2Marshaller(); @@ -149,7 +149,7 @@ public class WebServiceTemplateAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class WebServiceTemplateCustomizerConfig { private static final Unmarshaller unmarshaller = new Jaxb2Marshaller(); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/websocket/servlet/WebSocketMessagingAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/websocket/servlet/WebSocketMessagingAutoConfigurationTests.java index fbe1347b2b6..1f509f1370a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/websocket/servlet/WebSocketMessagingAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/websocket/servlet/WebSocketMessagingAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -204,7 +204,7 @@ public class WebSocketMessagingAutoConfigurationTests { return result.get(); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWebSocket @EnableConfigurationProperties @EnableWebSocketMessageBroker diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/websocket/servlet/WebSocketServletAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/websocket/servlet/WebSocketServletAutoConfigurationTests.java index 10bbc44c2d9..48021a5c82f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/websocket/servlet/WebSocketServletAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/websocket/servlet/WebSocketServletAutoConfigurationTests.java @@ -75,7 +75,7 @@ public class WebSocketServletAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CommonConfiguration { @Bean @@ -85,7 +85,7 @@ public class WebSocketServletAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class TomcatConfiguration extends CommonConfiguration { @Bean @@ -97,7 +97,7 @@ public class WebSocketServletAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class JettyConfiguration extends CommonConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-cli/samples/caching.groovy b/spring-boot-project/spring-boot-cli/samples/caching.groovy index bbabf037019..c826f56e722 100644 --- a/spring-boot-project/spring-boot-cli/samples/caching.groovy +++ b/spring-boot-project/spring-boot-cli/samples/caching.groovy @@ -2,7 +2,7 @@ package org.test import java.util.concurrent.atomic.AtomicLong -@Configuration +@Configuration(proxyBeanMethods = false) @EnableCaching class Sample { @@ -18,9 +18,9 @@ class Sample { @Autowired MyClient(MyService myService) { this.myService = myService - } + } - void run(String... args) { + void run(String... args) { long counter = myService.get('someKey') long counter2 = myService.get('someKey') if (counter == counter2) { diff --git a/spring-boot-project/spring-boot-cli/samples/jms.groovy b/spring-boot-project/spring-boot-cli/samples/jms.groovy index b10ca4eb07f..bbce82f3718 100644 --- a/spring-boot-project/spring-boot-cli/samples/jms.groovy +++ b/spring-boot-project/spring-boot-cli/samples/jms.groovy @@ -5,7 +5,7 @@ package org.test import java.util.concurrent.CountDownLatch @Log -@Configuration +@Configuration(proxyBeanMethods = false) @EnableJms class JmsExample implements CommandLineRunner { diff --git a/spring-boot-project/spring-boot-cli/samples/job.groovy b/spring-boot-project/spring-boot-cli/samples/job.groovy index 10199893b5e..f5b8b392dcd 100644 --- a/spring-boot-project/spring-boot-cli/samples/job.groovy +++ b/spring-boot-project/spring-boot-cli/samples/job.groovy @@ -1,7 +1,7 @@ package org.test @Grab("hsqldb") -@Configuration +@Configuration(proxyBeanMethods = false) @EnableBatchProcessing class JobConfig { diff --git a/spring-boot-project/spring-boot-cli/samples/rabbit.groovy b/spring-boot-project/spring-boot-cli/samples/rabbit.groovy index 70d04481f95..5723c8521b0 100644 --- a/spring-boot-project/spring-boot-cli/samples/rabbit.groovy +++ b/spring-boot-project/spring-boot-cli/samples/rabbit.groovy @@ -3,7 +3,7 @@ package org.test import java.util.concurrent.CountDownLatch @Log -@Configuration +@Configuration(proxyBeanMethods = false) @EnableRabbit class RabbitExample implements CommandLineRunner { diff --git a/spring-boot-project/spring-boot-cli/samples/tx.groovy b/spring-boot-project/spring-boot-cli/samples/tx.groovy index 0627294671d..08c5af019c6 100644 --- a/spring-boot-project/spring-boot-cli/samples/tx.groovy +++ b/spring-boot-project/spring-boot-cli/samples/tx.groovy @@ -2,7 +2,7 @@ package org.test @Grab("hsqldb") -@Configuration +@Configuration(proxyBeanMethods = false) @EnableTransactionManagement class Example implements CommandLineRunner { diff --git a/spring-boot-project/spring-boot-cli/samples/ui.groovy b/spring-boot-project/spring-boot-cli/samples/ui.groovy index 7db73adb61c..b76f82d4724 100644 --- a/spring-boot-project/spring-boot-cli/samples/ui.groovy +++ b/spring-boot-project/spring-boot-cli/samples/ui.groovy @@ -11,7 +11,7 @@ class Example { } } -@Configuration +@Configuration(proxyBeanMethods = false) @Log class MvcConfiguration extends WebMvcConfigurerAdapter { diff --git a/spring-boot-project/spring-boot-cli/test-samples/app.groovy b/spring-boot-project/spring-boot-cli/test-samples/app.groovy index 3182af1dfa2..ff7e6d66c4d 100644 --- a/spring-boot-project/spring-boot-cli/test-samples/app.groovy +++ b/spring-boot-project/spring-boot-cli/test-samples/app.groovy @@ -1,4 +1,4 @@ -@Configuration +@Configuration(proxyBeanMethods = false) class App { @Bean diff --git a/spring-boot-project/spring-boot-cli/test-samples/integration.groovy b/spring-boot-project/spring-boot-cli/test-samples/integration.groovy index 2b992a4bc89..d40a37025ee 100644 --- a/spring-boot-project/spring-boot-cli/test-samples/integration.groovy +++ b/spring-boot-project/spring-boot-cli/test-samples/integration.groovy @@ -8,7 +8,7 @@ class BookTests { } } -@Configuration +@Configuration(proxyBeanMethods = false) class Application { @Bean Book book() { diff --git a/spring-boot-project/spring-boot-cli/test-samples/jms.groovy b/spring-boot-project/spring-boot-cli/test-samples/jms.groovy index 526eeaae6d3..ad5604cb23a 100644 --- a/spring-boot-project/spring-boot-cli/test-samples/jms.groovy +++ b/spring-boot-project/spring-boot-cli/test-samples/jms.groovy @@ -3,7 +3,7 @@ import java.util.concurrent.CountDownLatch @Log -@Configuration +@Configuration(proxyBeanMethods = false) @EnableJms class JmsExample implements CommandLineRunner { diff --git a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsDataSourceAutoConfiguration.java b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsDataSourceAutoConfiguration.java index 8ab67190d98..770aca65d39 100644 --- a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsDataSourceAutoConfiguration.java +++ b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsDataSourceAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -56,7 +56,7 @@ import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; */ @AutoConfigureAfter(DataSourceAutoConfiguration.class) @Conditional(DevToolsDataSourceCondition.class) -@Configuration +@Configuration(proxyBeanMethods = false) public class DevToolsDataSourceAutoConfiguration { @Bean @@ -71,7 +71,7 @@ public class DevToolsDataSourceAutoConfiguration { * {@link javax.persistence.EntityManagerFactory} beans depend on the * {@code inMemoryDatabaseShutdownExecutor} bean. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(LocalContainerEntityManagerFactoryBean.class) @ConditionalOnBean(AbstractEntityManagerFactoryBean.class) static class DatabaseShutdownExecutorJpaDependencyConfiguration diff --git a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/EagerInitializationAutoConfiguration.java b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/EagerInitializationAutoConfiguration.java index fd023299437..a65771002ba 100644 --- a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/EagerInitializationAutoConfiguration.java +++ b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/EagerInitializationAutoConfiguration.java @@ -32,7 +32,7 @@ import org.springframework.core.Ordered; * @author Andy Wilkinson * @since 2.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) public class EagerInitializationAutoConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfiguration.java b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfiguration.java index 37178c05000..b1dec3a3dd9 100644 --- a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfiguration.java @@ -52,7 +52,7 @@ import org.springframework.util.StringUtils; * @author Vladimir Tsanev * @since 1.3.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnInitializedRestarter @EnableConfigurationProperties(DevToolsProperties.class) public class LocalDevToolsAutoConfiguration { @@ -60,7 +60,7 @@ public class LocalDevToolsAutoConfiguration { /** * Local LiveReload configuration. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(prefix = "spring.devtools.livereload", name = "enabled", matchIfMissing = true) static class LiveReloadConfiguration { @@ -89,10 +89,9 @@ public class LocalDevToolsAutoConfiguration { /** * Local Restart Configuration. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(prefix = "spring.devtools.restart", name = "enabled", matchIfMissing = true) - static class RestartConfiguration - implements ApplicationListener { + static class RestartConfiguration { private final DevToolsProperties properties; @@ -100,20 +99,25 @@ public class LocalDevToolsAutoConfiguration { this.properties = properties; } - @Override - public void onApplicationEvent(ClassPathChangedEvent event) { - if (event.isRestartRequired()) { - Restarter.getInstance().restart( - new FileWatchingFailureHandler(fileSystemWatcherFactory())); - } + @Bean + public ApplicationListener restartingClassPathChangedEventListener( + FileSystemWatcherFactory fileSystemWatcherFactory) { + return (event) -> { + if (event.isRestartRequired()) { + Restarter.getInstance().restart( + new FileWatchingFailureHandler(fileSystemWatcherFactory)); + } + }; } @Bean @ConditionalOnMissingBean - public ClassPathFileSystemWatcher classPathFileSystemWatcher() { + public ClassPathFileSystemWatcher classPathFileSystemWatcher( + FileSystemWatcherFactory fileSystemWatcherFactory, + ClassPathRestartStrategy classPathRestartStrategy) { URL[] urls = Restarter.getInstance().getInitialUrls(); ClassPathFileSystemWatcher watcher = new ClassPathFileSystemWatcher( - fileSystemWatcherFactory(), classPathRestartStrategy(), urls); + fileSystemWatcherFactory, classPathRestartStrategy, urls); watcher.setStopWatcherOnRestart(true); return watcher; } diff --git a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfiguration.java b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfiguration.java index 60d653e0ea1..775a446e230 100644 --- a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfiguration.java @@ -54,7 +54,7 @@ import org.springframework.http.server.ServerHttpRequest; * @author Andy Wilkinson * @since 1.3.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty(prefix = "spring.devtools.remote", name = "secret") @ConditionalOnClass({ Filter.class, ServerHttpRequest.class }) @EnableConfigurationProperties({ ServerProperties.class, DevToolsProperties.class }) @@ -100,7 +100,7 @@ public class RemoteDevToolsAutoConfiguration { /** * Configuration for remote update and restarts. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(prefix = "spring.devtools.remote.restart", name = "enabled", matchIfMissing = true) static class RemoteRestartConfiguration { diff --git a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/RemoteClientConfiguration.java b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/RemoteClientConfiguration.java index 4e1acd6a5df..6e8daaa28e7 100644 --- a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/RemoteClientConfiguration.java +++ b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/RemoteClientConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -67,7 +67,7 @@ import org.springframework.util.StringUtils; * @since 1.3.0 * @see org.springframework.boot.devtools.RemoteSpringApplication */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(DevToolsProperties.class) public class RemoteClientConfiguration implements InitializingBean { @@ -129,10 +129,9 @@ public class RemoteClientConfiguration implements InitializingBean { /** * LiveReload configuration. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(prefix = "spring.devtools.livereload", name = "enabled", matchIfMissing = true) - static class LiveReloadConfiguration - implements ApplicationListener { + static class LiveReloadConfiguration { @Autowired private DevToolsProperties properties; @@ -156,11 +155,15 @@ public class RemoteClientConfiguration implements InitializingBean { Restarter.getInstance().getThreadFactory()); } - @Override - public void onApplicationEvent(ClassPathChangedEvent event) { - String url = this.remoteUrl + this.properties.getRemote().getContextPath(); - this.executor.execute(new DelayedLiveReloadTrigger(optionalLiveReloadServer(), - this.clientHttpRequestFactory, url)); + @Bean + public ApplicationListener liveReloadTriggeringClassPathChangedEventListener( + OptionalLiveReloadServer optionalLiveReloadServer) { + return (event) -> { + String url = this.remoteUrl + + this.properties.getRemote().getContextPath(); + this.executor.execute(new DelayedLiveReloadTrigger( + optionalLiveReloadServer, this.clientHttpRequestFactory, url)); + }; } @Bean @@ -177,7 +180,7 @@ public class RemoteClientConfiguration implements InitializingBean { /** * Client configuration for remote update and restarts. */ - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(prefix = "spring.devtools.remote.restart", name = "enabled", matchIfMissing = true) static class RemoteRestartClientConfiguration { @@ -188,14 +191,16 @@ public class RemoteClientConfiguration implements InitializingBean { private String remoteUrl; @Bean - public ClassPathFileSystemWatcher classPathFileSystemWatcher() { + public ClassPathFileSystemWatcher classPathFileSystemWatcher( + FileSystemWatcherFactory fileSystemWatcherFactory, + ClassPathRestartStrategy classPathRestartStrategy) { DefaultRestartInitializer restartInitializer = new DefaultRestartInitializer(); URL[] urls = restartInitializer.getInitialUrls(Thread.currentThread()); if (urls == null) { urls = new URL[0]; } - return new ClassPathFileSystemWatcher(getFileSystemWatcherFactory(), - classPathRestartStrategy(), urls); + return new ClassPathFileSystemWatcher(fileSystemWatcherFactory, + classPathRestartStrategy, urls); } @Bean diff --git a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/RemoteUrlPropertyExtractorTests.java b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/RemoteUrlPropertyExtractorTests.java index 43537b3849a..909b6f41fed 100644 --- a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/RemoteUrlPropertyExtractorTests.java +++ b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/RemoteUrlPropertyExtractorTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -86,7 +86,7 @@ public class RemoteUrlPropertyExtractorTests { return application.run(args); } - @Configuration + @Configuration(proxyBeanMethods = false) static class Config { } diff --git a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/AbstractDevToolsDataSourceAutoConfigurationTests.java b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/AbstractDevToolsDataSourceAutoConfigurationTests.java index 66133741467..754a8b6441e 100644 --- a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/AbstractDevToolsDataSourceAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/AbstractDevToolsDataSourceAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -116,7 +116,7 @@ public abstract class AbstractDevToolsDataSourceAutoConfigurationTests { return context; } - @Configuration + @Configuration(proxyBeanMethods = false) static class SingleDataSourceConfiguration { @Bean @@ -126,7 +126,7 @@ public abstract class AbstractDevToolsDataSourceAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class MultipleDataSourcesConfiguration { @Bean @@ -141,7 +141,7 @@ public abstract class AbstractDevToolsDataSourceAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class DataSourceSpyConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java index 775a896b26f..e11f52b1561 100644 --- a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -271,14 +271,14 @@ public class LocalDevToolsAutoConfigurationTests { return properties; } - @Configuration + @Configuration(proxyBeanMethods = false) @Import({ ServletWebServerFactoryAutoConfiguration.class, LocalDevToolsAutoConfiguration.class, ThymeleafAutoConfiguration.class }) public static class Config { } - @Configuration + @Configuration(proxyBeanMethods = false) @ImportAutoConfiguration({ ServletWebServerFactoryAutoConfiguration.class, LocalDevToolsAutoConfiguration.class, ThymeleafAutoConfiguration.class }) public static class ConfigWithMockLiveReload { @@ -290,14 +290,14 @@ public class LocalDevToolsAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import({ ServletWebServerFactoryAutoConfiguration.class, LocalDevToolsAutoConfiguration.class, ResourceProperties.class }) public static class WebResourcesConfig { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class SessionRedisTemplateConfig { @Bean diff --git a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfigurationTests.java b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfigurationTests.java index 6ba057993d8..7dddcb99578 100644 --- a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -181,7 +181,7 @@ public class RemoteDevToolsAutoConfigurationTests { this.context.refresh(); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(RemoteDevToolsAutoConfiguration.class) static class Config { diff --git a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathFileSystemWatcherTests.java b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathFileSystemWatcherTests.java index c86cde1a869..d652ad7f1fd 100644 --- a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathFileSystemWatcherTests.java +++ b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathFileSystemWatcherTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -91,7 +91,7 @@ public class ClassPathFileSystemWatcherTests { context.close(); } - @Configuration + @Configuration(proxyBeanMethods = false) public static class Config { public final Environment environment; @@ -101,12 +101,13 @@ public class ClassPathFileSystemWatcherTests { } @Bean - public ClassPathFileSystemWatcher watcher() { + public ClassPathFileSystemWatcher watcher( + ClassPathRestartStrategy restartStrategy) { FileSystemWatcher watcher = new FileSystemWatcher(false, Duration.ofMillis(100), Duration.ofMillis(10)); URL[] urls = this.environment.getProperty("urls", URL[].class); return new ClassPathFileSystemWatcher( - new MockFileSystemWatcherFactory(watcher), restartStrategy(), urls); + new MockFileSystemWatcherFactory(watcher), restartStrategy, urls); } @Bean diff --git a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolPropertiesIntegrationTests.java b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolPropertiesIntegrationTests.java index 6b229e56810..46f4fc78157 100644 --- a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolPropertiesIntegrationTests.java +++ b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolPropertiesIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -114,18 +114,18 @@ public class DevToolPropertiesIntegrationTests { .isEqualTo(ErrorProperties.IncludeStacktrace.ALWAYS.toString()); } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnProperty("spring.h2.console.enabled") static class ClassConditionConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) static class BeanConditionConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/integrationtest/HttpTunnelIntegrationTests.java b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/integrationtest/HttpTunnelIntegrationTests.java index dfdee57e434..6582b6d28ba 100644 --- a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/integrationtest/HttpTunnelIntegrationTests.java +++ b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/integrationtest/HttpTunnelIntegrationTests.java @@ -94,7 +94,7 @@ public class HttpTunnelIntegrationTests { tunnelContext.close(); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWebMvc static class ServerConfiguration { @@ -128,7 +128,7 @@ public class HttpTunnelIntegrationTests { } - @org.springframework.context.annotation.Configuration + @org.springframework.context.annotation.Configuration(proxyBeanMethods = false) static class TunnelConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/RemoteClientConfigurationTests.java b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/RemoteClientConfigurationTests.java index e73d597333c..d60912c2137 100644 --- a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/RemoteClientConfigurationTests.java +++ b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/RemoteClientConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -160,7 +160,7 @@ public class RemoteClientConfigurationTests { this.clientContext.refresh(); } - @Configuration + @Configuration(proxyBeanMethods = false) static class Config { @Bean @@ -183,7 +183,7 @@ public class RemoteClientConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ClientConfig { @Bean diff --git a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/OnInitializedRestarterConditionTests.java b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/OnInitializedRestarterConditionTests.java index 32ffe95160b..73cbf6f79e4 100644 --- a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/OnInitializedRestarterConditionTests.java +++ b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/OnInitializedRestarterConditionTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -91,7 +91,7 @@ public class OnInitializedRestarterConditionTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class Config { @Bean diff --git a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/RestartScopeInitializerTests.java b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/RestartScopeInitializerTests.java index 6ce1a0e0d80..c767fe94b87 100644 --- a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/RestartScopeInitializerTests.java +++ b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/RestartScopeInitializerTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -59,7 +59,7 @@ public class RestartScopeInitializerTests { return application.run(); } - @Configuration + @Configuration(proxyBeanMethods = false) public static class Config { @Bean diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc index 56e08877b87..e28f7ca6e63 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc @@ -1902,7 +1902,7 @@ annotation, as shown in the following example: [source,java,indent=0,subs="verbatim,quotes,attributes"] ---- - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @EntityScan(basePackageClasses=City.class) public class Application { @@ -2082,14 +2082,14 @@ as shown in the following example: [source,java,indent=0,subs="verbatim,quotes,attributes"] ---- - @Configuration + @Configuration(proxyBeanMethods = false) @EnableJpaRepositories(basePackageClasses = Customer.class, entityManagerFactoryRef = "customerEntityManagerFactory") public class CustomerConfiguration { ... } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableJpaRepositories(basePackageClasses = Order.class, entityManagerFactoryRef = "orderEntityManagerFactory") public class OrderConfiguration { @@ -2600,7 +2600,7 @@ requests, consider adding your own `WebSecurityConfigurerAdapter` that adds the [source,java,indent=0,subs="verbatim,quotes,attributes"] ---- - @Configuration + @Configuration(proxyBeanMethods = false) public class SslWebSecurityConfigurerAdapter extends WebSecurityConfigurerAdapter { @Override diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc index 5d9e7f736d4..d9b8d9f5642 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc @@ -394,7 +394,7 @@ A typical Spring Security configuration might look something like the following [source,java,indent=0] ---- - @Configuration + @Configuration(proxyBeanMethods = false) public class ActuatorSecurity extends WebSecurityConfigurerAdapter { @Override @@ -430,7 +430,7 @@ following example: [source,java,indent=0] ---- - @Configuration + @Configuration(proxyBeanMethods = false) public class ActuatorSecurity extends WebSecurityConfigurerAdapter { @Override diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-cli.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-cli.adoc index ecafe73b92e..79934469b98 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-cli.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-cli.adoc @@ -428,7 +428,7 @@ features like middleware declarations, as shown in the following example: [source,groovy,indent=0] ---- - @Configuration + @Configuration(proxyBeanMethods = false) class Application implements CommandLineRunner { @Autowired diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index 53353566b73..aebb43dcaac 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -992,7 +992,7 @@ You also need to list the properties classes to register in the [source,java,indent=0] ---- - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(AcmeProperties.class) public class MyConfiguration { } @@ -1532,7 +1532,7 @@ example: [source,java,indent=0] ---- - @Configuration + @Configuration(proxyBeanMethods = false) @Profile("production") public class ProductionConfiguration { @@ -2221,7 +2221,7 @@ If you need to add or customize converters, you can use Spring Boot's import org.springframework.context.annotation.*; import org.springframework.http.converter.*; - @Configuration + @Configuration(proxyBeanMethods = false) public class MyConfiguration { @Bean @@ -2713,7 +2713,7 @@ defined by registering a `WebMvcConfigurer` bean with a customized [source,java,indent=0] ---- - @Configuration + @Configuration(proxyBeanMethods = false) public class MyConfiguration { @Bean @@ -2771,7 +2771,7 @@ actual handling of the requests, as shown in the following example: [source,java,indent=0] ---- - @Configuration + @Configuration(proxyBeanMethods = false) public class RoutingConfiguration { @Bean @@ -2854,7 +2854,7 @@ component, as shown in the following example: ---- import org.springframework.boot.web.codec.CodecCustomizer; - @Configuration + @Configuration(proxyBeanMethods = false) public class MyConfiguration { @Bean @@ -4871,7 +4871,7 @@ follows: [source,java,indent=0] ---- - @Configuration + @Configuration(proxyBeanMethods = false) public class SomeConfiguration { @Bean(BeanNames.COUCHBASE_CUSTOM_CONVERSIONS) @@ -5276,7 +5276,7 @@ Then you can define a `@Configuration` class to configure the extra `Bucket` and [source,java,indent=0] ---- - @Configuration + @Configuration(proxyBeanMethods = false) public class CouchbaseCacheConfiguration { private final Cluster cluster; @@ -5626,7 +5626,7 @@ For instance, the following example exposes another factory that uses a specific [source,java,indent=0] ---- - @Configuration + @Configuration(proxyBeanMethods = false) static class JmsConfiguration { @Bean @@ -5790,7 +5790,7 @@ specific `MessageConverter`: [source,java,indent=0] ---- - @Configuration + @Configuration(proxyBeanMethods = false) static class RabbitConfiguration { @Bean @@ -7867,7 +7867,7 @@ at the same level as your application, as shown in the following example: [source,java,indent=0] ---- - @Configuration + @Configuration(proxyBeanMethods = false) @EnableBatchProcessing public class BatchConfiguration { ... } ---- @@ -8232,13 +8232,13 @@ condition, as shown in the following example: [source,java,indent=0] ---- - @Configuration + @Configuration(proxyBeanMethods = false) // Some conditions public class MyAutoConfiguration { // Auto-configured beans - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(EmbeddedAcmeService.class) static class EmbeddedConfiguration { @@ -8273,7 +8273,7 @@ method, as shown in the following example: [source,java,indent=0] ---- - @Configuration + @Configuration(proxyBeanMethods = false) public class MyAutoConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc index aa5b41bdc18..ea5d46a9b28 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc @@ -472,7 +472,7 @@ as shown in the following example: import org.springframework.boot.autoconfigure.jdbc.*; import org.springframework.context.annotation.*; - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration(exclude={DataSourceAutoConfiguration.class}) public class MyConfiguration { } @@ -599,7 +599,7 @@ scan in your application: import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @Import({ MyConfig.class, MyAnotherConfig.class }) public class Application { diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/actuate/metrics/MetricsFilterBeanExample.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/actuate/metrics/MetricsFilterBeanExample.java index 7a915e2b9e8..11c68f7e6da 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/actuate/metrics/MetricsFilterBeanExample.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/actuate/metrics/MetricsFilterBeanExample.java @@ -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"); * you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ import org.springframework.context.annotation.Configuration; */ public class MetricsFilterBeanExample { - @Configuration + @Configuration(proxyBeanMethods = false) static class MetricsFilterExampleConfiguration { // tag::configuration[] diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/autoconfigure/UserServiceAutoConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/autoconfigure/UserServiceAutoConfiguration.java index a9ece58123e..e228053842d 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/autoconfigure/UserServiceAutoConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/autoconfigure/UserServiceAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -29,7 +29,7 @@ import org.springframework.context.annotation.Configuration; * * @author Stephane Nicoll */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(UserService.class) @EnableConfigurationProperties(UserProperties.class) public class UserServiceAutoConfiguration { diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/cloudfoundry/CloudFoundryCustomContextPathExample.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/cloudfoundry/CloudFoundryCustomContextPathExample.java index 10b99fe4eda..27d7e02d003 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/cloudfoundry/CloudFoundryCustomContextPathExample.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/cloudfoundry/CloudFoundryCustomContextPathExample.java @@ -41,7 +41,7 @@ import org.springframework.context.annotation.Configuration; * * @author Johnny Lim */ -@Configuration +@Configuration(proxyBeanMethods = false) public class CloudFoundryCustomContextPathExample { // tag::configuration[] diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/context/embedded/TomcatLegacyCookieProcessorExample.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/context/embedded/TomcatLegacyCookieProcessorExample.java index 63be54999b4..96b09ff6052 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/context/embedded/TomcatLegacyCookieProcessorExample.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/context/embedded/TomcatLegacyCookieProcessorExample.java @@ -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"); * you may not use this file except in compliance with the License. @@ -33,7 +33,7 @@ public class TomcatLegacyCookieProcessorExample { /** * Configuration class that declares the required {@link WebServerFactoryCustomizer}. */ - @Configuration + @Configuration(proxyBeanMethods = false) static class LegacyCookieProcessorConfiguration { // tag::customizer[] diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/elasticsearch/HibernateSearchElasticsearchExample.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/elasticsearch/HibernateSearchElasticsearchExample.java index 5ec76f3fa76..d9c4dc7eaa0 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/elasticsearch/HibernateSearchElasticsearchExample.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/elasticsearch/HibernateSearchElasticsearchExample.java @@ -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"); * you may not use this file except in compliance with the License. @@ -34,7 +34,7 @@ public class HibernateSearchElasticsearchExample { * {@link EntityManagerFactoryDependsOnPostProcessor} that ensures that * {@link EntityManagerFactory} beans depend on the {@code elasticsearchClient} bean. */ - @Configuration + @Configuration(proxyBeanMethods = false) static class ElasticsearchJpaDependencyConfiguration extends EntityManagerFactoryDependsOnPostProcessor { diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/jdbc/BasicDataSourceExample.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/jdbc/BasicDataSourceExample.java index ad9f57b4b6f..9a18705dc9e 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/jdbc/BasicDataSourceExample.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/jdbc/BasicDataSourceExample.java @@ -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"); * you may not use this file except in compliance with the License. @@ -33,7 +33,7 @@ public class BasicDataSourceExample { /** * A configuration that exposes an empty {@link DataSource}. */ - @Configuration + @Configuration(proxyBeanMethods = false) static class BasicDataSourceConfiguration { // tag::configuration[] diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/jdbc/CompleteTwoDataSourcesExample.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/jdbc/CompleteTwoDataSourcesExample.java index 15818d42a94..0a8bc83029c 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/jdbc/CompleteTwoDataSourcesExample.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/jdbc/CompleteTwoDataSourcesExample.java @@ -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"); * you may not use this file except in compliance with the License. diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/jdbc/ConfigurableDataSourceExample.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/jdbc/ConfigurableDataSourceExample.java index edf5ca61a95..54d88383113 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/jdbc/ConfigurableDataSourceExample.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/jdbc/ConfigurableDataSourceExample.java @@ -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"); * you may not use this file except in compliance with the License. @@ -37,7 +37,7 @@ public class ConfigurableDataSourceExample { * A configuration that defines dedicated settings and reuses * {@link DataSourceProperties}. */ - @Configuration + @Configuration(proxyBeanMethods = false) static class ConfigurableDataSourceConfiguration { // tag::configuration[] diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/jdbc/SimpleDataSourceExample.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/jdbc/SimpleDataSourceExample.java index 8375f9416a4..2626a22bed8 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/jdbc/SimpleDataSourceExample.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/jdbc/SimpleDataSourceExample.java @@ -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"); * you may not use this file except in compliance with the License. @@ -35,7 +35,7 @@ public class SimpleDataSourceExample { /** * A simple configuration that exposes dedicated settings. */ - @Configuration + @Configuration(proxyBeanMethods = false) static class SimpleDataSourceConfiguration { // tag::configuration[] diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/jdbc/SimpleTwoDataSourcesExample.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/jdbc/SimpleTwoDataSourcesExample.java index 4e1c431da90..407f942028f 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/jdbc/SimpleTwoDataSourcesExample.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/jdbc/SimpleTwoDataSourcesExample.java @@ -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"); * you may not use this file except in compliance with the License. diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/jpa/HibernateSecondLevelCacheExample.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/jpa/HibernateSecondLevelCacheExample.java index af661f92e55..97d587fe744 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/jpa/HibernateSecondLevelCacheExample.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/jpa/HibernateSecondLevelCacheExample.java @@ -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"); * you may not use this file except in compliance with the License. @@ -29,7 +29,7 @@ import org.springframework.context.annotation.Configuration; * @author Stephane Nicoll */ // tag::configuration[] -@Configuration +@Configuration(proxyBeanMethods = false) public class HibernateSecondLevelCacheExample { @Bean diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/kafka/KafkaStreamsBeanExample.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/kafka/KafkaStreamsBeanExample.java index 886b6865673..857d15198ba 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/kafka/KafkaStreamsBeanExample.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/kafka/KafkaStreamsBeanExample.java @@ -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"); * you may not use this file except in compliance with the License. @@ -35,7 +35,7 @@ import org.springframework.kafka.support.serializer.JsonSerde; public class KafkaStreamsBeanExample { // tag::configuration[] - @Configuration + @Configuration(proxyBeanMethods = false) @EnableKafkaStreams static class KafkaStreamsExampleConfiguration { diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/security/CustomWebFluxSecurityExample.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/security/CustomWebFluxSecurityExample.java index 9c5c9360da2..5718bf0b885 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/security/CustomWebFluxSecurityExample.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/security/CustomWebFluxSecurityExample.java @@ -27,7 +27,7 @@ import org.springframework.security.web.server.SecurityWebFilterChain; * * @author Madhura Bhave */ -@Configuration +@Configuration(proxyBeanMethods = false) public class CustomWebFluxSecurityExample { // @formatter:off diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/security/UnauthenticatedAccessExample.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/security/UnauthenticatedAccessExample.java index 2e1f939a8b0..c8897a545dd 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/security/UnauthenticatedAccessExample.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/security/UnauthenticatedAccessExample.java @@ -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"); * you may not use this file except in compliance with the License. @@ -34,7 +34,7 @@ public class UnauthenticatedAccessExample { * {@link WebSecurity} argument to customize access rules. */ // tag::configuration[] - @Configuration + @Configuration(proxyBeanMethods = false) static class WebSecurityConfiguration extends WebSecurityConfigurerAdapter { @Override diff --git a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/autoconfigure/UserServiceAutoConfigurationTests.java b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/autoconfigure/UserServiceAutoConfigurationTests.java index cefd8cdf9f0..ac3b5ea7194 100644 --- a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/autoconfigure/UserServiceAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/autoconfigure/UserServiceAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -63,12 +63,12 @@ public class UserServiceAutoConfigurationTests { this.contextRunner.withUserConfiguration(UserConfiguration.class) .run((context) -> { assertThat(context).hasSingleBean(UserService.class); - assertThat(context.getBean(UserService.class)).isSameAs( - context.getBean(UserConfiguration.class).myUserService()); + assertThat(context).getBean("myUserService") + .isSameAs(context.getBean(UserService.class)); }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class UserConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/context/embedded/TomcatLegacyCookieProcessorExampleTests.java b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/context/embedded/TomcatLegacyCookieProcessorExampleTests.java index b0ec4777a56..beeda191475 100644 --- a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/context/embedded/TomcatLegacyCookieProcessorExampleTests.java +++ b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/context/embedded/TomcatLegacyCookieProcessorExampleTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -48,7 +48,7 @@ public class TomcatLegacyCookieProcessorExampleTests { .isInstanceOf(LegacyCookieProcessor.class); } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/context/properties/bind/AppSystemPropertiesTests.java b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/context/properties/bind/AppSystemPropertiesTests.java index 4264c370e2f..2e0483630be 100644 --- a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/context/properties/bind/AppSystemPropertiesTests.java +++ b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/context/properties/bind/AppSystemPropertiesTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -84,7 +84,7 @@ public class AppSystemPropertiesTests { }; } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(AppSystemProperties.class) static class Config { diff --git a/spring-boot-project/spring-boot-properties-migrator/src/test/java/org/springframework/boot/context/properties/migrator/PropertiesMigrationListenerTests.java b/spring-boot-project/spring-boot-properties-migrator/src/test/java/org/springframework/boot/context/properties/migrator/PropertiesMigrationListenerTests.java index 39d125d3bfd..7f02a3ba37b 100644 --- a/spring-boot-project/spring-boot-properties-migrator/src/test/java/org/springframework/boot/context/properties/migrator/PropertiesMigrationListenerTests.java +++ b/spring-boot-project/spring-boot-properties-migrator/src/test/java/org/springframework/boot/context/properties/migrator/PropertiesMigrationListenerTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -59,7 +59,7 @@ public class PropertiesMigrationListenerTests { return new SpringApplication(TestApplication.class); } - @Configuration + @Configuration(proxyBeanMethods = false) public static class TestApplication { } diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfiguration.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfiguration.java index a55024255c0..67bcefd0ef2 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfiguration.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfiguration.java @@ -53,7 +53,7 @@ import org.springframework.util.ObjectUtils; * @since 1.4.0 * @see AutoConfigureTestDatabase */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureBefore(DataSourceAutoConfiguration.class) public class TestDatabaseAutoConfiguration { diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTestersAutoConfiguration.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTestersAutoConfiguration.java index d5e2ce5842c..a7ae15b8ffb 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTestersAutoConfiguration.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTestersAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -56,7 +56,7 @@ import org.springframework.util.ReflectionUtils; * @see AutoConfigureJsonTesters * @since 1.4.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(name = "org.assertj.core.api.Assert") @ConditionalOnProperty("spring.test.jsontesters.enabled") @AutoConfigureAfter({ JacksonAutoConfiguration.class, GsonAutoConfiguration.class, diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestEntityManagerAutoConfiguration.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestEntityManagerAutoConfiguration.java index 7df7a5c0e3e..016fa376a34 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestEntityManagerAutoConfiguration.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestEntityManagerAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ import org.springframework.context.annotation.Configuration; * @since 1.4.0 * @see AutoConfigureTestEntityManager */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ EntityManagerFactory.class }) @AutoConfigureAfter(HibernateJpaAutoConfiguration.class) public class TestEntityManagerAutoConfiguration { diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/restdocs/RestDocsAutoConfiguration.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/restdocs/RestDocsAutoConfiguration.java index ecef410f02d..7cd4878de35 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/restdocs/RestDocsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/restdocs/RestDocsAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -45,11 +45,11 @@ import org.springframework.restdocs.webtestclient.WebTestClientRestDocumentation * @author Roman Zaynetdinov * @since 1.4.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication public class RestDocsAutoConfiguration { - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(MockMvcRestDocumentation.class) @ConditionalOnWebApplication(type = Type.SERVLET) @EnableConfigurationProperties(RestDocsProperties.class) @@ -79,7 +79,7 @@ public class RestDocsAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ RequestSpecification.class, RestAssuredRestDocumentation.class }) @EnableConfigurationProperties(RestDocsProperties.class) @@ -106,7 +106,7 @@ public class RestDocsAutoConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(WebTestClientRestDocumentation.class) @ConditionalOnWebApplication(type = Type.REACTIVE) @EnableConfigurationProperties(RestDocsProperties.class) diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/MockRestServiceServerAutoConfiguration.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/MockRestServiceServerAutoConfiguration.java index aa0b2ce26bc..8804c5c4ec7 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/MockRestServiceServerAutoConfiguration.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/MockRestServiceServerAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -41,7 +41,7 @@ import org.springframework.web.client.RestTemplate; * @since 1.4.0 * @see AutoConfigureMockRestServiceServer */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty(prefix = "spring.test.webclient.mockrestserviceserver", name = "enabled") public class MockRestServiceServerAutoConfiguration { diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/WebClientRestTemplateAutoConfiguration.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/WebClientRestTemplateAutoConfiguration.java index 8d445787a1a..3f1771a1bd3 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/WebClientRestTemplateAutoConfiguration.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/WebClientRestTemplateAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ import org.springframework.web.client.RestTemplate; * @since 1.4.0 * @see AutoConfigureMockRestServiceServer */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty(prefix = "spring.test.webclient", name = "register-rest-template") @AutoConfigureAfter(RestTemplateAutoConfiguration.class) public class WebClientRestTemplateAutoConfiguration { diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/reactive/WebTestClientAutoConfiguration.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/reactive/WebTestClientAutoConfiguration.java index adcadcf1b62..7780fcf5627 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/reactive/WebTestClientAutoConfiguration.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/reactive/WebTestClientAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -45,7 +45,7 @@ import org.springframework.web.server.WebHandler; * @author Andy Wilkinson * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ WebClient.class, WebTestClient.class }) @AutoConfigureAfter({ CodecsAutoConfiguration.class, WebFluxAutoConfiguration.class }) @Import(WebTestClientSecurityConfiguration.class) diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/reactive/WebTestClientSecurityConfiguration.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/reactive/WebTestClientSecurityConfiguration.java index 3dfb3c36d43..c1aa8d2441c 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/reactive/WebTestClientSecurityConfiguration.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/reactive/WebTestClientSecurityConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ import org.springframework.test.web.reactive.server.MockServerConfigurer; * * @author Madhura Bhave */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(SecurityMockServerConfigurers.class) class WebTestClientSecurityConfiguration { diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcAutoConfiguration.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcAutoConfiguration.java index 92ce52834ff..dfd51a6b0c0 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcAutoConfiguration.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcAutoConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -47,7 +47,7 @@ import org.springframework.web.servlet.DispatcherServlet; * @see AutoConfigureWebMvc * @since 1.4.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = Type.SERVLET) @AutoConfigureAfter(WebMvcAutoConfiguration.class) @EnableConfigurationProperties({ ServerProperties.class, WebMvcProperties.class }) diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcSecurityConfiguration.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcSecurityConfiguration.java index 05d8ffd791c..68d09bd8b92 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcSecurityConfiguration.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcSecurityConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -33,7 +33,7 @@ import org.springframework.web.context.WebApplicationContext; * * @author Andy Wilkinson */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(SecurityMockMvcRequestPostProcessors.class) class MockMvcSecurityConfiguration { diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcWebClientAutoConfiguration.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcWebClientAutoConfiguration.java index 7f2a1bb0470..57623382cba 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcWebClientAutoConfiguration.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcWebClientAutoConfiguration.java @@ -36,7 +36,7 @@ import org.springframework.test.web.servlet.htmlunit.MockMvcWebClientBuilder; * @author Phillip Webb * @since 1.4.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(WebClient.class) @AutoConfigureAfter(MockMvcAutoConfiguration.class) @ConditionalOnProperty(prefix = "spring.test.mockmvc.webclient", name = "enabled", matchIfMissing = true) diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcWebDriverAutoConfiguration.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcWebDriverAutoConfiguration.java index 727c0f38a91..554859a64d6 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcWebDriverAutoConfiguration.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcWebDriverAutoConfiguration.java @@ -42,7 +42,7 @@ import org.springframework.util.ClassUtils; * @author Phillip Webb * @since 1.4.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(HtmlUnitDriver.class) @AutoConfigureAfter(MockMvcAutoConfiguration.class) @ConditionalOnProperty(prefix = "spring.test.mockmvc.webdriver", name = "enabled", matchIfMissing = true) diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/SpringBootDependencyInjectionTestExecutionListenerPostConstructIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/SpringBootDependencyInjectionTestExecutionListenerPostConstructIntegrationTests.java index 8eb824fb0fe..9c7ad2a22bb 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/SpringBootDependencyInjectionTestExecutionListenerPostConstructIntegrationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/SpringBootDependencyInjectionTestExecutionListenerPostConstructIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -56,7 +56,7 @@ public class SpringBootDependencyInjectionTestExecutionListenerPostConstructInte assertThat(this.calls).hasSize(1); } - @Configuration + @Configuration(proxyBeanMethods = false) static class Config { } diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/SpringBootDependencyInjectionTestExecutionListenerTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/SpringBootDependencyInjectionTestExecutionListenerTests.java index 26153d32960..5830567abf7 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/SpringBootDependencyInjectionTestExecutionListenerTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/SpringBootDependencyInjectionTestExecutionListenerTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -87,7 +87,7 @@ public class SpringBootDependencyInjectionTestExecutionListenerTests { .isEqualTo(originalFailure); } - @Configuration + @Configuration(proxyBeanMethods = false) @ImportAutoConfiguration(JacksonAutoConfiguration.class) static class Config { diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/cache/ImportsContextCustomizerFactoryWithAutoConfigurationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/cache/ImportsContextCustomizerFactoryWithAutoConfigurationTests.java index adea7a833f3..de475a20f2d 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/cache/ImportsContextCustomizerFactoryWithAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/cache/ImportsContextCustomizerFactoryWithAutoConfigurationTests.java @@ -150,7 +150,7 @@ public class ImportsContextCustomizerFactoryWithAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EntityScan(basePackageClasses = ExampleEntity.class) @AutoConfigurationPackage static class EmptyConfig { diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/core/AutoConfigureCacheIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/core/AutoConfigureCacheIntegrationTests.java index ba5e49480c0..6307b569b9d 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/core/AutoConfigureCacheIntegrationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/core/AutoConfigureCacheIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -49,7 +49,7 @@ public class AutoConfigureCacheIntegrationTests { assertThat(bean).isInstanceOf(NoOpCacheManager.class); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableCaching public static class Config { diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/core/AutoConfigureCacheWithExistingCacheManagerIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/core/AutoConfigureCacheWithExistingCacheManagerIntegrationTests.java index fdb8ef14f92..c16a81ba4ba 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/core/AutoConfigureCacheWithExistingCacheManagerIntegrationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/core/AutoConfigureCacheWithExistingCacheManagerIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -50,7 +50,7 @@ public class AutoConfigureCacheWithExistingCacheManagerIntegrationTests { assertThat(bean).isInstanceOf(ConcurrentMapCacheManager.class); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableCaching public static class Config { diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureTestDatabaseWithMultipleDatasourcesIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureTestDatabaseWithMultipleDatasourcesIntegrationTests.java index 2287eeedb33..5ebe3b5bb53 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureTestDatabaseWithMultipleDatasourcesIntegrationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureTestDatabaseWithMultipleDatasourcesIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -54,7 +54,7 @@ public class AutoConfigureTestDatabaseWithMultipleDatasourcesIntegrationTests { assertThat(product).startsWith("H2"); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration static class Config { diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplaceAutoConfiguredIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplaceAutoConfiguredIntegrationTests.java index a4e8224c584..03d45a28e18 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplaceAutoConfiguredIntegrationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplaceAutoConfiguredIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -50,7 +50,7 @@ public class JdbcTestWithAutoConfigureTestDatabaseReplaceAutoConfiguredIntegrati assertThat(product).startsWith("HSQL"); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration // Will auto-configure H2 static class Config { diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTests.java index 5c54e141b4a..644a668c1ba 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -54,7 +54,7 @@ public class JdbcTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTest assertThat(product).startsWith("HSQL"); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration static class Config { diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplacePropertyAnyIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplacePropertyAnyIntegrationTests.java index b86ccef1b75..139da5b3986 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplacePropertyAnyIntegrationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplacePropertyAnyIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -56,7 +56,7 @@ public class JdbcTestWithAutoConfigureTestDatabaseReplacePropertyAnyIntegrationT assertThat(product).startsWith("HSQL"); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration static class Config { diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplacePropertyAutoConfiguredIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplacePropertyAutoConfiguredIntegrationTests.java index 550e5edc74b..c027960a8c0 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplacePropertyAutoConfiguredIntegrationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplacePropertyAutoConfiguredIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -52,7 +52,7 @@ public class JdbcTestWithAutoConfigureTestDatabaseReplacePropertyAutoConfiguredI assertThat(product).startsWith("HSQL"); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration // Will auto-configure H2 static class Config { diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfigurationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfigurationTests.java index 96b09bc6ce3..ab820e8d453 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -68,7 +68,7 @@ public class TestDatabaseAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class ExistingDataSourceConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestDatabaseAutoConfigurationNoEmbeddedTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestDatabaseAutoConfigurationNoEmbeddedTests.java index f12eb08db4d..7ba9819e4d8 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestDatabaseAutoConfigurationNoEmbeddedTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestDatabaseAutoConfigurationNoEmbeddedTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -71,7 +71,7 @@ public class TestDatabaseAutoConfigurationNoEmbeddedTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class ExistingDataSourceConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/PropertyMappingContextCustomizerFactoryTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/PropertyMappingContextCustomizerFactoryTests.java index 09319f49bf5..dc789411939 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/PropertyMappingContextCustomizerFactoryTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/PropertyMappingContextCustomizerFactoryTests.java @@ -124,7 +124,7 @@ public class PropertyMappingContextCustomizerFactoryTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @TypeMappingAnnotation static class ConfigMapping { diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/AutoConfigureWebClientWithRestTemplateIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/AutoConfigureWebClientWithRestTemplateIntegrationTests.java index 439e3af8753..cb449d54481 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/AutoConfigureWebClientWithRestTemplateIntegrationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/AutoConfigureWebClientWithRestTemplateIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -59,7 +59,7 @@ public class AutoConfigureWebClientWithRestTemplateIntegrationTests { assertThat(entity.getBody()).isEqualTo("hello"); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration static class Config { diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/reactive/WebTestClientAutoConfigurationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/reactive/WebTestClientAutoConfigurationTests.java index 174213bcc0c..643deaab42b 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/reactive/WebTestClientAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/reactive/WebTestClientAutoConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -120,7 +120,7 @@ public class WebTestClientAutoConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class BaseConfiguration { @Bean @@ -130,7 +130,7 @@ public class WebTestClientAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(BaseConfiguration.class) static class CodecConfiguration { diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/reactive/webclient/WebTestClientSpringBootTestIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/reactive/webclient/WebTestClientSpringBootTestIntegrationTests.java index 5a703b1e5c8..5cd91a33dc5 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/reactive/webclient/WebTestClientSpringBootTestIntegrationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/reactive/webclient/WebTestClientSpringBootTestIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -69,7 +69,7 @@ public class WebTestClientSpringBootTestIntegrationTests { .hasSize(1); } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/SpringBootMockMvcBuilderCustomizerTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/SpringBootMockMvcBuilderCustomizerTests.java index 7fb6b8504ea..5b6911f57e5 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/SpringBootMockMvcBuilderCustomizerTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/SpringBootMockMvcBuilderCustomizerTests.java @@ -66,7 +66,7 @@ public class SpringBootMockMvcBuilderCustomizerTests { assertThat(filters).containsExactlyInAnyOrder(testFilter, otherTestFilter); } - @Configuration + @Configuration(proxyBeanMethods = false) static class ServletConfiguration { @Bean @@ -76,7 +76,7 @@ public class SpringBootMockMvcBuilderCustomizerTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class FilterConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestWebDriverCustomScopeIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestWebDriverCustomScopeIntegrationTests.java index a578861f0d8..e257f23cede 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestWebDriverCustomScopeIntegrationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestWebDriverCustomScopeIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -62,7 +62,7 @@ public class WebMvcTestWebDriverCustomScopeIntegrationTests { assertThat(previousWebDriver).isNotNull().isSameAs(this.webDriver); } - @Configuration + @Configuration(proxyBeanMethods = false) static class Config { @Bean diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java index 8ab6b50e2d2..95bf5f4717b 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java @@ -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"); * you may not use this file except in compliance with the License. @@ -141,7 +141,7 @@ class ImportsContextCustomizer implements ContextCustomizer { /** * {@link Configuration} registered to trigger the {@link ImportsSelector}. */ - @Configuration + @Configuration(proxyBeanMethods = false) @Import(ImportsSelector.class) static class ImportsConfiguration { diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/TestConfiguration.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/TestConfiguration.java index 3ba1dab80c9..c4a7867adaf 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/TestConfiguration.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/TestConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -39,7 +39,7 @@ import org.springframework.core.annotation.AliasFor; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) @Documented -@Configuration +@Configuration(proxyBeanMethods = false) @TestComponent public @interface TestConfiguration { diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/ConfigFileApplicationContextInitializerTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/ConfigFileApplicationContextInitializerTests.java index d29e797c738..1e1a8501637 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/ConfigFileApplicationContextInitializerTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/ConfigFileApplicationContextInitializerTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -46,7 +46,7 @@ public class ConfigFileApplicationContextInitializerTests { assertThat(this.environment.getProperty("foo")).isEqualTo("bucket"); } - @Configuration + @Configuration(proxyBeanMethods = false) public static class Config { } diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/ImportsContextCustomizerFactoryTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/ImportsContextCustomizerFactoryTests.java index a792b7fcefb..49aa9febc31 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/ImportsContextCustomizerFactoryTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/ImportsContextCustomizerFactoryTests.java @@ -131,7 +131,7 @@ public class ImportsContextCustomizerFactoryTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(ImportedBean.class) static class TestWithImportAndBeanMethod { diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/ImportsContextCustomizerTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/ImportsContextCustomizerTests.java index 460b30601ca..d967b5dc15d 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/ImportsContextCustomizerTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/ImportsContextCustomizerTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -167,7 +167,7 @@ public class ImportsContextCustomizerTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestConfig { } diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootContextLoaderMockMvcTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootContextLoaderMockMvcTests.java index 5cc3ff6c10c..f8a93ba4198 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootContextLoaderMockMvcTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootContextLoaderMockMvcTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -77,7 +77,7 @@ public class SpringBootContextLoaderMockMvcTests { WebApplicationContextUtils.getWebApplicationContext(this.servletContext)); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWebMvc @RestController protected static class Config { diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootContextLoaderTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootContextLoaderTests.java index e9f3368b0c8..7a5aefa3014 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootContextLoaderTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootContextLoaderTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -145,7 +145,7 @@ public class SpringBootContextLoaderTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class Config { } diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestActiveProfileTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestActiveProfileTests.java index f8975eebf05..95198ddb06d 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestActiveProfileTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestActiveProfileTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -48,7 +48,7 @@ public class SpringBootTestActiveProfileTests { .containsExactly("override"); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class Config { } diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestArgsTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestArgsTests.java index e2806dbbf9a..dadfedc9569 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestArgsTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestArgsTests.java @@ -47,7 +47,7 @@ public class SpringBootTestArgsTests { .containsOnly("other.bar=other-bar-value"); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class Config { } diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestContextHierarchyTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestContextHierarchyTests.java index 2d853cbfe1b..155ce087758 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestContextHierarchyTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestContextHierarchyTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -40,7 +40,7 @@ public class SpringBootTestContextHierarchyTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ParentConfiguration { @Bean @@ -50,7 +50,7 @@ public class SpringBootTestContextHierarchyTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ChildConfiguration { ChildConfiguration(MyBean myBean) { diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestCustomConfigNameTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestCustomConfigNameTests.java index 7aefa0174d6..9506193f42e 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestCustomConfigNameTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestCustomConfigNameTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -43,7 +43,7 @@ public class SpringBootTestCustomConfigNameTests { assertThat(this.foo).isEqualTo("bar"); } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestConfiguration { public PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() { diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestCustomPortTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestCustomPortTests.java index bf348dfc8a3..6880c9d25fa 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestCustomPortTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestCustomPortTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -45,7 +45,7 @@ public class SpringBootTestCustomPortTests { assertThat(port).isEqualTo("12345"); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class Config { } diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestDefaultConfigurationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestDefaultConfigurationTests.java index 7692c77b953..305d3b0ad0d 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestDefaultConfigurationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestDefaultConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -43,7 +43,7 @@ public class SpringBootTestDefaultConfigurationTests { assertThat(this.config).isNotNull(); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class Config { } diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestJmxTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestJmxTests.java index 92e582cf173..f7e486ba7cb 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestJmxTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestJmxTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -43,7 +43,7 @@ public class SpringBootTestJmxTests { assertThat(this.jmx).isFalse(); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class Config { @Bean diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestMixedConfigurationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestMixedConfigurationTests.java index 9b9cc82d372..04b6186cafd 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestMixedConfigurationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestMixedConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -51,7 +51,7 @@ public class SpringBootTestMixedConfigurationTests { assertThat(this.config).isNotNull(); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class Config { } diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestReactiveWebEnvironmentDefinedPortTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestReactiveWebEnvironmentDefinedPortTests.java index e70f30a3afc..91976ade8c7 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestReactiveWebEnvironmentDefinedPortTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestReactiveWebEnvironmentDefinedPortTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -38,7 +38,7 @@ import org.springframework.web.reactive.config.EnableWebFlux; public class SpringBootTestReactiveWebEnvironmentDefinedPortTests extends AbstractSpringBootTestEmbeddedReactiveWebEnvironmentTests { - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWebFlux @RestController protected static class Config extends AbstractConfig { diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestReactiveWebEnvironmentRandomPortTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestReactiveWebEnvironmentRandomPortTests.java index bb98e24bf44..b4e647637b6 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestReactiveWebEnvironmentRandomPortTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestReactiveWebEnvironmentRandomPortTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -38,7 +38,7 @@ import org.springframework.web.reactive.config.EnableWebFlux; public class SpringBootTestReactiveWebEnvironmentRandomPortTests extends AbstractSpringBootTestEmbeddedReactiveWebEnvironmentTests { - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWebFlux @RestController protected static class Config extends AbstractConfig { diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestReactiveWebEnvironmentUserDefinedTestRestTemplateTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestReactiveWebEnvironmentUserDefinedTestRestTemplateTests.java index 53d3c30c5fb..960aba39ad7 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestReactiveWebEnvironmentUserDefinedTestRestTemplateTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestReactiveWebEnvironmentUserDefinedTestRestTemplateTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -49,7 +49,7 @@ public class SpringBootTestReactiveWebEnvironmentUserDefinedTestRestTemplateTest .isInstanceOf(RestTemplate.class); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWebFlux @RestController protected static class Config extends AbstractConfig { diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestUserDefinedTestRestTemplateTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestUserDefinedTestRestTemplateTests.java index 873b8dff28e..c132b80c783 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestUserDefinedTestRestTemplateTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestUserDefinedTestRestTemplateTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -51,7 +51,7 @@ public class SpringBootTestUserDefinedTestRestTemplateTests // gh-7711 - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWebMvc @RestController protected static class Config extends AbstractConfig { diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentContextHierarchyTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentContextHierarchyTests.java index 07dbb68b3cb..9480f3b5937 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentContextHierarchyTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentContextHierarchyTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -60,12 +60,12 @@ public class SpringBootTestWebEnvironmentContextHierarchyTests { assertThat(parent).isNotInstanceOf(WebApplicationContext.class); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class ParentConfiguration extends AbstractConfig { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWebMvc @RestController protected static class ChildConfiguration extends AbstractConfig { diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentDefinedPortTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentDefinedPortTests.java index 77b61cd0c0f..af7f1f8a964 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentDefinedPortTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentDefinedPortTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -38,7 +38,7 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc; public class SpringBootTestWebEnvironmentDefinedPortTests extends AbstractSpringBootTestWebServerWebEnvironmentTests { - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWebMvc @RestController protected static class Config extends AbstractConfig { diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentMockTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentMockTests.java index a0b9a632632..2f796404885 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentMockTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentMockTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -81,7 +81,7 @@ public class SpringBootTestWebEnvironmentMockTests { "src/main/webapp"); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWebMvc protected static class Config { diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentMockWithWebAppConfigurationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentMockWithWebAppConfigurationTests.java index 83cc7adc36d..17db6260b98 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentMockWithWebAppConfigurationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentMockWithWebAppConfigurationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -54,7 +54,7 @@ public class SpringBootTestWebEnvironmentMockWithWebAppConfigurationTests { "src/mymain/mywebapp"); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWebMvc protected static class Config { diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentRandomPortCustomPortTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentRandomPortCustomPortTests.java index 75c07923f63..5324d147651 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentRandomPortCustomPortTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentRandomPortCustomPortTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -51,7 +51,7 @@ public class SpringBootTestWebEnvironmentRandomPortCustomPortTests { assertThat(port).isEqualTo("0"); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWebMvc protected static class Config extends AbstractConfig { diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentRandomPortTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentRandomPortTests.java index dcac7975940..7975993523c 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentRandomPortTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentRandomPortTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -49,7 +49,7 @@ public class SpringBootTestWebEnvironmentRandomPortTests .hasAtLeastOneElementOfType(MyConverter.class); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWebMvc @RestController protected static class Config extends AbstractConfig { diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWithClassesIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWithClassesIntegrationTests.java index 08377c8a978..e8d397046d7 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWithClassesIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWithClassesIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -49,12 +49,12 @@ public class SpringBootTestWithClassesIntegrationTests { .isThrownBy(() -> this.context.getBean(AdditionalConfig.class)); } - @Configuration + @Configuration(proxyBeanMethods = false) static class Config { } - @Configuration + @Configuration(proxyBeanMethods = false) static class AdditionalConfig { } diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWithContextConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWithContextConfigurationIntegrationTests.java index 56f5f84b5ec..af05fe02b3c 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWithContextConfigurationIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWithContextConfigurationIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -51,12 +51,12 @@ public class SpringBootTestWithContextConfigurationIntegrationTests { .isThrownBy(() -> this.context.getBean(AdditionalConfig.class)); } - @Configuration + @Configuration(proxyBeanMethods = false) static class Config { } - @Configuration + @Configuration(proxyBeanMethods = false) static class AdditionalConfig { } diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWithTestPropertySourceTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWithTestPropertySourceTests.java index 58260d97d6b..40426548497 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWithTestPropertySourceTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWithTestPropertySourceTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -82,7 +82,7 @@ public class SpringBootTestWithTestPropertySourceTests { .isEqualTo("property-source-inlined"); } - @Configuration + @Configuration(proxyBeanMethods = false) static class Config { @Value("${boot-test-inlined}") diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/assertj/ApplicationContextAssertTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/assertj/ApplicationContextAssertTests.java index 6e2cb6fd2a4..77808372a65 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/assertj/ApplicationContextAssertTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/assertj/ApplicationContextAssertTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -439,7 +439,7 @@ public class ApplicationContextAssertTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class PrimaryFooConfig { @Bean diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/AbstractJupiterTestWithConfigAndExtendWith.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/AbstractJupiterTestWithConfigAndExtendWith.java index 09775d1ed89..6ca7b6aca76 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/AbstractJupiterTestWithConfigAndExtendWith.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/AbstractJupiterTestWithConfigAndExtendWith.java @@ -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"); * you may not use this file except in compliance with the License. @@ -24,7 +24,7 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) public abstract class AbstractJupiterTestWithConfigAndExtendWith { - @Configuration + @Configuration(proxyBeanMethods = false) static class Config { } diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/AbstractTestNgTestWithConfig.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/AbstractTestNgTestWithConfig.java index b11d0b739cd..873326d349b 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/AbstractTestNgTestWithConfig.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/AbstractTestNgTestWithConfig.java @@ -23,7 +23,7 @@ import org.springframework.context.annotation.Configuration; @Test public abstract class AbstractTestNgTestWithConfig { - @Configuration + @Configuration(proxyBeanMethods = false) static class Config { } diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/AbstractTestWithConfigAndRunWith.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/AbstractTestWithConfigAndRunWith.java index cf5c9b5b013..72a788662a9 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/AbstractTestWithConfigAndRunWith.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/AbstractTestWithConfigAndRunWith.java @@ -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"); * you may not use this file except in compliance with the License. @@ -30,7 +30,7 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) public abstract class AbstractTestWithConfigAndRunWith { - @Configuration + @Configuration(proxyBeanMethods = false) static class Config { } diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/SampleConfig.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/SampleConfig.java index 242671f651e..253cc56bbfa 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/SampleConfig.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/SampleConfig.java @@ -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"); * you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ package org.springframework.boot.test.context.filter; import org.springframework.context.annotation.Configuration; -@Configuration +@Configuration(proxyBeanMethods = false) public class SampleConfig { } diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/SampleTestConfig.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/SampleTestConfig.java index 470222eb3c7..11ce248e3c7 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/SampleTestConfig.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/SampleTestConfig.java @@ -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"); * you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ package org.springframework.boot.test.context.filter; import org.springframework.boot.test.context.TestComponent; import org.springframework.context.annotation.Configuration; -@Configuration +@Configuration(proxyBeanMethods = false) @TestComponent public class SampleTestConfig { diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/TestTypeExcludeFilterTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/TestTypeExcludeFilterTests.java index 400d931830b..8e78674fdf8 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/TestTypeExcludeFilterTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/TestTypeExcludeFilterTests.java @@ -110,7 +110,7 @@ public class TestTypeExcludeFilterTests { return this.metadataReaderFactory.getMetadataReader(source.getName()); } - @Configuration + @Configuration(proxyBeanMethods = false) static class NestedConfig { } diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/runner/AbstractApplicationContextRunnerTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/runner/AbstractApplicationContextRunnerTests.java index b6391d265c3..85229736335 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/runner/AbstractApplicationContextRunnerTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/runner/AbstractApplicationContextRunnerTests.java @@ -178,7 +178,7 @@ public abstract class AbstractApplicationContextRunnerTests reset(this.dateService)); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableCaching(proxyTargetClass = true) @Import(DateService.class) static class Config { diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithAopProxyTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithAopProxyTests.java index e0aa41e3dee..af72e012689 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithAopProxyTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithAopProxyTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -62,7 +62,7 @@ public class SpyBeanWithAopProxyTests { verify(this.dateService, times(1)).getDate(anyBoolean()); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableCaching(proxyTargetClass = true) @Import(DateService.class) static class Config { diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithDirtiesContextClassModeBeforeMethodIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithDirtiesContextClassModeBeforeMethodIntegrationTests.java index adc5b5d2a01..a0c6ce48670 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithDirtiesContextClassModeBeforeMethodIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithDirtiesContextClassModeBeforeMethodIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -52,7 +52,7 @@ public class SpyBeanWithDirtiesContextClassModeBeforeMethodIntegrationTests { verify(this.exampleService).greeting(); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(ExampleServiceCaller.class) static class Config { diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithNameOnTestFieldForMultipleExistingBeansTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithNameOnTestFieldForMultipleExistingBeansTests.java index ea5d6d099cc..3c2681360b9 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithNameOnTestFieldForMultipleExistingBeansTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithNameOnTestFieldForMultipleExistingBeansTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -49,7 +49,7 @@ public class SpyBeanWithNameOnTestFieldForMultipleExistingBeansTests { .isEqualTo("two"); } - @Configuration + @Configuration(proxyBeanMethods = false) static class Config { @Bean diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/web/SpringBootMockServletContextTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/web/SpringBootMockServletContextTests.java index bbc75ccb889..658c2c36108 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/web/SpringBootMockServletContextTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/web/SpringBootMockServletContextTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -92,7 +92,7 @@ public class SpringBootMockServletContextTests implements ServletContextAware { assertThat(contents.length).isEqualTo(0); } - @Configuration + @Configuration(proxyBeanMethods = false) static class Config { } diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizerIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizerIntegrationTests.java index 3803298b027..24879dfd8b7 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizerIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizerIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -57,7 +57,7 @@ public class TestRestTemplateContextCustomizerIntegrationTests { assertThat(this.restTemplate.getForObject("/", String.class)).contains("hello"); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import({ TestServlet.class, NoTestRestTemplateBeanChecker.class }) static class TestConfig { diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizerWithOverrideIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizerWithOverrideIntegrationTests.java index be79b3944d5..24c4667cb7d 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizerWithOverrideIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizerWithOverrideIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -58,7 +58,7 @@ public class TestRestTemplateContextCustomizerWithOverrideIntegrationTests { assertThat(this.restTemplate).isInstanceOf(CustomTestRestTemplate.class); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import({ TestServlet.class, NoTestRestTemplateBeanChecker.class }) static class TestConfig { diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizerIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizerIntegrationTests.java index 2628961723e..aeddf96adf2 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizerIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizerIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -55,7 +55,7 @@ public class WebTestClientContextCustomizerIntegrationTests { .isEqualTo("hello"); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import({ TestHandler.class, NoWebTestClientBeanChecker.class }) static class TestConfig { diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizerWithOverrideIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizerWithOverrideIntegrationTests.java index 13fad1c466f..ad284584409 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizerWithOverrideIntegrationTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizerWithOverrideIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -58,7 +58,7 @@ public class WebTestClientContextCustomizerWithOverrideIntegrationTests { assertThat(this.webTestClient).isInstanceOf(CustomWebTestClient.class); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import({ TestHandler.class, NoWebTestClientBeanChecker.class }) static class TestConfig { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-dir/src/main/java/org/springframework/launcher/it/jar/SpringConfiguration.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-dir/src/main/java/org/springframework/launcher/it/jar/SpringConfiguration.java index 5999dc3ac18..e6668de996d 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-dir/src/main/java/org/springframework/launcher/it/jar/SpringConfiguration.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-dir/src/main/java/org/springframework/launcher/it/jar/SpringConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -25,7 +25,7 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc; * * @author Phillip Webb */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableWebMvc @ComponentScan public class SpringConfiguration { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/SpringConfiguration.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/SpringConfiguration.java index 5999dc3ac18..e6668de996d 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/SpringConfiguration.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/SpringConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -25,7 +25,7 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc; * * @author Phillip Webb */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableWebMvc @ComponentScan public class SpringConfiguration { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-props-lib/src/main/java/org/springframework/boot/launcher/it/props/SpringConfiguration.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-props-lib/src/main/java/org/springframework/boot/launcher/it/props/SpringConfiguration.java index 6e475213c90..0c5e4b54118 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-props-lib/src/main/java/org/springframework/boot/launcher/it/props/SpringConfiguration.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-props-lib/src/main/java/org/springframework/boot/launcher/it/props/SpringConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -29,7 +29,7 @@ import org.springframework.core.io.ClassPathResource; * * @author Dave Syer */ -@Configuration +@Configuration(proxyBeanMethods = false) @ComponentScan public class SpringConfiguration implements InitializingBean { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-props/src/main/java/org/springframework/launcher/it/props/SpringConfiguration.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-props/src/main/java/org/springframework/launcher/it/props/SpringConfiguration.java index d9cad062688..c976a18877a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-props/src/main/java/org/springframework/launcher/it/props/SpringConfiguration.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-props/src/main/java/org/springframework/launcher/it/props/SpringConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -29,7 +29,7 @@ import org.springframework.core.io.ClassPathResource; * * @author Dave Syer */ -@Configuration +@Configuration(proxyBeanMethods = false) @ComponentScan public class SpringConfiguration implements InitializingBean { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/SpringConfiguration.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/SpringConfiguration.java index 4fe46d18985..680419e6138 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/SpringConfiguration.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/SpringConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -25,7 +25,7 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc; * * @author Phillip Webb */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableWebMvc @ComponentScan public class SpringConfiguration { diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringBootConfiguration.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringBootConfiguration.java index 1e9bc6359f6..ae47bed948e 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringBootConfiguration.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringBootConfiguration.java @@ -43,7 +43,7 @@ import org.springframework.core.annotation.AliasFor; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) @Documented -@Configuration +@Configuration(proxyBeanMethods = false) public @interface SpringBootConfiguration { /** diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/support/ErrorPageFilterConfiguration.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/support/ErrorPageFilterConfiguration.java index bb35bd49af5..89a50070700 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/support/ErrorPageFilterConfiguration.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/support/ErrorPageFilterConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -24,7 +24,7 @@ import org.springframework.context.annotation.Configuration; * * @author Andy Wilkinson */ -@Configuration +@Configuration(proxyBeanMethods = false) class ErrorPageFilterConfiguration { @Bean diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/BannerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/BannerTests.java index 25f32e245fd..1916823c817 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/BannerTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/BannerTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -137,7 +137,7 @@ public class BannerTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class Config { } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/OverrideSourcesTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/OverrideSourcesTests.java index 52913484a6e..a662441b51e 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/OverrideSourcesTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/OverrideSourcesTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -61,7 +61,7 @@ public class OverrideSourcesTests { assertThat(this.context.getBean(Service.class).bean.name).isEqualTo("bar"); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TestConfiguration { @Bean @@ -72,7 +72,7 @@ public class OverrideSourcesTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class MainConfiguration { @Bean diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ReproTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ReproTests.java index e077b1a5ef9..25b96905e71 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ReproTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ReproTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -175,7 +175,7 @@ public class ReproTests { .isEqualTo(expectedVersion); } - @Configuration + @Configuration(proxyBeanMethods = false) public static class Config { } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SimpleMainTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SimpleMainTests.java index a0749fe24a0..29c1c73a396 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SimpleMainTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SimpleMainTests.java @@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException * * @author Dave Syer */ -@Configuration +@Configuration(proxyBeanMethods = false) public class SimpleMainTests { @Rule diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationNoWebTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationNoWebTests.java index bf30cd07208..74ee4331076 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationNoWebTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationNoWebTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -61,7 +61,7 @@ public class SpringApplicationNoWebTests { assertThat(this.context).isInstanceOf(StaticApplicationContext.class); } - @Configuration + @Configuration(proxyBeanMethods = false) static class ExampleConfig { } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java index 965c31d16f1..1f9319b3bf2 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java @@ -1294,7 +1294,7 @@ public class SpringApplicationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ExampleConfig { @Bean @@ -1304,7 +1304,7 @@ public class SpringApplicationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class OverrideConfig { @Bean @@ -1314,7 +1314,7 @@ public class SpringApplicationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class BrokenPostConstructConfig { @Bean @@ -1333,7 +1333,7 @@ public class SpringApplicationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ListenerConfig { @Bean @@ -1343,7 +1343,7 @@ public class SpringApplicationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class Multicaster { @Bean(name = AbstractApplicationContext.APPLICATION_EVENT_MULTICASTER_BEAN_NAME) @@ -1353,7 +1353,7 @@ public class SpringApplicationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ExampleWebConfig { @Bean @@ -1363,7 +1363,7 @@ public class SpringApplicationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ExampleReactiveWebConfig { @Bean @@ -1378,7 +1378,7 @@ public class SpringApplicationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class FailingConfig { @Bean @@ -1388,7 +1388,7 @@ public class SpringApplicationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CommandLineRunConfig { @Bean @@ -1409,7 +1409,7 @@ public class SpringApplicationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ExitCodeCommandLineRunConfig { @Bean @@ -1421,7 +1421,7 @@ public class SpringApplicationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class MappedExitCodeCommandLineRunConfig { @Bean @@ -1443,7 +1443,7 @@ public class SpringApplicationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class RefreshFailureConfig { @PostConstruct @@ -1453,7 +1453,7 @@ public class SpringApplicationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class LazyInitializationConfig { @Bean diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/admin/SpringApplicationAdminMXBeanRegistrarTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/admin/SpringApplicationAdminMXBeanRegistrarTests.java index 6045864c806..2267dbf180e 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/admin/SpringApplicationAdminMXBeanRegistrarTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/admin/SpringApplicationAdminMXBeanRegistrarTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -177,7 +177,7 @@ public class SpringApplicationAdminMXBeanRegistrarTests { } } - @Configuration + @Configuration(proxyBeanMethods = false) static class Config { @Bean diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java index bd75665736e..ce6b597fcc4 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -312,12 +312,12 @@ public class SpringApplicationBuilderTests { this.context.getBean(ChildConfig.class); } - @Configuration + @Configuration(proxyBeanMethods = false) static class ExampleConfig { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ChildConfig { } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/TypeExcludeFilterTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/TypeExcludeFilterTests.java index 7a2b1bdd56d..222619db88e 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/TypeExcludeFilterTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/TypeExcludeFilterTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -62,7 +62,7 @@ public class TypeExcludeFilterTests { .isThrownBy(() -> this.context.getBean(ExampleFilteredComponent.class)); } - @Configuration + @Configuration(proxyBeanMethods = false) @ComponentScan(basePackageClasses = SampleTypeExcludeFilter.class, excludeFilters = @Filter(type = FilterType.CUSTOM, classes = SampleTypeExcludeFilter.class)) static class Config { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/AnsiOutputApplicationListenerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/AnsiOutputApplicationListenerTests.java index f9c88dce822..0912f1fc8af 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/AnsiOutputApplicationListenerTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/AnsiOutputApplicationListenerTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -92,7 +92,7 @@ public class AnsiOutputApplicationListenerTests { assertThat(AnsiOutputEnabledValue.get()).isEqualTo(Enabled.NEVER); } - @Configuration + @Configuration(proxyBeanMethods = false) public static class Config { } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java index 8993d40f665..9e265ce427e 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java @@ -1043,50 +1043,50 @@ public class ConfigFileApplicationListenerTests { }; } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class Config { } - @Configuration + @Configuration(proxyBeanMethods = false) @PropertySource("classpath:/specificlocation.properties") protected static class WithPropertySource { } - @Configuration + @Configuration(proxyBeanMethods = false) @PropertySource("classpath:/${source.location}.properties") protected static class WithPropertySourcePlaceholders { } - @Configuration + @Configuration(proxyBeanMethods = false) @PropertySource(value = "classpath:/specificlocation.properties", name = "foo") protected static class WithPropertySourceAndName { } - @Configuration + @Configuration(proxyBeanMethods = false) @PropertySource("classpath:/enableprofile.properties") protected static class WithPropertySourceInProfile { } - @Configuration + @Configuration(proxyBeanMethods = false) @PropertySource("classpath:/enableprofile-myprofile.properties") @Profile("myprofile") protected static class WithPropertySourceAndProfile { } - @Configuration + @Configuration(proxyBeanMethods = false) @PropertySource({ "classpath:/specificlocation.properties", "classpath:/moreproperties.properties" }) protected static class WithPropertySourceMultipleLocations { } - @Configuration + @Configuration(proxyBeanMethods = false) @PropertySource(value = { "classpath:/specificlocation.properties", "classpath:/moreproperties.properties" }, name = "foo") protected static class WithPropertySourceMultipleLocationsAndName { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerYamlProfileNegationTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerYamlProfileNegationTests.java index c266ac3f150..47e7c8d5788 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerYamlProfileNegationTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerYamlProfileNegationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -152,7 +152,7 @@ public class ConfigFileApplicationListenerYamlProfileNegationTests { .isEqualTo(expectedVersion); } - @Configuration + @Configuration(proxyBeanMethods = false) public static class Config { } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageConfiguration.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageConfiguration.java index 62f3dddf3b7..5cce13d2725 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageConfiguration.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ package org.springframework.boot.context.configwarnings.dflt; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -@Configuration +@Configuration(proxyBeanMethods = false) @ComponentScan public class InDefaultPackageConfiguration { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithBasePackageClassesConfiguration.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithBasePackageClassesConfiguration.java index 52a2d483182..5d78eb1b5b3 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithBasePackageClassesConfiguration.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithBasePackageClassesConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import org.springframework.boot.context.configwarnings.real.nested.ExampleBean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -@Configuration +@Configuration(proxyBeanMethods = false) @ComponentScan(basePackageClasses = ExampleBean.class) public class InDefaultPackageWithBasePackageClassesConfiguration { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithBasePackagesConfiguration.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithBasePackagesConfiguration.java index b5028947017..848b2cd4fca 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithBasePackagesConfiguration.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithBasePackagesConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ package org.springframework.boot.context.configwarnings.dflt; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -@Configuration +@Configuration(proxyBeanMethods = false) @ComponentScan(basePackages = "org.springframework.boot.context.configwarnings.nested") public class InDefaultPackageWithBasePackagesConfiguration { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithMetaAnnotationConfiguration.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithMetaAnnotationConfiguration.java index cbd3ada718a..bbd63766a06 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithMetaAnnotationConfiguration.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithMetaAnnotationConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ package org.springframework.boot.context.configwarnings.dflt; import org.springframework.boot.context.configwarnings.annotation.MetaComponentScan; import org.springframework.context.annotation.Configuration; -@Configuration +@Configuration(proxyBeanMethods = false) @MetaComponentScan public class InDefaultPackageWithMetaAnnotationConfiguration { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithValueConfiguration.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithValueConfiguration.java index 2f46b796776..512b9ce8846 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithValueConfiguration.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithValueConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ package org.springframework.boot.context.configwarnings.dflt; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -@Configuration +@Configuration(proxyBeanMethods = false) @ComponentScan("org.springframework.boot.context.configwarnings.nested") public class InDefaultPackageWithValueConfiguration { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithoutScanConfiguration.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithoutScanConfiguration.java index 0c4bf18e31b..1ae8782014c 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithoutScanConfiguration.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithoutScanConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ package org.springframework.boot.context.configwarnings.dflt; import org.springframework.context.annotation.Configuration; -@Configuration +@Configuration(proxyBeanMethods = false) public class InDefaultPackageWithoutScanConfiguration { } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/orgspring/InOrgSpringPackageConfiguration.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/orgspring/InOrgSpringPackageConfiguration.java index 7d429498493..ab1ed0c9b7e 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/orgspring/InOrgSpringPackageConfiguration.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/orgspring/InOrgSpringPackageConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ package org.springframework.boot.context.configwarnings.orgspring; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -@Configuration +@Configuration(proxyBeanMethods = false) @ComponentScan public class InOrgSpringPackageConfiguration { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/real/InRealButScanningProblemPackages.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/real/InRealButScanningProblemPackages.java index aeb023f0d77..ff136c68823 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/real/InRealButScanningProblemPackages.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/real/InRealButScanningProblemPackages.java @@ -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"); * you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ import org.springframework.boot.context.configwarnings.orgspring.InOrgSpringPack import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -@Configuration +@Configuration(proxyBeanMethods = false) @ComponentScan(basePackageClasses = { InDefaultPackageConfiguration.class, InOrgSpringPackageConfiguration.class }) public class InRealButScanningProblemPackages { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/real/InRealPackageConfiguration.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/real/InRealPackageConfiguration.java index 7cee4beefe1..028ac15579f 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/real/InRealPackageConfiguration.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/real/InRealPackageConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ package org.springframework.boot.context.configwarnings.real; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -@Configuration +@Configuration(proxyBeanMethods = false) @ComponentScan public class InRealPackageConfiguration { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindHandlerAdvisorTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindHandlerAdvisorTests.java index a14732066d3..27a7d22b624 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindHandlerAdvisorTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindHandlerAdvisorTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -98,13 +98,13 @@ public class ConfigurationPropertiesBindHandlerAdvisorTests { return this.context; } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(BindingServiceProperties.class) static class WithoutConfigurationPropertiesBindHandlerAdvisor { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(BindingServiceProperties.class) @Import(DefaultValuesConfigurationPropertiesBindHandlerAdvisor.class) static class WithConfigurationPropertiesBindHandlerAdvisor { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java index 2c0557a6551..5f454bd4c58 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java @@ -887,37 +887,37 @@ public class ConfigurationPropertiesTests { this.context = new AnnotationConfigApplicationContext(); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(BasicProperties.class) static class BasicConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(NestedProperties.class) static class NestedConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(IgnoreUnknownFieldsFalseProperties.class) static class IgnoreUnknownFieldsFalseConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(PrefixProperties.class) static class PrefixConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(ValidatedJsr303Properties.class) static class ValidatedJsr303Configuration { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties static class ValidatedOnBeanJsr303Configuration { @@ -929,37 +929,37 @@ public class ConfigurationPropertiesTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(NonValidatedJsr303Properties.class) static class NonValidatedJsr303Configuration { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(AnnotationOnBaseClassProperties.class) static class AnnotationOnBaseClassConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(WithoutAndAnnotationConfiguration.class) static class WithoutAndAnnotationConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(WithoutAnnotationValueProperties.class) static class WithoutAnnotationValueConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @ImportResource("org/springframework/boot/context/properties/testProperties.xml") static class DefaultsInXmlConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) static class DefaultsInJavaConfiguration { @Bean @@ -971,7 +971,7 @@ public class ConfigurationPropertiesTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties static class PrefixPropertiesDeclaredAsBeanConfiguration { @@ -982,20 +982,20 @@ public class ConfigurationPropertiesTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(PrefixProperties.class) static class PrefixPropertiesDeclaredAsAnnotationValueConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties({ PrefixProperties.class, AnotherPrefixProperties.class }) static class MultiplePrefixPropertiesDeclaredAsAnnotationValueConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties static class PrefixedPropertiesReplacedOnBeanMethodConfiguration { @@ -1007,7 +1007,7 @@ public class ConfigurationPropertiesTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties static class ValidatedImplementationConfiguration { @@ -1018,7 +1018,7 @@ public class ConfigurationPropertiesTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties @ConfigurationProperties static class WithPostConstructConfiguration { @@ -1043,7 +1043,7 @@ public class ConfigurationPropertiesTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(WithPropertyPlaceholderValueProperties.class) static class WithPropertyPlaceholderValueConfiguration { @@ -1054,7 +1054,7 @@ public class ConfigurationPropertiesTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(SimplePrefixedProperties.class) static class WithPropertyPlaceholderWithLocalPropertiesValueConfiguration { @@ -1069,7 +1069,7 @@ public class ConfigurationPropertiesTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties static class WithFactoryBeanConfiguration { @@ -1077,7 +1077,7 @@ public class ConfigurationPropertiesTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties static class MultiplePropertySourcesPlaceholderConfigurerConfiguration { @@ -1093,7 +1093,7 @@ public class ConfigurationPropertiesTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties static class PrototypePropertiesConfiguration { @@ -1137,7 +1137,7 @@ public class ConfigurationPropertiesTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ConverterConfiguration { @Bean @@ -1148,7 +1148,7 @@ public class ConfigurationPropertiesTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class NonQualifiedConverterConfiguration { @Bean @@ -1158,7 +1158,7 @@ public class ConfigurationPropertiesTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class GenericConverterConfiguration { @Bean @@ -1169,7 +1169,7 @@ public class ConfigurationPropertiesTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class NonQualifiedGenericConverterConfiguration { @Bean @@ -1179,7 +1179,7 @@ public class ConfigurationPropertiesTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties static class GenericConfiguration { @@ -1191,7 +1191,7 @@ public class ConfigurationPropertiesTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(WithCustomValidatorProperties.class) static class WithCustomValidatorConfiguration { @@ -1202,7 +1202,7 @@ public class ConfigurationPropertiesTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(WithSetterThatThrowsValidationExceptionProperties.class) static class WithUnsupportedCustomValidatorConfiguration { @@ -1832,7 +1832,7 @@ public class ConfigurationPropertiesTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(OtherInjectedProperties.class) static class OtherInjectPropertiesConfiguration { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/FailureAnalyzersIntegrationTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/FailureAnalyzersIntegrationTests.java index 888f1bd8009..53408066a63 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/FailureAnalyzersIntegrationTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/FailureAnalyzersIntegrationTests.java @@ -48,7 +48,7 @@ public class FailureAnalyzersIntegrationTests { assertThat(this.outputCapture.toString()).contains("APPLICATION FAILED TO START"); } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestConfiguration { @PostConstruct diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanCurrentlyInCreationFailureAnalyzerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanCurrentlyInCreationFailureAnalyzerTests.java index 2cabd980d2d..01db8137798 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanCurrentlyInCreationFailureAnalyzerTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanCurrentlyInCreationFailureAnalyzerTests.java @@ -148,7 +148,7 @@ public class BeanCurrentlyInCreationFailureAnalyzerTests { } } - @org.springframework.context.annotation.Configuration + @org.springframework.context.annotation.Configuration(proxyBeanMethods = false) static class CyclicBeanMethodsConfiguration { @Bean @@ -156,7 +156,7 @@ public class BeanCurrentlyInCreationFailureAnalyzerTests { return new BeanThree(); } - @org.springframework.context.annotation.Configuration + @org.springframework.context.annotation.Configuration(proxyBeanMethods = false) static class InnerConfiguration { @Bean @@ -164,7 +164,7 @@ public class BeanCurrentlyInCreationFailureAnalyzerTests { return new BeanTwo(); } - @Configuration + @Configuration(proxyBeanMethods = false) static class InnerInnerConfiguration { @Bean @@ -178,7 +178,7 @@ public class BeanCurrentlyInCreationFailureAnalyzerTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class CycleReferencedViaOtherBeansConfiguration { @Bean @@ -196,7 +196,7 @@ public class BeanCurrentlyInCreationFailureAnalyzerTests { return new BeanThree(); } - @Configuration + @Configuration(proxyBeanMethods = false) static class InnerConfiguration { @Bean @@ -204,7 +204,7 @@ public class BeanCurrentlyInCreationFailureAnalyzerTests { return new RefererTwo(); } - @Configuration + @Configuration(proxyBeanMethods = false) static class InnerInnerConfiguration { @Bean @@ -218,7 +218,7 @@ public class BeanCurrentlyInCreationFailureAnalyzerTests { } - @org.springframework.context.annotation.Configuration + @org.springframework.context.annotation.Configuration(proxyBeanMethods = false) public static class CycleWithAutowiredFields { @Bean @@ -226,7 +226,7 @@ public class BeanCurrentlyInCreationFailureAnalyzerTests { return new BeanOne(); } - @org.springframework.context.annotation.Configuration + @org.springframework.context.annotation.Configuration(proxyBeanMethods = false) public static class BeanTwoConfiguration { @SuppressWarnings("unused") @@ -240,7 +240,7 @@ public class BeanCurrentlyInCreationFailureAnalyzerTests { } - @org.springframework.context.annotation.Configuration + @org.springframework.context.annotation.Configuration(proxyBeanMethods = false) public static class BeanThreeConfiguration { @Bean diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanDefinitionOverrideFailureAnalyzerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanDefinitionOverrideFailureAnalyzerTests.java index 3b55197f056..d3c69b1695c 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanDefinitionOverrideFailureAnalyzerTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanDefinitionOverrideFailureAnalyzerTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -63,13 +63,13 @@ public class BeanDefinitionOverrideFailureAnalyzerTests { } } - @Configuration + @Configuration(proxyBeanMethods = false) @Import({ FirstConfiguration.class, SecondConfiguration.class }) static class BeanOverrideConfiguration { } - @Configuration + @Configuration(proxyBeanMethods = false) static class FirstConfiguration { @Bean @@ -79,7 +79,7 @@ public class BeanDefinitionOverrideFailureAnalyzerTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class SecondConfiguration { @Bean diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanNotOfRequiredTypeFailureAnalyzerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanNotOfRequiredTypeFailureAnalyzerTests.java index dbc9fc7fd50..6683518b3dc 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanNotOfRequiredTypeFailureAnalyzerTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanNotOfRequiredTypeFailureAnalyzerTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -67,7 +67,7 @@ public class BeanNotOfRequiredTypeFailureAnalyzerTests { } } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAsync @Import(UserConfiguration.class) static class JdkProxyConfiguration { @@ -79,7 +79,7 @@ public class BeanNotOfRequiredTypeFailureAnalyzerTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class UserConfiguration { @Bean diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/InvalidConfigurationPropertyNameFailureAnalyzerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/InvalidConfigurationPropertyNameFailureAnalyzerTests.java index a5350270424..cadfe3bf037 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/InvalidConfigurationPropertyNameFailureAnalyzerTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/InvalidConfigurationPropertyNameFailureAnalyzerTests.java @@ -61,7 +61,7 @@ public class InvalidConfigurationPropertyNameFailureAnalyzerTests { } } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(InvalidPrefixProperties.class) static class InvalidPrefixConfiguration { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/NoUniqueBeanDefinitionFailureAnalyzerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/NoUniqueBeanDefinitionFailureAnalyzerTests.java index ac509d9a43b..52ee19f6b7b 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/NoUniqueBeanDefinitionFailureAnalyzerTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/NoUniqueBeanDefinitionFailureAnalyzerTests.java @@ -136,7 +136,7 @@ public class NoUniqueBeanDefinitionFailureAnalyzerTests { assertThat(analysis.getDescription()).contains("xmlTestBean"); } - @Configuration + @Configuration(proxyBeanMethods = false) @ComponentScan(basePackageClasses = TestBean.class) @ImportResource("/org/springframework/boot/diagnostics/analyzer/nounique/producer.xml") static class DuplicateBeansProducer { @@ -153,7 +153,7 @@ public class NoUniqueBeanDefinitionFailureAnalyzerTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ParentProducer { @Bean @@ -163,7 +163,7 @@ public class NoUniqueBeanDefinitionFailureAnalyzerTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class FieldConsumer { @SuppressWarnings("unused") @@ -172,7 +172,7 @@ public class NoUniqueBeanDefinitionFailureAnalyzerTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ObjectProviderConstructorConsumer { ObjectProviderConstructorConsumer(ObjectProvider objectProvider) { @@ -181,7 +181,7 @@ public class NoUniqueBeanDefinitionFailureAnalyzerTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ConstructorConsumer { ConstructorConsumer(TestBean testBean) { @@ -190,7 +190,7 @@ public class NoUniqueBeanDefinitionFailureAnalyzerTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class MethodConsumer { @Bean @@ -200,7 +200,7 @@ public class NoUniqueBeanDefinitionFailureAnalyzerTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ObjectProviderMethodConsumer { @Bean @@ -211,7 +211,7 @@ public class NoUniqueBeanDefinitionFailureAnalyzerTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @ImportResource("/org/springframework/boot/diagnostics/analyzer/nounique/consumer.xml") static class XmlConsumer { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jta/atomikos/AtomikosDependsOnBeanFactoryPostProcessorTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jta/atomikos/AtomikosDependsOnBeanFactoryPostProcessorTests.java index e7413d92f19..16af5e8c511 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jta/atomikos/AtomikosDependsOnBeanFactoryPostProcessorTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jta/atomikos/AtomikosDependsOnBeanFactoryPostProcessorTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -64,7 +64,7 @@ public class AtomikosDependsOnBeanFactoryPostProcessorTests { assertThat(dependsOn).isEqualTo(new HashSet<>(Arrays.asList(expected))); } - @Configuration + @Configuration(proxyBeanMethods = false) static class Config { @Bean diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jta/bitronix/BitronixDependentBeanFactoryPostProcessorTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jta/bitronix/BitronixDependentBeanFactoryPostProcessorTests.java index adddd182893..8f6852f4ef8 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jta/bitronix/BitronixDependentBeanFactoryPostProcessorTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jta/bitronix/BitronixDependentBeanFactoryPostProcessorTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -52,7 +52,7 @@ public class BitronixDependentBeanFactoryPostProcessorTests { this.context.close(); } - @Configuration + @Configuration(proxyBeanMethods = false) static class Config { @Bean diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/liquibase/LiquibaseServiceLocatorApplicationListenerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/liquibase/LiquibaseServiceLocatorApplicationListenerTests.java index 8b6b08879e2..3cc9605b701 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/liquibase/LiquibaseServiceLocatorApplicationListenerTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/liquibase/LiquibaseServiceLocatorApplicationListenerTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -84,7 +84,7 @@ public class LiquibaseServiceLocatorApplicationListenerTests { return field.get(instance); } - @Configuration + @Configuration(proxyBeanMethods = false) public static class Conf { } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/context/AnnotationConfigReactiveWebServerApplicationContextTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/context/AnnotationConfigReactiveWebServerApplicationContextTests.java index c3ed2f6d41a..a52a58bddb0 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/context/AnnotationConfigReactiveWebServerApplicationContextTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/context/AnnotationConfigReactiveWebServerApplicationContextTests.java @@ -161,7 +161,7 @@ public class AnnotationConfigReactiveWebServerApplicationContextTests { assertThat(actualHandler).isEqualTo(expectedHandler); } - @Configuration + @Configuration(proxyBeanMethods = false) public static class WebServerConfiguration { @Bean @@ -171,7 +171,7 @@ public class AnnotationConfigReactiveWebServerApplicationContextTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class HttpHandlerConfiguration { @Bean @@ -181,7 +181,7 @@ public class AnnotationConfigReactiveWebServerApplicationContextTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class InitializationTestConfig { private static boolean addedListener; diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/context/config/ExampleReactiveWebServerApplicationConfiguration.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/context/config/ExampleReactiveWebServerApplicationConfiguration.java index fd1ee0f4540..67c02748911 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/context/config/ExampleReactiveWebServerApplicationConfiguration.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/context/config/ExampleReactiveWebServerApplicationConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -30,7 +30,7 @@ import static org.mockito.Mockito.mock; * * @author Phillip Webb */ -@Configuration +@Configuration(proxyBeanMethods = false) public class ExampleReactiveWebServerApplicationConfiguration { @Bean diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/LocalServerPortTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/LocalServerPortTests.java index 378805cbe3a..3908df575c3 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/LocalServerPortTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/LocalServerPortTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -47,7 +47,7 @@ public class LocalServerPortTests { assertThat(this.fromAnnotation).isNotNull().isEqualTo(this.fromValue); } - @Configuration + @Configuration(proxyBeanMethods = false) static class Config { } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/FilterRegistrationIntegrationTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/FilterRegistrationIntegrationTests.java index 3f67aacf56c..c95e3adafb4 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/FilterRegistrationIntegrationTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/FilterRegistrationIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -62,7 +62,7 @@ public class FilterRegistrationIntegrationTests { ContainerConfiguration.class, configuration); } - @Configuration + @Configuration(proxyBeanMethods = false) static class ContainerConfiguration { @Bean @@ -72,7 +72,7 @@ public class FilterRegistrationIntegrationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ScopedTargetFilterConfiguration { @Bean(name = "scopedTarget.myFilter") @@ -82,7 +82,7 @@ public class FilterRegistrationIntegrationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class FilterConfiguration { @Bean diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletComponentScanIntegrationTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletComponentScanIntegrationTests.java index 01be05f64c5..c74ef33fcc4 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletComponentScanIntegrationTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletComponentScanIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -82,7 +82,7 @@ public class ServletComponentScanIntegrationTests { assertThat(multipartConfig.getFileSizeThreshold()).isEqualTo(512); } - @Configuration + @Configuration(proxyBeanMethods = false) @ServletComponentScan(basePackages = "org.springframework.boot.web.servlet.testcomponents") static class TestConfiguration { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletComponentScanRegistrarTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletComponentScanRegistrarTests.java index 44ab3b4da79..ce2277f92f4 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletComponentScanRegistrarTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletComponentScanRegistrarTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -133,37 +133,37 @@ public class ServletComponentScanRegistrarTests { "com.example.bar"); } - @Configuration + @Configuration(proxyBeanMethods = false) @ServletComponentScan({ "com.example.foo", "com.example.bar" }) static class ValuePackages { } - @Configuration + @Configuration(proxyBeanMethods = false) @ServletComponentScan(basePackages = { "com.example.foo", "com.example.bar" }) static class BasePackages { } - @Configuration + @Configuration(proxyBeanMethods = false) @ServletComponentScan(basePackages = "com.example.baz") static class AdditionalPackages { } - @Configuration + @Configuration(proxyBeanMethods = false) @ServletComponentScan(basePackageClasses = ServletComponentScanRegistrarTests.class) static class BasePackageClasses { } - @Configuration + @Configuration(proxyBeanMethods = false) @ServletComponentScan(value = "com.example.foo", basePackages = "com.example.bar") static class ValueAndBasePackages { } - @Configuration + @Configuration(proxyBeanMethods = false) @ServletComponentScan static class NoBasePackages { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletContextInitializerBeansTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletContextInitializerBeansTests.java index 1eafa8f26d9..ac4d534a7e4 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletContextInitializerBeansTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletContextInitializerBeansTests.java @@ -77,7 +77,7 @@ public class ServletContextInitializerBeansTests { this.context = new AnnotationConfigApplicationContext(configuration); } - @Configuration + @Configuration(proxyBeanMethods = false) static class ServletConfiguration { @Bean @@ -87,7 +87,7 @@ public class ServletContextInitializerBeansTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class FilterConfiguration { @Bean @@ -97,7 +97,7 @@ public class ServletContextInitializerBeansTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestConfiguration { @Bean diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/AnnotationConfigServletWebServerApplicationContextTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/AnnotationConfigServletWebServerApplicationContextTests.java index f02f9b2cae5..88018dcad8e 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/AnnotationConfigServletWebServerApplicationContextTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/AnnotationConfigServletWebServerApplicationContextTests.java @@ -217,7 +217,7 @@ public class AnnotationConfigServletWebServerApplicationContextTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWebMvc public static class ServletContextAwareEmbeddedConfiguration implements ServletContextAware { @@ -245,7 +245,7 @@ public class AnnotationConfigServletWebServerApplicationContextTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class WebServerConfiguration { @Bean @@ -255,7 +255,7 @@ public class AnnotationConfigServletWebServerApplicationContextTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWebMvc public static class ServletContextAwareConfiguration implements ServletContextAware { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerMvcIntegrationTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerMvcIntegrationTests.java index e1a3256868e..1821b0bbb00 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerMvcIntegrationTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerMvcIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -115,7 +115,7 @@ public class ServletWebServerMvcIntegrationTests { JettyServletWebServerFactory.class, Config.class); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(Config.class) public static class TomcatConfig { @@ -126,7 +126,7 @@ public class ServletWebServerMvcIntegrationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(Config.class) public static class JettyConfig { @@ -137,7 +137,7 @@ public class ServletWebServerMvcIntegrationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(Config.class) public static class UndertowConfig { @@ -148,7 +148,7 @@ public class ServletWebServerMvcIntegrationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWebMvc public static class Config { @@ -167,7 +167,7 @@ public class ServletWebServerMvcIntegrationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWebMvc @PropertySource("classpath:/org/springframework/boot/web/servlet/context/conf.properties") public static class AdvancedConfig { @@ -186,9 +186,10 @@ public class ServletWebServerMvcIntegrationTests { } @Bean - public ServletRegistrationBean dispatcherRegistration() { + public ServletRegistrationBean dispatcherRegistration( + DispatcherServlet dispatcherServlet) { ServletRegistrationBean registration = new ServletRegistrationBean<>( - dispatcherServlet()); + dispatcherServlet); registration.addUrlMappings("/spring/*"); return registration; } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/config/ExampleServletWebServerApplicationConfiguration.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/config/ExampleServletWebServerApplicationConfiguration.java index 02204df83d0..889edd70445 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/config/ExampleServletWebServerApplicationConfiguration.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/config/ExampleServletWebServerApplicationConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -30,7 +30,7 @@ import org.springframework.context.annotation.Configuration; * * @author Phillip Webb */ -@Configuration +@Configuration(proxyBeanMethods = false) public class ExampleServletWebServerApplicationConfiguration { @Bean diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/ErrorPageFilterIntegrationTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/ErrorPageFilterIntegrationTests.java index 0b0ff7c7f0d..7810a2bba7c 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/ErrorPageFilterIntegrationTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/ErrorPageFilterIntegrationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -101,7 +101,7 @@ public class ErrorPageFilterIntegrationTests { assertThat(entity.getStatusCode()).isEqualTo(status); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableWebMvc public static class TomcatConfig { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/SpringBootServletInitializerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/SpringBootServletInitializerTests.java index f719f945a07..280e6d24c79 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/SpringBootServletInitializerTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/SpringBootServletInitializerTests.java @@ -158,7 +158,7 @@ public class SpringBootServletInitializerTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestApp { } @@ -191,7 +191,7 @@ public class SpringBootServletInitializerTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public class WithConfigurationAnnotation extends MockSpringBootServletInitializer { } @@ -206,7 +206,7 @@ public class SpringBootServletInitializerTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class WithErrorPageFilterNotRegistered extends SpringBootServletInitializer { @@ -216,7 +216,7 @@ public class SpringBootServletInitializerTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class ExecutableWar extends SpringBootServletInitializer { @Bean @@ -226,7 +226,7 @@ public class SpringBootServletInitializerTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class Config { } diff --git a/spring-boot-project/spring-boot/src/test/kotlin/org/springframework/boot/SpringApplicationExtensionsTests.kt b/spring-boot-project/spring-boot/src/test/kotlin/org/springframework/boot/SpringApplicationExtensionsTests.kt index e6ef0de7d01..43d6f29e903 100644 --- a/spring-boot-project/spring-boot/src/test/kotlin/org/springframework/boot/SpringApplicationExtensionsTests.kt +++ b/spring-boot-project/spring-boot/src/test/kotlin/org/springframework/boot/SpringApplicationExtensionsTests.kt @@ -70,7 +70,7 @@ class SpringApplicationExtensionsTests { assertEquals(environment, context.environment) } - @Configuration + @Configuration(proxyBeanMethods = false) internal open class ExampleWebConfig { @Bean diff --git a/spring-boot-samples/spring-boot-sample-actuator-custom-security/src/main/java/sample/actuator/customsecurity/SecurityConfiguration.java b/spring-boot-samples/spring-boot-sample-actuator-custom-security/src/main/java/sample/actuator/customsecurity/SecurityConfiguration.java index b4cf99dfb26..a29ba9a6122 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-custom-security/src/main/java/sample/actuator/customsecurity/SecurityConfiguration.java +++ b/spring-boot-samples/spring-boot-sample-actuator-custom-security/src/main/java/sample/actuator/customsecurity/SecurityConfiguration.java @@ -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"); * you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur import org.springframework.security.core.userdetails.User; import org.springframework.security.provisioning.InMemoryUserDetailsManager; -@Configuration +@Configuration(proxyBeanMethods = false) public class SecurityConfiguration extends WebSecurityConfigurerAdapter { @SuppressWarnings("deprecation") diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ShutdownSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ShutdownSampleActuatorApplicationTests.java index f0487ae34ec..e01842b030d 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ShutdownSampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ShutdownSampleActuatorApplicationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -77,7 +77,7 @@ public class ShutdownSampleActuatorApplicationTests { return "password"; } - @Configuration + @Configuration(proxyBeanMethods = false) static class SecurityConfiguration extends WebSecurityConfigurerAdapter { @Override diff --git a/spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/atmosphere/SampleAtmosphereApplication.java b/spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/atmosphere/SampleAtmosphereApplication.java index 9af08d0c551..1e20c4564b9 100644 --- a/spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/atmosphere/SampleAtmosphereApplication.java +++ b/spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/atmosphere/SampleAtmosphereApplication.java @@ -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"); * you may not use this file except in compliance with the License. @@ -65,7 +65,7 @@ public class SampleAtmosphereApplication { SpringApplication.run(SampleAtmosphereApplication.class, args); } - @Configuration + @Configuration(proxyBeanMethods = false) static class MvcConfiguration implements WebMvcConfigurer { @Override diff --git a/spring-boot-samples/spring-boot-sample-atmosphere/src/test/java/sample/atmosphere/SampleAtmosphereApplicationTests.java b/spring-boot-samples/spring-boot-sample-atmosphere/src/test/java/sample/atmosphere/SampleAtmosphereApplicationTests.java index 6ee0f348ac9..7087a00cd0d 100644 --- a/spring-boot-samples/spring-boot-sample-atmosphere/src/test/java/sample/atmosphere/SampleAtmosphereApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-atmosphere/src/test/java/sample/atmosphere/SampleAtmosphereApplicationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -69,7 +69,7 @@ public class SampleAtmosphereApplicationTests { .contains("{\"message\":\"test\",\"author\":\"test\",\"time\":"); } - @Configuration + @Configuration(proxyBeanMethods = false) static class ClientConfiguration implements CommandLineRunner { @Value("${websocket.uri}") diff --git a/spring-boot-samples/spring-boot-sample-integration/src/test/java/sample/integration/producer/ProducerApplication.java b/spring-boot-samples/spring-boot-sample-integration/src/test/java/sample/integration/producer/ProducerApplication.java index 6ab1c1d6b57..9882d97a739 100644 --- a/spring-boot-samples/spring-boot-sample-integration/src/test/java/sample/integration/producer/ProducerApplication.java +++ b/spring-boot-samples/spring-boot-sample-integration/src/test/java/sample/integration/producer/ProducerApplication.java @@ -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"); * you may not use this file except in compliance with the License. @@ -27,7 +27,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Configuration; -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(ServiceProperties.class) public class ProducerApplication implements ApplicationRunner { diff --git a/spring-boot-samples/spring-boot-sample-parent-context/src/main/java/sample/parent/SampleParentContextApplication.java b/spring-boot-samples/spring-boot-sample-parent-context/src/main/java/sample/parent/SampleParentContextApplication.java index 04bbaf24f47..018abaa95a8 100644 --- a/spring-boot-samples/spring-boot-sample-parent-context/src/main/java/sample/parent/SampleParentContextApplication.java +++ b/spring-boot-samples/spring-boot-sample-parent-context/src/main/java/sample/parent/SampleParentContextApplication.java @@ -40,7 +40,7 @@ public class SampleParentContextApplication { .child(SampleParentContextApplication.class).run(args); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @EnableConfigurationProperties(ServiceProperties.class) protected static class Parent { diff --git a/spring-boot-samples/spring-boot-sample-parent-context/src/test/java/sample/parent/producer/ProducerApplication.java b/spring-boot-samples/spring-boot-sample-parent-context/src/test/java/sample/parent/producer/ProducerApplication.java index e60ee90212c..32ee0616154 100644 --- a/spring-boot-samples/spring-boot-sample-parent-context/src/test/java/sample/parent/producer/ProducerApplication.java +++ b/spring-boot-samples/spring-boot-sample-parent-context/src/test/java/sample/parent/producer/ProducerApplication.java @@ -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"); * you may not use this file except in compliance with the License. @@ -27,7 +27,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Configuration; -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(ServiceProperties.class) public class ProducerApplication implements ApplicationRunner { diff --git a/spring-boot-samples/spring-boot-sample-secure-webflux/src/test/java/sample/secure/webflux/ManagementPortSampleSecureWebFluxTests.java b/spring-boot-samples/spring-boot-sample-secure-webflux/src/test/java/sample/secure/webflux/ManagementPortSampleSecureWebFluxTests.java index 4c7fdc0858b..7ac2d7024d2 100644 --- a/spring-boot-samples/spring-boot-sample-secure-webflux/src/test/java/sample/secure/webflux/ManagementPortSampleSecureWebFluxTests.java +++ b/spring-boot-samples/spring-boot-sample-secure-webflux/src/test/java/sample/secure/webflux/ManagementPortSampleSecureWebFluxTests.java @@ -97,7 +97,7 @@ public class ManagementPortSampleSecureWebFluxTests { return new String(Base64.getEncoder().encode(("user:password").getBytes())); } - @Configuration + @Configuration(proxyBeanMethods = false) static class SecurityConfiguration { @Bean diff --git a/spring-boot-samples/spring-boot-sample-secure-webflux/src/test/java/sample/secure/webflux/SampleSecureWebFluxCustomSecurityTests.java b/spring-boot-samples/spring-boot-sample-secure-webflux/src/test/java/sample/secure/webflux/SampleSecureWebFluxCustomSecurityTests.java index c4bd7341b74..cb2123c6315 100644 --- a/spring-boot-samples/spring-boot-sample-secure-webflux/src/test/java/sample/secure/webflux/SampleSecureWebFluxCustomSecurityTests.java +++ b/spring-boot-samples/spring-boot-sample-secure-webflux/src/test/java/sample/secure/webflux/SampleSecureWebFluxCustomSecurityTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -109,7 +109,7 @@ public class SampleSecureWebFluxCustomSecurityTests { return new String(Base64.getEncoder().encode(("admin:admin").getBytes())); } - @Configuration + @Configuration(proxyBeanMethods = false) static class SecurityConfiguration { @SuppressWarnings("deprecation") diff --git a/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java b/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java index 939a4cfcec4..f6b86b26bf1 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -59,7 +59,7 @@ public class NonAutoConfigurationSampleTomcatApplicationTests { assertThat(entity.getBody()).isEqualTo("Hello World"); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import({ ServletWebServerFactoryAutoConfiguration.class, DispatcherServletAutoConfiguration.class, WebMvcAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, diff --git a/spring-boot-samples/spring-boot-sample-traditional/src/main/java/sample/traditional/config/WebConfig.java b/spring-boot-samples/spring-boot-sample-traditional/src/main/java/sample/traditional/config/WebConfig.java index faa679fa0e1..21ee3071deb 100644 --- a/spring-boot-samples/spring-boot-sample-traditional/src/main/java/sample/traditional/config/WebConfig.java +++ b/spring-boot-samples/spring-boot-sample-traditional/src/main/java/sample/traditional/config/WebConfig.java @@ -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"); * you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ import org.springframework.web.servlet.view.InternalResourceViewResolver; @EnableWebMvc @ComponentScan -@Configuration +@Configuration(proxyBeanMethods = false) public class WebConfig implements WebMvcConfigurer { @Override diff --git a/spring-boot-samples/spring-boot-sample-web-method-security/src/main/java/sample/security/method/SampleMethodSecurityApplication.java b/spring-boot-samples/spring-boot-sample-web-method-security/src/main/java/sample/security/method/SampleMethodSecurityApplication.java index e3cac811dad..2c940ceca5d 100644 --- a/spring-boot-samples/spring-boot-sample-web-method-security/src/main/java/sample/security/method/SampleMethodSecurityApplication.java +++ b/spring-boot-samples/spring-boot-sample-web-method-security/src/main/java/sample/security/method/SampleMethodSecurityApplication.java @@ -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"); * you may not use this file except in compliance with the License. @@ -53,7 +53,7 @@ public class SampleMethodSecurityApplication implements WebMvcConfigurer { } @Order(Ordered.HIGHEST_PRECEDENCE) - @Configuration + @Configuration(proxyBeanMethods = false) protected static class AuthenticationSecurity { @SuppressWarnings("deprecation") @@ -68,7 +68,7 @@ public class SampleMethodSecurityApplication implements WebMvcConfigurer { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class ApplicationSecurity extends WebSecurityConfigurerAdapter { @Override @@ -88,7 +88,7 @@ public class SampleMethodSecurityApplication implements WebMvcConfigurer { } - @Configuration + @Configuration(proxyBeanMethods = false) @Order(1) protected static class ActuatorSecurity extends WebSecurityConfigurerAdapter { diff --git a/spring-boot-samples/spring-boot-sample-web-secure-custom/src/main/java/sample/web/secure/custom/SampleWebSecureCustomApplication.java b/spring-boot-samples/spring-boot-sample-web-secure-custom/src/main/java/sample/web/secure/custom/SampleWebSecureCustomApplication.java index 65da8b22961..5feaeff8b55 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure-custom/src/main/java/sample/web/secure/custom/SampleWebSecureCustomApplication.java +++ b/spring-boot-samples/spring-boot-sample-web-secure-custom/src/main/java/sample/web/secure/custom/SampleWebSecureCustomApplication.java @@ -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"); * you may not use this file except in compliance with the License. @@ -56,7 +56,7 @@ public class SampleWebSecureCustomApplication implements WebMvcConfigurer { new SpringApplicationBuilder(SampleWebSecureCustomApplication.class).run(args); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class ApplicationSecurity extends WebSecurityConfigurerAdapter { @Override diff --git a/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/java/sample/web/secure/jdbc/SampleWebSecureJdbcApplication.java b/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/java/sample/web/secure/jdbc/SampleWebSecureJdbcApplication.java index d0dc0b066da..62d1c180cc0 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/java/sample/web/secure/jdbc/SampleWebSecureJdbcApplication.java +++ b/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/java/sample/web/secure/jdbc/SampleWebSecureJdbcApplication.java @@ -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"); * you may not use this file except in compliance with the License. @@ -60,7 +60,7 @@ public class SampleWebSecureJdbcApplication implements WebMvcConfigurer { new SpringApplicationBuilder(SampleWebSecureJdbcApplication.class).run(args); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class ApplicationSecurity extends WebSecurityConfigurerAdapter { @Override diff --git a/spring-boot-samples/spring-boot-sample-web-secure/src/main/java/sample/web/secure/SampleWebSecureApplication.java b/spring-boot-samples/spring-boot-sample-web-secure/src/main/java/sample/web/secure/SampleWebSecureApplication.java index b8962b9e082..45236be3c35 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure/src/main/java/sample/web/secure/SampleWebSecureApplication.java +++ b/spring-boot-samples/spring-boot-sample-web-secure/src/main/java/sample/web/secure/SampleWebSecureApplication.java @@ -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"); * you may not use this file except in compliance with the License. @@ -57,7 +57,7 @@ public class SampleWebSecureApplication implements WebMvcConfigurer { new SpringApplicationBuilder(SampleWebSecureApplication.class).run(args); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class ApplicationSecurity extends WebSecurityConfigurerAdapter { @Override diff --git a/spring-boot-samples/spring-boot-sample-webservices/src/main/java/sample/webservices/WebServiceConfig.java b/spring-boot-samples/spring-boot-sample-webservices/src/main/java/sample/webservices/WebServiceConfig.java index f57dc6aa8d0..155620745e4 100644 --- a/spring-boot-samples/spring-boot-sample-webservices/src/main/java/sample/webservices/WebServiceConfig.java +++ b/spring-boot-samples/spring-boot-sample-webservices/src/main/java/sample/webservices/WebServiceConfig.java @@ -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"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ import org.springframework.ws.config.annotation.WsConfigurerAdapter; import org.springframework.ws.wsdl.wsdl11.DefaultWsdl11Definition; import org.springframework.xml.xsd.XsdSchema; -@Configuration +@Configuration(proxyBeanMethods = false) public class WebServiceConfig extends WsConfigurerAdapter { @Bean(name = "holiday") diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/SampleJettyWebSocketsApplication.java b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/SampleJettyWebSocketsApplication.java index fe5fdf17331..7f468f0a8a5 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/SampleJettyWebSocketsApplication.java +++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/SampleJettyWebSocketsApplication.java @@ -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"); * you may not use this file except in compliance with the License. @@ -37,7 +37,7 @@ import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry import org.springframework.web.socket.handler.PerConnectionWebSocketHandler; import org.springframework.web.socket.server.standard.ServerEndpointExporter; -@Configuration +@Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @EnableWebSocket public class SampleJettyWebSocketsApplication extends SpringBootServletInitializer diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/jetty/SampleWebSocketsApplicationTests.java b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/jetty/SampleWebSocketsApplicationTests.java index 2be99ce78da..f5c2b13c6f0 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/jetty/SampleWebSocketsApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/jetty/SampleWebSocketsApplicationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -84,7 +84,7 @@ public class SampleWebSocketsApplicationTests { assertThat(messagePayloadReference.get()).isEqualTo("Reversed: !dlrow olleH"); } - @Configuration + @Configuration(proxyBeanMethods = false) static class ClientConfiguration implements CommandLineRunner { @Value("${websocket.uri}") diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/jetty/echo/CustomContainerWebSocketsApplicationTests.java b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/jetty/echo/CustomContainerWebSocketsApplicationTests.java index fee76b4346a..483fa23b6ba 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/jetty/echo/CustomContainerWebSocketsApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/jetty/echo/CustomContainerWebSocketsApplicationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -90,7 +90,7 @@ public class CustomContainerWebSocketsApplicationTests { assertThat(messagePayloadReference.get()).isEqualTo("Reversed: !dlrow olleH"); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class CustomContainerConfiguration { @Bean @@ -100,7 +100,7 @@ public class CustomContainerWebSocketsApplicationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ClientConfiguration implements CommandLineRunner { @Value("${websocket.uri}") diff --git a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/SampleTomcatWebSocketApplication.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/SampleTomcatWebSocketApplication.java index c0d79da9351..2df25265457 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/SampleTomcatWebSocketApplication.java +++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/SampleTomcatWebSocketApplication.java @@ -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"); * you may not use this file except in compliance with the License. @@ -37,7 +37,7 @@ import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry import org.springframework.web.socket.handler.PerConnectionWebSocketHandler; import org.springframework.web.socket.server.standard.ServerEndpointExporter; -@Configuration +@Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @EnableWebSocket public class SampleTomcatWebSocketApplication extends SpringBootServletInitializer diff --git a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/tomcat/SampleWebSocketsApplicationTests.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/tomcat/SampleWebSocketsApplicationTests.java index fd638f57ee0..30bcbf3e93d 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/tomcat/SampleWebSocketsApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/tomcat/SampleWebSocketsApplicationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -84,7 +84,7 @@ public class SampleWebSocketsApplicationTests { assertThat(messagePayloadReference.get()).isEqualTo("Reversed: !dlrow olleH"); } - @Configuration + @Configuration(proxyBeanMethods = false) static class ClientConfiguration implements CommandLineRunner { @Value("${websocket.uri}") diff --git a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/tomcat/echo/CustomContainerWebSocketsApplicationTests.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/tomcat/echo/CustomContainerWebSocketsApplicationTests.java index 393a138cde5..3cf37306107 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/tomcat/echo/CustomContainerWebSocketsApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/tomcat/echo/CustomContainerWebSocketsApplicationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -90,7 +90,7 @@ public class CustomContainerWebSocketsApplicationTests { assertThat(messagePayloadReference.get()).isEqualTo("Reversed: !dlrow olleH"); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class CustomContainerConfiguration { @Bean @@ -100,7 +100,7 @@ public class CustomContainerWebSocketsApplicationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ClientConfiguration implements CommandLineRunner { @Value("${websocket.uri}") diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/SampleUndertowWebSocketsApplication.java b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/SampleUndertowWebSocketsApplication.java index 40901390663..22ff853c0a4 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/SampleUndertowWebSocketsApplication.java +++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/SampleUndertowWebSocketsApplication.java @@ -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"); * you may not use this file except in compliance with the License. @@ -37,7 +37,7 @@ import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry import org.springframework.web.socket.handler.PerConnectionWebSocketHandler; import org.springframework.web.socket.server.standard.ServerEndpointExporter; -@Configuration +@Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @EnableWebSocket public class SampleUndertowWebSocketsApplication extends SpringBootServletInitializer diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/SampleWebSocketsApplicationTests.java b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/SampleWebSocketsApplicationTests.java index cf5d61a03db..13a7c990a31 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/SampleWebSocketsApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/SampleWebSocketsApplicationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -84,7 +84,7 @@ public class SampleWebSocketsApplicationTests { assertThat(messagePayloadReference.get()).isEqualTo("Reversed: !dlrow olleH"); } - @Configuration + @Configuration(proxyBeanMethods = false) static class ClientConfiguration implements CommandLineRunner { @Value("${websocket.uri}") diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/echo/CustomContainerWebSocketsApplicationTests.java b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/echo/CustomContainerWebSocketsApplicationTests.java index 724134f44c2..8c867bf6f56 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/echo/CustomContainerWebSocketsApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/echo/CustomContainerWebSocketsApplicationTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -90,7 +90,7 @@ public class CustomContainerWebSocketsApplicationTests { assertThat(messagePayloadReference.get()).isEqualTo("Reversed: !dlrow olleH"); } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class CustomContainerConfiguration { @Bean @@ -100,7 +100,7 @@ public class CustomContainerWebSocketsApplicationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class ClientConfiguration implements CommandLineRunner { @Value("${websocket.uri}")