SpringCloud/spring-cloud-consul
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added proxyBeanMethods = false to configuration classes. Fixes #596

Browse Source
This commit is contained in:
Ryan Baxter
2019-11-14 20:15:04 -05:00
parent 43024d3a96
commit fd083ca874
54 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-consul-binder/src/main/java/org/springframework/cloud/consul/binder/config/ConsulBinderConfiguration.java
View File

@@ -36,7 +36,7 @@ import org.springframework.context.annotation.Import;
*
* @author Spencer Gibb
*/
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnMissingBean(Binder.class)
@Import({ PropertyPlaceholderAutoConfiguration.class })
@ConditionalOnConsulEnabled

2
spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/ConsulBinderApplicationTests.java
View File

@@ -107,7 +107,7 @@ public class ConsulBinderApplicationTests {
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
@EnableBinding(Events.class)
public static class Application {

2
spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/config/ConsulBinderConfigurationTests.java
View File

@@ -61,7 +61,7 @@ public class ConsulBinderConfigurationTests {
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
@EnableBinding(Events.class)
public static class Application {

2
spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/test/consumer/TestConsumer.java
View File

@@ -44,7 +44,7 @@ import org.springframework.web.bind.annotation.RestController;
*/
@RestController
@Import(ConsulBinderConfiguration.class)
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
public class TestConsumer implements ApplicationRunner {

2
spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/test/producer/TestProducer.java
View File

@@ -46,7 +46,7 @@ import org.springframework.web.bind.annotation.RestController;
*/
@RestController
@Import(ConsulBinderConfiguration.class)
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
public class TestProducer implements ApplicationRunner {

4
spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigAutoConfiguration.java
View File

@@ -31,7 +31,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
/**
* @author Spencer Gibb
*/
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnConsulEnabled
@ConditionalOnProperty(name = "spring.cloud.consul.config.enabled", matchIfMissing = true)
public class ConsulConfigAutoConfiguration {
@@ -41,7 +41,7 @@ public class ConsulConfigAutoConfiguration {
*/
public static final String CONFIG_WATCH_TASK_SCHEDULER_NAME = "configWatchTaskScheduler";
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(RefreshEndpoint.class)
protected static class ConsulRefreshConfiguration {

4
spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigBootstrapConfiguration.java
View File

@@ -32,11 +32,11 @@ import org.springframework.context.annotation.Import;
* @author Spencer Gibb
* @author Edvin Eriksson
*/
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnConsulEnabled
public class ConsulConfigBootstrapConfiguration {
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties
@Import(ConsulAutoConfiguration.class)
@ConditionalOnProperty(name = "spring.cloud.consul.config.enabled",

2
spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorAppNameCustomizedTests.java
View File

@@ -101,7 +101,7 @@ public class ConsulPropertySourceLocatorAppNameCustomizedTests {
assertThat(testProp2).as("testProp2 was wrong").isEqualTo(VALUE2);
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
static class Config {

2
spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorFailFastTests.java
View File

@@ -43,7 +43,7 @@ public class ConsulPropertySourceLocatorFailFastTests {
public void testFailFastFalse() {
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
static class Config {

2
spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorFilesTests.java
View File

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

2
spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorTests.java
View File

@@ -149,7 +149,7 @@ public class ConsulPropertySourceLocatorTests {
.isEqualTo("testPropValInsert");
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
static class Config {

6
spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulAutoConfiguration.java
View File

@@ -39,7 +39,7 @@ import org.springframework.util.StringUtils;
/**
* @author Spencer Gibb
*/
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties
@ConditionalOnConsulEnabled
public class ConsulAutoConfiguration {
@@ -68,7 +68,7 @@ public class ConsulAutoConfiguration {
return new ConsulClient(agentHost, agentPort);
}
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(Endpoint.class)
protected static class ConsulHealthConfig {
@@ -89,7 +89,7 @@ public class ConsulAutoConfiguration {
}
@ConditionalOnClass({ Retryable.class, Aspect.class, AopAutoConfiguration.class })
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableRetry(proxyTargetClass = true)
@Import(AopAutoConfiguration.class)
@EnableConfigurationProperties(RetryProperties.class)

2
spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulCatalogWatchAutoConfiguration.java
View File

@@ -34,7 +34,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
*
* @author Tim Ysewyn
*/
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnConsulEnabled
@ConditionalOnProperty(
value = "spring.cloud.consul.discovery.catalog-services-watch.enabled",

2
spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfiguration.java
View File

@@ -38,7 +38,7 @@ import org.springframework.context.annotation.Configuration;
* @author Olga Maciaszek-Sharma
* @author Tim Ysewyn
*/
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnDiscoveryEnabled
@ConditionalOnBlockingDiscoveryEnabled
@ConditionalOnConsulEnabled

2
spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulRibbonClientConfiguration.java
View File

@@ -45,7 +45,7 @@ import static com.netflix.client.config.CommonClientConfigKey.EnableZoneAffinity
* @author Spencer Gibb
* @author Dave Syer
*/
@Configuration
@Configuration(proxyBeanMethods = false)
public class ConsulRibbonClientConfiguration {
protected static final String VALUE_NOT_SET = "__not__set__";

2
spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/RibbonConsulAutoConfiguration.java
View File

@@ -29,7 +29,7 @@ import org.springframework.context.annotation.Configuration;
/**
* @author Dave Syer
*/
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties
@ConditionalOnConsulEnabled
@ConditionalOnBean(SpringClientFactory.class)

2
spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulConfigServerAutoConfiguration.java
View File

@@ -33,7 +33,7 @@ import org.springframework.util.StringUtils;
*
* @author Dave Syer
*/
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties
@ConditionalOnClass({ ConsulDiscoveryProperties.class, ConsulClient.class,
ConfigServerProperties.class })

2
spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulDiscoveryClientConfigServiceBootstrapConfiguration.java
View File

@@ -33,7 +33,7 @@ import org.springframework.context.annotation.Configuration;
*/
@ConditionalOnClass(ConfigServicePropertySourceLocator.class)
@ConditionalOnProperty("spring.cloud.config.discovery.enabled")
@Configuration
@Configuration(proxyBeanMethods = false)
@ImportAutoConfiguration({ ConsulAutoConfiguration.class,
ConsulDiscoveryClientConfiguration.class,
ConsulReactiveDiscoveryClientConfiguration.class })

2
spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/reactive/ConsulReactiveDiscoveryClientConfiguration.java
View File

@@ -42,7 +42,7 @@ import org.springframework.context.annotation.Configuration;
/**
* @author Tim Ysewyn
*/
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnDiscoveryEnabled
@ConditionalOnReactiveDiscoveryEnabled
@ConditionalOnConsulEnabled

4
spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationAutoConfiguration.java
View File

@@ -39,7 +39,7 @@ import org.springframework.context.annotation.Configuration;
/**
* @author Spencer Gibb
*/
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnBean(AutoServiceRegistrationProperties.class)
@ConditionalOnMissingBean(
type = "org.springframework.cloud.consul.discovery.ConsulLifecycle")
@@ -83,7 +83,7 @@ public class ConsulAutoServiceRegistrationAutoConfiguration {
managementRegistrationCustomizers.getIfAvailable(), heartbeatProperties);
}
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(ServletContext.class)
protected static class ConsulServletConfiguration {

2
spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryAutoConfiguration.java
View File

@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
* @author Spencer Gibb
* @author Tim Ysewyn
*/
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnConsulEnabled
@ConditionalOnProperty(value = "spring.cloud.service-registry.enabled",
matchIfMissing = true)

2
spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/support/ConsulHeartbeatAutoConfiguration.java
View File

@@ -36,7 +36,7 @@ import org.springframework.context.annotation.Configuration;
*
* @author Tim Ysewyn
*/
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnConsulEnabled
@ConditionalOnProperty("spring.cloud.consul.discovery.heartbeat.enabled")
@ConditionalOnDiscoveryEnabled

2
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientAclTests.java
View File

@@ -70,7 +70,7 @@ public class ConsulDiscoveryClientAclTests {
.isFalse();
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
@EnableDiscoveryClient
public static class MyTestConfig {

2
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientCustomizedTests.java
View File

@@ -93,7 +93,7 @@ public class ConsulDiscoveryClientCustomizedTests {
assertThat(foo2).as("metadata key foo2 was wrong").isEqualTo("bar2=baz2");
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
@EnableDiscoveryClient
public static class MyTestConfig {

2
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientDefaultQueryTagTests.java
View File

@@ -92,7 +92,7 @@ public class ConsulDiscoveryClientDefaultQueryTagTests {
return service;
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
@Import({ ConsulDiscoveryClientConfiguration.class })
protected static class TestConfig {

2
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientHttpsTests.java
View File

@@ -58,7 +58,7 @@ public class ConsulDiscoveryClientHttpsTests {
assertThat(instance.isSecure()).as("instance was not secure (https)").isTrue();
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
@EnableDiscoveryClient
public static class MyTestConfig {

2
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientTests.java
View File

@@ -87,7 +87,7 @@ public class ConsulDiscoveryClientTests {
.as("host isn't an ip address").isTrue();
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
@EnableDiscoveryClient
public static class MyTestConfig {

2
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulServerListAclTests.java
View File

@@ -62,7 +62,7 @@ public class ConsulServerListAclTests {
assertThat(servers.isEmpty()).as("servers was empty").isFalse();
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
@EnableDiscoveryClient
public static class TestConfig {

2
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulServerListConsistencyModeDefaultTests.java
View File

@@ -57,7 +57,7 @@ public class ConsulServerListConsistencyModeDefaultTests {
.isTrue();
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
@EnableDiscoveryClient
public static class TestConfig {

2
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulServerListConsistencyModeStaleTests.java
View File

@@ -57,7 +57,7 @@ public class ConsulServerListConsistencyModeStaleTests {
.equals(ConsistencyMode.STALE)).as("ConsistencyMode is stale").isTrue();
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
@EnableDiscoveryClient
public static class TestConfig {

2
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/TtlSchedulerRemoveTests.java
View File

@@ -82,7 +82,7 @@ public class TtlSchedulerRemoveTests {
return null;
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
@Import({ AutoServiceRegistrationConfiguration.class, ConsulAutoConfiguration.class,
ConsulDiscoveryClientConfiguration.class,

2
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/TtlSchedulerTests.java
View File

@@ -79,7 +79,7 @@ public class TtlSchedulerTests {
return null;
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
@Import({ AutoServiceRegistrationConfiguration.class, ConsulAutoConfiguration.class,
ConsulDiscoveryClientConfiguration.class,

2
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/DiscoveryClientConfigServiceAutoConfigurationTests.java
View File

@@ -87,7 +87,7 @@ public class DiscoveryClientConfigServiceAutoConfigurationTests {
.run();
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
protected static class TestConfig {

2
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/TestConsulDiscoveryClientBootstrapConfiguration.java
View File

@@ -31,7 +31,7 @@ import static org.mockito.Mockito.mock;
@ConditionalOnProperty(value = "spring.cloud.consul.discovery.test.enabled",
matchIfMissing = false)
@Configuration
@Configuration(proxyBeanMethods = false)
public class TestConsulDiscoveryClientBootstrapConfiguration {
@Bean

2
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationCheckTtlDeregisterCriticalServiceTests.java
View File

@@ -56,7 +56,7 @@ public class ConsulAutoRegistrationCheckTtlDeregisterCriticalServiceTests {
.isTrue();
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class,
ConsulAutoConfiguration.class,

2
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationHealthCheckHeadersTests.java
View File

@@ -65,7 +65,7 @@ public class ConsulAutoRegistrationHealthCheckHeadersTests {
// unable to call consul api to get health check details
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class,
ConsulAutoConfiguration.class,

2
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationHealthCheckTlsSkipVerifyTests.java
View File

@@ -64,7 +64,7 @@ public class ConsulAutoRegistrationHealthCheckTlsSkipVerifyTests {
// unable to call consul api to get health check details
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class,
ConsulAutoConfiguration.class,

2
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationIncludeHostnameInInstanceIdTests.java
View File

@@ -65,7 +65,7 @@ public class ConsulAutoRegistrationIncludeHostnameInInstanceIdTests {
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class,
ConsulAutoConfiguration.class,

2
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceDeRegistrationDisabledTests.java
View File

@@ -84,7 +84,7 @@ public class ConsulAutoServiceDeRegistrationDisabledTests {
}
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class,
ConsulAutoConfiguration.class,

2
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedAgentAddressTests.java
View File

@@ -68,7 +68,7 @@ public class ConsulAutoServiceRegistrationCustomizedAgentAddressTests {
.as("service address must be empty").isTrue();
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class,
ConsulAutoConfiguration.class,

2
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedDiscoveryPortTests.java
View File

@@ -82,7 +82,7 @@ public class ConsulAutoServiceRegistrationCustomizedDiscoveryPortTests {
// unable to call consul api to get health check details
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class,
ConsulAutoConfiguration.class,

2
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedInstanceGroupTests.java
View File

@@ -82,7 +82,7 @@ public class ConsulAutoServiceRegistrationCustomizedInstanceGroupTests {
.as("service group was wrong").isEqualTo("test");
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class,
ConsulAutoConfiguration.class,

2
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedInstanceZoneTests.java
View File

@@ -65,7 +65,7 @@ public class ConsulAutoServiceRegistrationCustomizedInstanceZoneTests {
.as("service zone was wrong").isTrue();
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class,
ConsulAutoConfiguration.class,

2
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedManagementServicePortTests.java
View File

@@ -100,7 +100,7 @@ public class ConsulAutoServiceRegistrationCustomizedManagementServicePortTests {
.isEqualTo(this.discoveryProperties.getHostname());
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class,
ConsulAutoConfiguration.class,

2
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedPropsTests.java
View File

@@ -94,7 +94,7 @@ public class ConsulAutoServiceRegistrationCustomizedPropsTests {
.isFalse();
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class,
ConsulAutoConfiguration.class,

2
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedServiceNameTests.java
View File

@@ -64,7 +64,7 @@ public class ConsulAutoServiceRegistrationCustomizedServiceNameTests {
.isEqualTo("myprefix-myTestService-CC");
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class,
ConsulAutoConfiguration.class,

2
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationCustomizedServletContextTests.java
View File

@@ -63,7 +63,7 @@ public class ConsulAutoServiceRegistrationCustomizedServletContextTests {
}
@EnableDiscoveryClient
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
public static class TestConfig {

2
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDefaultPortTests.java
View File

@@ -58,7 +58,7 @@ public class ConsulAutoServiceRegistrationDefaultPortTests {
assertThat(service.getPort().intValue()).as("service port is 0").isNotEqualTo(0);
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class,
ConsulAutoConfiguration.class,

2
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationDisabledTests.java
View File

@@ -63,7 +63,7 @@ public class ConsulAutoServiceRegistrationDisabledTests {
assertThat(service).as("service was registered").isNull();
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class,
ConsulAutoConfiguration.class,

4
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementCustomizerTests.java
View File

@@ -71,7 +71,7 @@ public class ConsulAutoServiceRegistrationManagementCustomizerTests {
.isTrue();
}
@Configuration
@Configuration(proxyBeanMethods = false)
public static class ManagementConfig {
@Bean
@@ -100,7 +100,7 @@ public class ConsulAutoServiceRegistrationManagementCustomizerTests {
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class,
ConsulAutoConfiguration.class,

2
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementDisabledServiceTests.java
View File

@@ -81,7 +81,7 @@ public class ConsulAutoServiceRegistrationManagementDisabledServiceTests {
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class,
ConsulAutoConfiguration.class,

2
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationManagementServiceTests.java
View File

@@ -90,7 +90,7 @@ public class ConsulAutoServiceRegistrationManagementServiceTests {
.isEqualTo(this.discoveryProperties.getHostname());
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class,
ConsulAutoConfiguration.class,

2
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationNonWebTests.java
View File

@@ -63,7 +63,7 @@ public class ConsulAutoServiceRegistrationNonWebTests {
}
@EnableDiscoveryClient
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
public static class TestConfig {

2
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistryCheckTtlTests.java
View File

@@ -94,7 +94,7 @@ public class ConsulServiceRegistryCheckTtlTests {
.as("Service with HTTP check registered in TTL scheduler").isFalse();
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class,
ConsulAutoConfiguration.class,