Added proxyBeanMethods = false to configuration classes. Fixes #623

This commit is contained in:
Ryan Baxter
2019-11-14 20:04:28 -05:00
parent 80a9a38712
commit 18a4227c4e
100 changed files with 147 additions and 147 deletions

View File

@@ -33,7 +33,7 @@ import org.springframework.context.annotation.Configuration;
*
* @author Dave Syer
*/
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnBean(ConfigurationPropertiesBindingPostProcessor.class)
public class ConfigurationPropertiesRebinderAutoConfiguration
implements ApplicationContextAware, SmartInitializingSingleton {

View File

@@ -32,7 +32,7 @@ import org.springframework.core.env.ConfigurableEnvironment;
* @author Dave Syer
*
*/
@Configuration
@Configuration(proxyBeanMethods = false)
@AutoConfigureAfter(WebMvcAutoConfiguration.class)
public class LifecycleMvcEndpointAutoConfiguration {

View File

@@ -61,7 +61,7 @@ import org.springframework.util.StringUtils;
* @author Dave Syer
* @author Venil Noronha
*/
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(RefreshScope.class)
@ConditionalOnProperty(name = RefreshAutoConfiguration.REFRESH_SCOPE_ENABLED,
matchIfMissing = true)
@@ -107,7 +107,7 @@ public class RefreshAutoConfiguration {
return new RefreshEventListener(contextRefresher);
}
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(name = "javax.persistence.EntityManagerFactory")
protected static class JpaInvokerConfiguration implements LoadTimeWeaverAware {

View File

@@ -44,7 +44,7 @@ import org.springframework.integration.monitor.IntegrationMBeanExporter;
* @author Spencer Gibb
* @author Venil Noronha
*/
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass({ EndpointAutoConfiguration.class, Health.class })
@AutoConfigureAfter({ LifecycleMvcEndpointAutoConfiguration.class,
RefreshAutoConfiguration.class })
@@ -62,7 +62,7 @@ public class RefreshEndpointAutoConfiguration {
return new RefreshScopeHealthIndicator(scope, rebinder);
}
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnBean(PropertySourceBootstrapConfiguration.class)
protected static class RefreshEndpointConfiguration {
@@ -78,7 +78,7 @@ public class RefreshEndpointAutoConfiguration {
}
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(IntegrationMBeanExporter.class)
class RestartEndpointWithIntegrationConfiguration {
@@ -98,7 +98,7 @@ class RestartEndpointWithIntegrationConfiguration {
}
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnMissingClass("org.springframework.integration.monitor.IntegrationMBeanExporter")
class RestartEndpointWithoutIntegrationConfiguration {
@@ -111,7 +111,7 @@ class RestartEndpointWithoutIntegrationConfiguration {
}
@Configuration
@Configuration(proxyBeanMethods = false)
class PauseResumeEndpointsConfiguration {
@Bean

View File

@@ -42,7 +42,7 @@ import org.springframework.core.env.Environment;
* @author Stephane Nicoll
* @since 2.0.0
*/
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass({ EnvironmentEndpoint.class, EnvironmentEndpointProperties.class })
@ConditionalOnBean(EnvironmentManager.class)
@AutoConfigureBefore(EnvironmentEndpointAutoConfiguration.class)

View File

@@ -24,7 +24,7 @@ import org.springframework.context.annotation.Import;
*
* @author Spencer Gibb
*/
@Configuration
@Configuration(proxyBeanMethods = false)
@Import(BootstrapImportSelector.class)
public class BootstrapImportSelectorConfiguration {

View File

@@ -57,7 +57,7 @@ import org.springframework.util.StringUtils;
* @author Dave Syer
*
*/
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties(PropertySourceBootstrapProperties.class)
public class PropertySourceBootstrapConfiguration implements
ApplicationContextInitializer<ConfigurableApplicationContext>, Ordered {

View File

@@ -40,7 +40,7 @@ import org.springframework.util.StringUtils;
* @author Dave Syer
*
*/
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass({ TextEncryptor.class })
@EnableConfigurationProperties({ KeyProperties.class })
public class EncryptionBootstrapConfiguration {
@@ -62,7 +62,7 @@ public class EncryptionBootstrapConfiguration {
return listener;
}
@Configuration
@Configuration(proxyBeanMethods = false)
@Conditional(KeyCondition.class)
@ConditionalOnClass(RsaSecretEncryptor.class)
@EnableConfigurationProperties({ RsaProperties.class })
@@ -97,7 +97,7 @@ public class EncryptionBootstrapConfiguration {
}
@Configuration
@Configuration(proxyBeanMethods = false)
@Conditional(KeyCondition.class)
@ConditionalOnMissingClass("org.springframework.security.rsa.crypto.RsaSecretEncryptor")
protected static class VanillaEncryptionConfiguration {

View File

@@ -253,7 +253,7 @@ public class ContextRefresher {
}
}
@Configuration
@Configuration(proxyBeanMethods = false)
protected static class Empty {
}

View File

@@ -166,7 +166,7 @@ public class LifecycleMvcAutoConfigurationTests {
}
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
static class Config {

View File

@@ -55,7 +55,7 @@ public class RefreshAutoConfigurationClassPathTests {
}
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
static class Config {

View File

@@ -59,7 +59,7 @@ public class RefreshAutoConfigurationMoreClassPathTests {
}
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
static class Config {

View File

@@ -85,7 +85,7 @@ public class RefreshAutoConfigurationTests {
}
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration(exclude = DataSourceAutoConfiguration.class)
@EnableConfigurationProperties(ConfigProps.class)
static class Config {

View File

@@ -43,7 +43,7 @@ public class BootstrapDisabledAutoConfigurationIntegrationTests {
}
@EnableAutoConfiguration
@Configuration
@Configuration(proxyBeanMethods = false)
protected static class Application {
}

View File

@@ -59,7 +59,7 @@ public class BootstrapOrderingAutoConfigurationIntegrationTests {
}
@EnableAutoConfiguration
@Configuration
@Configuration(proxyBeanMethods = false)
protected static class Application {
}

View File

@@ -63,12 +63,12 @@ public class BootstrapOrderingCustomPropertySourceIntegrationTests {
}
@EnableAutoConfiguration
@Configuration
@Configuration(proxyBeanMethods = false)
protected static class Application {
}
@Configuration
@Configuration(proxyBeanMethods = false)
// This is added to bootstrap context as a source in bootstrap.properties
protected static class PropertySourceConfiguration implements PropertySourceLocator {

View File

@@ -55,7 +55,7 @@ public class BootstrapOrderingSpringApplicationJsonIntegrationTests {
}
@EnableAutoConfiguration
@Configuration
@Configuration(proxyBeanMethods = false)
protected static class Application {
}

View File

@@ -40,7 +40,7 @@ public class BootstrapSourcesOrderingTests {
}
@EnableAutoConfiguration
@Configuration
@Configuration(proxyBeanMethods = false)
protected static class Application {
}

View File

@@ -49,7 +49,7 @@ public class MessageSourceConfigurationTests {
.isEqualTo("Hello World!");
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
protected static class TestApplication {

View File

@@ -36,7 +36,7 @@ import static org.springframework.cloud.bootstrap.TestHigherPriorityBootstrapCon
* @author Spencer Gibb
*/
@Order(0)
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties
public class TestBootstrapConfiguration {

View File

@@ -379,13 +379,13 @@ public class BootstrapConfigurationTests {
.isEqualTo("Hello added!");
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties
protected static class BareConfiguration {
}
@Configuration
@Configuration(proxyBeanMethods = false)
@ConfigurationProperties("expected")
// This is added to bootstrap context as a source in bootstrap.properties
protected static class PropertySourceConfiguration implements PropertySourceLocator {

View File

@@ -85,12 +85,12 @@ public class BootstrapListenerHierarchyIntegrationTests {
then(bootstrapContext.getParent()).isNull();
}
@Configuration
@Configuration(proxyBeanMethods = false)
static class BasicConfiguration {
}
@Configuration
@Configuration(proxyBeanMethods = false)
static class RootConfiguration {
@Bean

View File

@@ -49,7 +49,7 @@ public class EncryptionIntegrationTests {
then(context.getBean(PasswordProperties.class).getPassword()).isEqualTo("test");
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties(PasswordProperties.class)
protected static class TestConfiguration {

View File

@@ -125,7 +125,7 @@ public class EnvironmentManagerIntegrationTests {
.isInstanceOf(WritableEnvironmentEndpointWebExtension.class);
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
protected static class TestConfiguration {

View File

@@ -115,7 +115,7 @@ public class ConfigurationPropertiesRebinderIntegrationTests {
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties
@ImportAutoConfiguration({ RefreshConfiguration.RebinderConfiguration.class,
PropertyPlaceholderAutoConfiguration.class })
@@ -139,7 +139,7 @@ public class ConfigurationPropertiesRebinderIntegrationTests {
// Hack out a protected inner class for testing
protected static class RefreshConfiguration extends RefreshAutoConfiguration {
@Configuration
@Configuration(proxyBeanMethods = false)
protected static class RebinderConfiguration
extends ConfigurationPropertiesRebinderAutoConfiguration {

View File

@@ -65,7 +65,7 @@ public class ConfigurationPropertiesRebinderLifecycleIntegrationTests {
then(this.properties.getCount()).isEqualTo(1);
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties
@Import({ RefreshConfiguration.RebinderConfiguration.class,
PropertyPlaceholderAutoConfiguration.class })
@@ -81,7 +81,7 @@ public class ConfigurationPropertiesRebinderLifecycleIntegrationTests {
// Hack out a protected inner class for testing
protected static class RefreshConfiguration extends RefreshAutoConfiguration {
@Configuration
@Configuration(proxyBeanMethods = false)
protected static class RebinderConfiguration
extends ConfigurationPropertiesRebinderAutoConfiguration {

View File

@@ -100,7 +100,7 @@ public class ConfigurationPropertiesRebinderListIntegrationTests {
then(this.properties.getMessages().toString()).isEqualTo("[foo]");
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties
@Import({ RefreshConfiguration.RebinderConfiguration.class,
PropertyPlaceholderAutoConfiguration.class })
@@ -116,7 +116,7 @@ public class ConfigurationPropertiesRebinderListIntegrationTests {
// Hack out a protected inner class for testing
protected static class RefreshConfiguration extends RefreshAutoConfiguration {
@Configuration
@Configuration(proxyBeanMethods = false)
protected static class RebinderConfiguration
extends ConfigurationPropertiesRebinderAutoConfiguration {

View File

@@ -68,7 +68,7 @@ public class ConfigurationPropertiesRebinderProxyIntegrationTests {
then(this.properties.getExpiry().get("one")).isEqualTo(new Integer(56));
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties
@Import({ Interceptor.class, RefreshConfiguration.RebinderConfiguration.class,
PropertyPlaceholderAutoConfiguration.class, AopAutoConfiguration.class })
@@ -94,7 +94,7 @@ public class ConfigurationPropertiesRebinderProxyIntegrationTests {
// Hack out a protected inner class for testing
protected static class RefreshConfiguration extends RefreshAutoConfiguration {
@Configuration
@Configuration(proxyBeanMethods = false)
protected static class RebinderConfiguration
extends ConfigurationPropertiesRebinderAutoConfiguration {

View File

@@ -86,7 +86,7 @@ public class ConfigurationPropertiesRebinderRefreshScopeIntegrationTests {
then(this.properties.getCount()).isEqualTo(1);
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties
@Import({ RefreshAutoConfiguration.class,
ConfigurationPropertiesRebinderAutoConfiguration.class,

View File

@@ -81,7 +81,7 @@ public class ContextRefresherIntegrationTests {
then(this.properties.getMessage()).isEqualTo("Hello scope!");
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties(TestProperties.class)
@EnableAutoConfiguration
protected static class TestConfiguration {

View File

@@ -160,12 +160,12 @@ public class ContextRefresherTests {
return list;
}
@Configuration
@Configuration(proxyBeanMethods = false)
protected static class Empty {
}
@Configuration
@Configuration(proxyBeanMethods = false)
// This is added to bootstrap context as a source in bootstrap.properties
protected static class PropertySourceConfiguration implements PropertySourceLocator {

View File

@@ -72,7 +72,7 @@ public class RestartIntegrationTests {
then(json).containsOnlyOnce("parent\": null");
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
protected static class TestConfiguration {

View File

@@ -52,7 +52,7 @@ public class ImportRefreshScopeIntegrationTests {
then(this.service.getMessage()).isEqualTo("Hello scope!");
}
@Configuration("service")
@Configuration(value = "service", proxyBeanMethods = false)
@RefreshScope
public static class ExampleService {
@@ -62,7 +62,7 @@ public class ImportRefreshScopeIntegrationTests {
}
@Configuration
@Configuration(proxyBeanMethods = false)
@Import({ RefreshAutoConfiguration.class, ExampleService.class })
protected static class TestConfiguration {

View File

@@ -87,7 +87,7 @@ public class RefreshEndpointIntegrationTests {
return entity;
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
protected static class ClientApp {

View File

@@ -150,7 +150,7 @@ public class RefreshScopeConcurrencyTests {
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties(TestProperties.class)
@Import({ RefreshAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class })

View File

@@ -169,7 +169,7 @@ public class RefreshScopeConfigurationScaleTests {
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties
@Import({ RefreshAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class })

View File

@@ -133,7 +133,7 @@ public class RefreshScopeConfigurationTests {
}
@Configuration("application")
@Configuration(value = "application", proxyBeanMethods = false)
@RefreshScope
protected static class Application {
@@ -151,7 +151,7 @@ public class RefreshScopeConfigurationTests {
}
@Configuration
@Configuration(proxyBeanMethods = false)
protected static class ClientApp {
public static void main(String[] args) {

View File

@@ -216,7 +216,7 @@ public class RefreshScopeIntegrationTests {
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties(TestProperties.class)
@EnableAutoConfiguration
protected static class TestConfiguration {

View File

@@ -199,7 +199,7 @@ public class RefreshScopeLazyIntegrationTests {
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties(TestProperties.class)
@ImportAutoConfiguration({ RefreshAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class })

View File

@@ -91,7 +91,7 @@ public class RefreshScopeListBindingIntegrationTests {
throw new IllegalStateException("Could not find test property source");
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties
@Import({ RefreshAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class })

View File

@@ -66,7 +66,7 @@ public class RefreshScopeNullBeanIntegrationTests {
}
@Configuration
@Configuration(proxyBeanMethods = false)
protected static class OptionalConfiguration {
@Bean
@@ -77,7 +77,7 @@ public class RefreshScopeNullBeanIntegrationTests {
}
@Configuration
@Configuration(proxyBeanMethods = false)
@Import({ RefreshAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class,
OptionalConfiguration.class })
protected static class TestConfiguration {

View File

@@ -158,7 +158,7 @@ public class RefreshScopePureScaleTests {
}
@Configuration
@Configuration(proxyBeanMethods = false)
@Import({ RefreshAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class })
protected static class TestConfiguration {

View File

@@ -153,7 +153,7 @@ public class RefreshScopeScaleTests {
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties(TestProperties.class)
@Import({ RefreshAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class })

View File

@@ -56,7 +56,7 @@ public class RefreshScopeSerializationTests {
return factory;
}
@Configuration
@Configuration(proxyBeanMethods = false)
protected static class TestConfiguration {
@Bean

View File

@@ -71,7 +71,7 @@ public class RefreshScopeWebIntegrationTests {
then(message).isEqualTo("Hello Dave!");
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
protected static class Application {

View File

@@ -169,7 +169,7 @@ public class RefreshEndpointTests {
return map.size();
}
@Configuration
@Configuration(proxyBeanMethods = false)
protected static class Empty implements SmartApplicationListener {
private List<ApplicationEvent> events = new ArrayList<ApplicationEvent>();