diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java index 83a6afca3..0f890f160 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java @@ -60,7 +60,9 @@ public class CommonsClientAutoConfiguration { protected static class DiscoveryLoadBalancerConfiguration { @Bean - @ConditionalOnProperty(value = "spring.cloud.discovery.client.health-indicator.enabled", matchIfMissing = true) + @ConditionalOnProperty( + value = "spring.cloud.discovery.client.health-indicator.enabled", + matchIfMissing = true) public DiscoveryClientHealthIndicator discoveryClientHealthIndicator( ObjectProvider discoveryClient, DiscoveryClientHealthIndicatorProperties properties) { @@ -68,7 +70,9 @@ public DiscoveryClientHealthIndicator discoveryClientHealthIndicator( } @Bean - @ConditionalOnProperty(value = "spring.cloud.discovery.client.composite-indicator.enabled", matchIfMissing = true) + @ConditionalOnProperty( + value = "spring.cloud.discovery.client.composite-indicator.enabled", + matchIfMissing = true) @ConditionalOnBean({ DiscoveryHealthIndicator.class, HealthAggregator.class }) public DiscoveryCompositeHealthIndicator discoveryCompositeHealthIndicator( HealthAggregator aggregator, List indicators) { diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistration.java index 1ca17d25a..28dbbff20 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistration.java @@ -25,15 +25,17 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.BeansException; -import org.springframework.boot.web.context.ConfigurableWebServerApplicationContext; +import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.boot.web.context.WebServerInitializedEvent; import org.springframework.cloud.client.discovery.ManagementServerPortUtils; import org.springframework.cloud.client.discovery.event.InstancePreRegisteredEvent; import org.springframework.cloud.client.discovery.event.InstanceRegisteredEvent; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; +import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationListener; import org.springframework.core.env.Environment; +import org.springframework.util.StringUtils; /** * Lifecycle methods that may be useful and common to {@link ServiceRegistry} @@ -43,10 +45,11 @@ * * @param Registration type passed to the {@link ServiceRegistry}. * @author Spencer Gibb + * @author Chris White */ public abstract class AbstractAutoServiceRegistration implements AutoServiceRegistration, ApplicationContextAware, - ApplicationListener { + ApplicationListener { private static final Log logger = LogFactory .getLog(AbstractAutoServiceRegistration.class); @@ -65,6 +68,8 @@ public abstract class AbstractAutoServiceRegistration private AtomicInteger port = new AtomicInteger(0); + private AtomicInteger mgmtPort = new AtomicInteger(0); + private AutoServiceRegistrationProperties properties; @Deprecated @@ -83,22 +88,25 @@ protected ApplicationContext getContext() { } @Override - @SuppressWarnings("deprecation") - public void onApplicationEvent(WebServerInitializedEvent event) { - bind(event); + public void onApplicationEvent(ApplicationEvent event) { + if (event instanceof ApplicationReadyEvent) { + this.start(); + } + else if (event instanceof WebServerInitializedEvent) { + this.bind((WebServerInitializedEvent) event); + } } @Deprecated public void bind(WebServerInitializedEvent event) { - ApplicationContext context = event.getApplicationContext(); - if (context instanceof ConfigurableWebServerApplicationContext) { - if ("management".equals(((ConfigurableWebServerApplicationContext) context) - .getServerNamespace())) { - return; - } + String serverNamespace = event.getApplicationContext().getServerNamespace(); + + if (StringUtils.isEmpty(serverNamespace)) { + this.port.compareAndSet(0, event.getWebServer().getPort()); + } + else if ("management".equals(serverNamespace)) { + this.mgmtPort.compareAndSet(0, event.getWebServer().getPort()); } - this.port.compareAndSet(0, event.getWebServer().getPort()); - this.start(); } @Override @@ -192,7 +200,12 @@ protected String getManagementServiceName() { */ @Deprecated protected Integer getManagementPort() { - return ManagementServerPortUtils.getPort(this.context); + if (this.mgmtPort.get() != 0) { + return this.mgmtPort.get(); + } + else { + return ManagementServerPortUtils.getPort(this.context); + } } /** diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationAutoConfiguration.java index 90204fed7..96f5cbd82 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationAutoConfiguration.java @@ -28,7 +28,8 @@ */ @Configuration @Import(AutoServiceRegistrationConfiguration.class) -@ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled", matchIfMissing = true) +@ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled", + matchIfMissing = true) public class AutoServiceRegistrationAutoConfiguration { @Autowired(required = false) diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationConfiguration.java index b81b698ae..75136eb6f 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationConfiguration.java @@ -25,7 +25,8 @@ */ @Configuration @EnableConfigurationProperties(AutoServiceRegistrationProperties.class) -@ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled", matchIfMissing = true) +@ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled", + matchIfMissing = true) public class AutoServiceRegistrationConfiguration { } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/HttpClientConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/HttpClientConfiguration.java index 798e11601..c09b1613b 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/HttpClientConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/HttpClientConfiguration.java @@ -33,7 +33,8 @@ public class HttpClientConfiguration { @Configuration - @ConditionalOnProperty(name = "spring.cloud.httpclientfactories.apache.enabled", matchIfMissing = true) + @ConditionalOnProperty(name = "spring.cloud.httpclientfactories.apache.enabled", + matchIfMissing = true) @ConditionalOnClass(HttpClient.class) static class ApacheHttpClientConfiguration { @@ -59,7 +60,8 @@ public ApacheHttpClientFactory apacheHttpClientFactory( } @Configuration - @ConditionalOnProperty(name = "spring.cloud.httpclientfactories.ok.enabled", matchIfMissing = true) + @ConditionalOnProperty(name = "spring.cloud.httpclientfactories.ok.enabled", + matchIfMissing = true) @ConditionalOnClass(OkHttpClient.class) static class OkHttpClientConfiguration { diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/CompatibilityVerifierAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/CompatibilityVerifierAutoConfiguration.java index ac6fb2265..8230d4cd8 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/CompatibilityVerifierAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/CompatibilityVerifierAutoConfiguration.java @@ -33,7 +33,8 @@ * @since 1.3.6 */ @Configuration -@ConditionalOnProperty(value = "spring.cloud.compatibility-verifier.enabled", matchIfMissing = true) +@ConditionalOnProperty(value = "spring.cloud.compatibility-verifier.enabled", + matchIfMissing = true) @AutoConfigureOrder(0) @EnableConfigurationProperties(CompatibilityVerifierProperties.class) public class CompatibilityVerifierAutoConfiguration { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/AutoRegisterPropertyFalseTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/AutoRegisterPropertyFalseTests.java index 4d9cb139b..9f27cb195 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/AutoRegisterPropertyFalseTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/AutoRegisterPropertyFalseTests.java @@ -35,8 +35,8 @@ * @author Ryan Baxter */ @RunWith(SpringRunner.class) -@SpringBootTest(properties = { - "spring.cloud.service-registry.auto-registration.enabled: false" }) +@SpringBootTest( + properties = { "spring.cloud.service-registry.auto-registration.enabled: false" }) public class AutoRegisterPropertyFalseTests { @Autowired(required = false) diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientOrderTest.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientOrderTest.java index d989e6ec5..1fe201c5a 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientOrderTest.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientOrderTest.java @@ -40,8 +40,8 @@ * @author Olga Maciaszek-Sharma */ @RunWith(SpringRunner.class) -@SpringBootTest(properties = "spring.cloud.discovery.client.simple.order:2", classes = { - CompositeDiscoveryClientTestsConfig.class }) +@SpringBootTest(properties = "spring.cloud.discovery.client.simple.order:2", + classes = { CompositeDiscoveryClientTestsConfig.class }) public class CompositeDiscoveryClientOrderTest { @Autowired diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientTests.java index 83d363382..5477db324 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientTests.java @@ -41,8 +41,8 @@ "spring.cloud.discovery.client.simple.instances.service1[0].uri=http://s11:8080", "spring.cloud.discovery.client.simple.instances.service1[1].uri=https://s12:8443", "spring.cloud.discovery.client.simple.instances.service2[0].uri=https://s21:8080", - "spring.cloud.discovery.client.simple.instances.service2[1].uri=https://s22:443" }, classes = { - CompositeDiscoveryClientTestsConfig.class }) + "spring.cloud.discovery.client.simple.instances.service2[1].uri=https://s22:443" }, + classes = { CompositeDiscoveryClientTestsConfig.class }) public class CompositeDiscoveryClientTests { @Autowired diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryClientHealthIndicatorTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryClientHealthIndicatorTests.java index e43bcaa62..ea6e6db82 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryClientHealthIndicatorTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryClientHealthIndicatorTests.java @@ -44,8 +44,10 @@ */ @RunWith(SpringRunner.class) // @checkstyle:off -@SpringBootTest(classes = { DiscoveryClientHealthIndicatorTests.Config.class, - CommonsClientAutoConfiguration.class }, properties = "spring.cloud.discovery.client.health-indicator.include-description:true") +@SpringBootTest( + classes = { DiscoveryClientHealthIndicatorTests.Config.class, + CommonsClientAutoConfiguration.class }, + properties = "spring.cloud.discovery.client.health-indicator.include-description:true") // @checkstyle:on public class DiscoveryClientHealthIndicatorTests { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationMgmtDisabledTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationMgmtDisabledTests.java index bfaf66e39..248a10c6a 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationMgmtDisabledTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationMgmtDisabledTests.java @@ -38,9 +38,10 @@ * @author Tim Ysewyn */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = AbstractAutoServiceRegistrationMgmtDisabledTests.Config.class, properties = { - "management.port=0", - "spring.cloud.service-registry.auto-registration.register-management=false" }, webEnvironment = RANDOM_PORT) +@SpringBootTest(classes = AbstractAutoServiceRegistrationMgmtDisabledTests.Config.class, + properties = { "management.server.port=0", + "spring.cloud.service-registry.auto-registration.register-management=false" }, + webEnvironment = RANDOM_PORT) public class AbstractAutoServiceRegistrationMgmtDisabledTests { @Autowired diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationTests.java index 1ad8816de..5ae8c7baf 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationTests.java @@ -44,7 +44,8 @@ */ @RunWith(SpringRunner.class) // @checkstyle:off -@SpringBootTest(classes = AbstractAutoServiceRegistrationTests.Config.class, properties = "management.port=0", webEnvironment = RANDOM_PORT) +@SpringBootTest(classes = AbstractAutoServiceRegistrationTests.Config.class, + properties = "management.server.port=0", webEnvironment = RANDOM_PORT) // @checkstyle:on public class AbstractAutoServiceRegistrationTests { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/endpoint/ServiceRegistryEndpointNoRegistrationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/endpoint/ServiceRegistryEndpointNoRegistrationTests.java index d74c9dd0f..89c7bd918 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/endpoint/ServiceRegistryEndpointNoRegistrationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/endpoint/ServiceRegistryEndpointNoRegistrationTests.java @@ -42,7 +42,8 @@ * @author Spencer Gibb */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = ServiceRegistryEndpointNoRegistrationTests.TestConfiguration.class) +@SpringBootTest( + classes = ServiceRegistryEndpointNoRegistrationTests.TestConfiguration.class) @AutoConfigureMockMvc public class ServiceRegistryEndpointNoRegistrationTests { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/endpoint/ServiceRegistryEndpointTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/endpoint/ServiceRegistryEndpointTests.java index e2500ff04..a5312a550 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/endpoint/ServiceRegistryEndpointTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/endpoint/ServiceRegistryEndpointTests.java @@ -51,7 +51,8 @@ */ @RunWith(SpringRunner.class) // @checkstyle:off -@SpringBootTest(classes = ServiceRegistryEndpointTests.TestConfiguration.class, properties = "management.endpoints.web.exposure.include=*") +@SpringBootTest(classes = ServiceRegistryEndpointTests.TestConfiguration.class, + properties = "management.endpoints.web.exposure.include=*") // @checkstyle:on @AutoConfigureMockMvc public class ServiceRegistryEndpointTests { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/CustomHttpClientConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/CustomHttpClientConfigurationTests.java index 135a5472b..f3ffcc69b 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/CustomHttpClientConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/CustomHttpClientConfigurationTests.java @@ -40,8 +40,8 @@ * @author Ryan Baxter */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = CustomApplication.class, properties = { - "spring.cloud.httpclient.ok.enabled: true" }) +@SpringBootTest(classes = CustomApplication.class, + properties = { "spring.cloud.httpclient.ok.enabled: true" }) public class CustomHttpClientConfigurationTests { @Autowired diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultHttpClientConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultHttpClientConfigurationTests.java index 23b0f7529..d0bfab6d9 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultHttpClientConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultHttpClientConfigurationTests.java @@ -32,8 +32,8 @@ * @author Ryan Baxter */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = MyApplication.class, properties = { - "spring.cloud.httpclient.ok.enabled: true" }) +@SpringBootTest(classes = MyApplication.class, + properties = { "spring.cloud.httpclient.ok.enabled: true" }) public class DefaultHttpClientConfigurationTests { @Autowired diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java index e57470a1b..7247bfeb6 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java @@ -63,7 +63,8 @@ */ @Configuration @ConditionalOnClass(RefreshScope.class) -@ConditionalOnProperty(name = RefreshAutoConfiguration.REFRESH_SCOPE_ENABLED, matchIfMissing = true) +@ConditionalOnProperty(name = RefreshAutoConfiguration.REFRESH_SCOPE_ENABLED, + matchIfMissing = true) @AutoConfigureBefore(HibernateJpaAutoConfiguration.class) public class RefreshAutoConfiguration { diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/WritableEnvironmentEndpointAutoConfiguration.java b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/WritableEnvironmentEndpointAutoConfiguration.java index dd696bd18..e3794486f 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/WritableEnvironmentEndpointAutoConfiguration.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/WritableEnvironmentEndpointAutoConfiguration.java @@ -48,7 +48,8 @@ @AutoConfigureBefore(EnvironmentEndpointAutoConfiguration.class) @AutoConfigureAfter(LifecycleMvcEndpointAutoConfiguration.class) @EnableConfigurationProperties({ EnvironmentEndpointProperties.class }) -@ConditionalOnProperty(value = "management.endpoint.env.post.enabled", matchIfMissing = true) +@ConditionalOnProperty(value = "management.endpoint.env.post.enabled", + matchIfMissing = true) public class WritableEnvironmentEndpointAutoConfiguration { private final EnvironmentEndpointProperties properties; diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapDisabledAutoConfigurationIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapDisabledAutoConfigurationIntegrationTests.java index 2bc13fc84..7bc379051 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapDisabledAutoConfigurationIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapDisabledAutoConfigurationIntegrationTests.java @@ -30,7 +30,8 @@ import static org.assertj.core.api.BDDAssertions.then; @RunWith(SpringRunner.class) -@SpringBootTest(classes = Application.class, properties = "spring.cloud.bootstrap.enabled:false") +@SpringBootTest(classes = Application.class, + properties = "spring.cloud.bootstrap.enabled:false") public class BootstrapDisabledAutoConfigurationIntegrationTests { @Autowired diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingCustomPropertySourceIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingCustomPropertySourceIntegrationTests.java index e193cb32b..fd8e7e41e 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingCustomPropertySourceIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingCustomPropertySourceIntegrationTests.java @@ -41,8 +41,8 @@ import static org.assertj.core.api.BDDAssertions.then; @RunWith(SpringRunner.class) -@SpringBootTest(classes = Application.class, properties = { "encrypt.key:deadbeef", - "spring.cloud.bootstrap.name:custom" }) +@SpringBootTest(classes = Application.class, + properties = { "encrypt.key:deadbeef", "spring.cloud.bootstrap.name:custom" }) @ActiveProfiles("encrypt") public class BootstrapOrderingCustomPropertySourceIntegrationTests { diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingSpringApplicationJsonIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingSpringApplicationJsonIntegrationTests.java index 890a6c65e..4054320be 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingSpringApplicationJsonIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingSpringApplicationJsonIntegrationTests.java @@ -32,7 +32,8 @@ import static org.assertj.core.api.BDDAssertions.then; @RunWith(SpringRunner.class) -@SpringBootTest(classes = Application.class, properties = "spring.cloud.bootstrap.name:json") +@SpringBootTest(classes = Application.class, + properties = "spring.cloud.bootstrap.name:json") public class BootstrapOrderingSpringApplicationJsonIntegrationTests { @Autowired diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/environment/EnvironmentManagerIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/environment/EnvironmentManagerIntegrationTests.java index 36c539de2..54fa17ba9 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/environment/EnvironmentManagerIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/environment/EnvironmentManagerIntegrationTests.java @@ -51,7 +51,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @RunWith(SpringRunner.class) -@SpringBootTest(classes = TestConfiguration.class, properties = "management.endpoints.web.exposure.include=*") +@SpringBootTest(classes = TestConfiguration.class, + properties = "management.endpoints.web.exposure.include=*") @AutoConfigureMockMvc public class EnvironmentManagerIntegrationTests { diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderProxyIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderProxyIntegrationTests.java index be393b56f..8d93fe726 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderProxyIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderProxyIntegrationTests.java @@ -44,8 +44,8 @@ import static org.assertj.core.api.BDDAssertions.then; @RunWith(SpringRunner.class) -@SpringBootTest(classes = TestConfiguration.class, properties = { - "messages.expiry.one=168", "messages.expiry.two=76" }) +@SpringBootTest(classes = TestConfiguration.class, + properties = { "messages.expiry.one=168", "messages.expiry.two=76" }) public class ConfigurationPropertiesRebinderProxyIntegrationTests { @Autowired diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/refresh/ContextRefresherIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/refresh/ContextRefresherIntegrationTests.java index 3f7672cca..9a2c9dae2 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/refresh/ContextRefresherIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/refresh/ContextRefresherIntegrationTests.java @@ -36,8 +36,8 @@ import static org.assertj.core.api.BDDAssertions.then; @RunWith(SpringRunner.class) -@SpringBootTest(classes = TestConfiguration.class, properties = { - "spring.datasource.hikari.read-only=false" }) +@SpringBootTest(classes = TestConfiguration.class, + properties = { "spring.datasource.hikari.read-only=false" }) public class ContextRefresherIntegrationTests { @Autowired diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshEndpointIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshEndpointIntegrationTests.java index 00490f8fa..06194f60b 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshEndpointIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshEndpointIntegrationTests.java @@ -51,8 +51,9 @@ * */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = ClientApp.class, properties = { - "management.endpoints.web.exposure.include=*" }, webEnvironment = RANDOM_PORT) +@SpringBootTest(classes = ClientApp.class, + properties = { "management.endpoints.web.exposure.include=*" }, + webEnvironment = RANDOM_PORT) public class RefreshEndpointIntegrationTests { private static final String BASE_PATH = new WebEndpointProperties().getBasePath(); diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeListBindingIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeListBindingIntegrationTests.java index 462899269..64955c000 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeListBindingIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeListBindingIntegrationTests.java @@ -45,8 +45,8 @@ import static org.assertj.core.api.BDDAssertions.then; @RunWith(SpringRunner.class) -@SpringBootTest(classes = TestConfiguration.class, properties = { "test.messages[0]=one", - "test.messages[1]=two" }) +@SpringBootTest(classes = TestConfiguration.class, + properties = { "test.messages[0]=one", "test.messages[1]=two" }) public class RefreshScopeListBindingIntegrationTests { @Autowired diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeNullBeanIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeNullBeanIntegrationTests.java index 41c11f076..40cf64bac 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeNullBeanIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeNullBeanIntegrationTests.java @@ -33,8 +33,8 @@ import static org.assertj.core.api.BDDAssertions.then; @RunWith(SpringRunner.class) -@SpringBootTest(classes = { - RefreshScopeNullBeanIntegrationTests.TestConfiguration.class }) +@SpringBootTest( + classes = { RefreshScopeNullBeanIntegrationTests.TestConfiguration.class }) public class RefreshScopeNullBeanIntegrationTests { @Autowired diff --git a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/LoadBalancerTest.java b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/LoadBalancerTest.java index 04d496441..6ae9138c6 100644 --- a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/LoadBalancerTest.java +++ b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/LoadBalancerTest.java @@ -132,8 +132,10 @@ private DefaultServiceInstance instance(String serviceId, String host, @EnableAutoConfiguration @SpringBootConfiguration @LoadBalancerClients({ - @LoadBalancerClient(name = "myservice", configuration = MyServiceConfig.class), - @LoadBalancerClient(name = "unknownservice", configuration = MyServiceConfig.class) }) + @LoadBalancerClient(name = "myservice", + configuration = MyServiceConfig.class), + @LoadBalancerClient(name = "unknownservice", + configuration = MyServiceConfig.class) }) @EnableCaching protected static class Config {