From 25cd7a58103827d7d31b9bcb4c0da0da81f439ff Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Tue, 21 May 2019 11:09:18 -0400 Subject: [PATCH] Formatting changes --- .../archaius/ArchaiusAutoConfiguration.java | 3 +- ...currencyLimitsHandlerInterceptorTests.java | 3 +- .../eureka/EurekaClientAutoConfiguration.java | 38 ++++++++++++------- .../EurekaDiscoveryClientConfiguration.java | 3 +- ...coveryClientOptionalArgsConfiguration.java | 6 ++- ...yClientConfigServiceAutoConfiguration.java | 3 +- ...ntConfigServiceBootstrapConfiguration.java | 3 +- .../EurekaClientAutoConfigurationTests.java | 3 +- .../eureka/config/ConfigRefreshTests.java | 3 +- .../JerseyOptionalArgsConfigurationTest.java | 3 +- ...TemplateOptionalArgsConfigurationTest.java | 3 +- .../healthcheck/EurekaHealthCheckTests.java | 5 ++- .../http/EurekaServerMockApplication.java | 8 ++-- .../RestTemplateEurekaHttpClientTest.java | 5 ++- .../eureka/sample/ApplicationTests.java | 3 +- ...aDisabledRibbonClientIntegrationTests.java | 3 +- ...lientPropertyOverrideIntegrationTests.java | 3 +- .../RibbonEurekaAutoConfigurationTests.java | 8 ++-- .../HystrixDashboardContextTests.java | 6 +-- .../HystrixDashboardHomePageTests.java | 4 +- .../dashboard/HystrixDashboardTests.java | 4 +- .../hystrix/stream/HystrixStreamTask.java | 6 ++- .../hystrix/stream/StreamSourceTestBase.java | 4 +- .../hystrix/HystrixAutoConfiguration.java | 3 +- .../netflix/hystrix/HystrixOnlyTests.java | 4 +- .../hystrix/HystrixStreamEndpointTests.java | 5 ++- .../hystrix/HystrixWebfluxEndpointTests.java | 6 +-- .../resttemplate/RestTemplateRetryTests.java | 13 ++++--- .../ribbon/RibbonAutoConfiguration.java | 3 +- ...bonApplicationContextInitializerTests.java | 6 +-- ...bbonAutoConfigurationIntegrationTests.java | 4 +- ...onClientConfigurationIntegrationTests.java | 3 +- .../RibbonClientHttpRequestFactoryTests.java | 9 +++-- ...PreprocessorOverridesIntegrationTests.java | 3 +- ...ClientPreprocessorOverridesRetryTests.java | 9 +++-- ...orPropertiesOverridesIntegrationTests.java | 3 +- .../ribbon/SpringRetryEnabledTests.java | 6 +-- .../SpringRetryEnabledOkHttpClientTests.java | 6 +-- ...RibbonClientDefaultConfigurationTests.java | 3 +- 39 files changed, 130 insertions(+), 86 deletions(-) diff --git a/spring-cloud-netflix-archaius/src/main/java/org/springframework/cloud/netflix/archaius/ArchaiusAutoConfiguration.java b/spring-cloud-netflix-archaius/src/main/java/org/springframework/cloud/netflix/archaius/ArchaiusAutoConfiguration.java index a5c3716c6..50e7c5f07 100644 --- a/spring-cloud-netflix-archaius/src/main/java/org/springframework/cloud/netflix/archaius/ArchaiusAutoConfiguration.java +++ b/spring-cloud-netflix-archaius/src/main/java/org/springframework/cloud/netflix/archaius/ArchaiusAutoConfiguration.java @@ -207,7 +207,8 @@ public class ArchaiusAutoConfiguration { } @Configuration - @ConditionalOnProperty(value = "archaius.propagate.environmentChangedEvent", matchIfMissing = true) + @ConditionalOnProperty(value = "archaius.propagate.environmentChangedEvent", + matchIfMissing = true) @ConditionalOnClass(EnvironmentChangeEvent.class) protected static class PropagateEventsConfiguration implements ApplicationListener { diff --git a/spring-cloud-netflix-concurrency-limits/src/test/java/org/springframework/cloud/netflix/concurrency/limits/web/ConcurrencyLimitsHandlerInterceptorTests.java b/spring-cloud-netflix-concurrency-limits/src/test/java/org/springframework/cloud/netflix/concurrency/limits/web/ConcurrencyLimitsHandlerInterceptorTests.java index 89cac5b20..64fad1155 100644 --- a/spring-cloud-netflix-concurrency-limits/src/test/java/org/springframework/cloud/netflix/concurrency/limits/web/ConcurrencyLimitsHandlerInterceptorTests.java +++ b/spring-cloud-netflix-concurrency-limits/src/test/java/org/springframework/cloud/netflix/concurrency/limits/web/ConcurrencyLimitsHandlerInterceptorTests.java @@ -37,7 +37,8 @@ import org.springframework.web.reactive.function.client.WebClient; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; @RunWith(SpringRunner.class) -@SpringBootTest(properties = "logging.level.reactor.netty=DEBUG", webEnvironment = RANDOM_PORT) +@SpringBootTest(properties = "logging.level.reactor.netty=DEBUG", + webEnvironment = RANDOM_PORT) public class ConcurrencyLimitsHandlerInterceptorTests extends AbstractConcurrencyLimitsTests { diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java index f26a65820..7b97fc770 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java +++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java @@ -111,7 +111,8 @@ public class EurekaClientAutoConfiguration { } @Bean - @ConditionalOnMissingBean(value = EurekaClientConfig.class, search = SearchStrategy.CURRENT) + @ConditionalOnMissingBean(value = EurekaClientConfig.class, + search = SearchStrategy.CURRENT) public EurekaClientConfigBean eurekaClientConfigBean(ConfigurableEnvironment env) { EurekaClientConfigBean client = new EurekaClientConfigBean(); if ("bootstrap".equals(this.env.getProperty("spring.config.name"))) { @@ -133,7 +134,8 @@ public class EurekaClientAutoConfiguration { } @Bean - @ConditionalOnMissingBean(value = EurekaInstanceConfig.class, search = SearchStrategy.CURRENT) + @ConditionalOnMissingBean(value = EurekaInstanceConfig.class, + search = SearchStrategy.CURRENT) public EurekaInstanceConfigBean eurekaInstanceConfigBean(InetUtils inetUtils, ManagementMetadataProvider managementMetadataProvider) { String hostname = getProperty("eureka.instance.hostname"); @@ -250,7 +252,9 @@ public class EurekaClientAutoConfiguration { @Bean @ConditionalOnBean(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 EurekaAutoServiceRegistration eurekaAutoServiceRegistration( ApplicationContext context, EurekaServiceRegistry registry, EurekaRegistration registration) { @@ -268,7 +272,8 @@ public class EurekaClientAutoConfiguration { private AbstractDiscoveryClientOptionalArgs optionalArgs; @Bean(destroyMethod = "shutdown") - @ConditionalOnMissingBean(value = EurekaClient.class, search = SearchStrategy.CURRENT) + @ConditionalOnMissingBean(value = EurekaClient.class, + search = SearchStrategy.CURRENT) public EurekaClient eurekaClient(ApplicationInfoManager manager, EurekaClientConfig config) { return new CloudEurekaClient(manager, config, this.optionalArgs, @@ -276,7 +281,8 @@ public class EurekaClientAutoConfiguration { } @Bean - @ConditionalOnMissingBean(value = ApplicationInfoManager.class, search = SearchStrategy.CURRENT) + @ConditionalOnMissingBean(value = ApplicationInfoManager.class, + search = SearchStrategy.CURRENT) public ApplicationInfoManager eurekaApplicationInfoManager( EurekaInstanceConfig config) { InstanceInfo instanceInfo = new InstanceInfoFactory().create(config); @@ -285,11 +291,13 @@ public class EurekaClientAutoConfiguration { @Bean @ConditionalOnBean(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 EurekaRegistration eurekaRegistration(EurekaClient eurekaClient, CloudEurekaInstanceConfig instanceConfig, - ApplicationInfoManager applicationInfoManager, - @Autowired(required = false) ObjectProvider healthCheckHandler) { + ApplicationInfoManager applicationInfoManager, @Autowired( + required = false) ObjectProvider healthCheckHandler) { return EurekaRegistration.builder(instanceConfig).with(applicationInfoManager) .with(eurekaClient).with(healthCheckHandler).build(); } @@ -307,7 +315,8 @@ public class EurekaClientAutoConfiguration { private AbstractDiscoveryClientOptionalArgs optionalArgs; @Bean(destroyMethod = "shutdown") - @ConditionalOnMissingBean(value = EurekaClient.class, search = SearchStrategy.CURRENT) + @ConditionalOnMissingBean(value = EurekaClient.class, + search = SearchStrategy.CURRENT) @org.springframework.cloud.context.config.annotation.RefreshScope @Lazy public EurekaClient eurekaClient(ApplicationInfoManager manager, @@ -334,7 +343,8 @@ public class EurekaClientAutoConfiguration { } @Bean - @ConditionalOnMissingBean(value = ApplicationInfoManager.class, search = SearchStrategy.CURRENT) + @ConditionalOnMissingBean(value = ApplicationInfoManager.class, + search = SearchStrategy.CURRENT) @org.springframework.cloud.context.config.annotation.RefreshScope @Lazy public ApplicationInfoManager eurekaApplicationInfoManager( @@ -346,11 +356,13 @@ public class EurekaClientAutoConfiguration { @Bean @org.springframework.cloud.context.config.annotation.RefreshScope @ConditionalOnBean(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 EurekaRegistration eurekaRegistration(EurekaClient eurekaClient, CloudEurekaInstanceConfig instanceConfig, - ApplicationInfoManager applicationInfoManager, - @Autowired(required = false) ObjectProvider healthCheckHandler) { + ApplicationInfoManager applicationInfoManager, @Autowired( + required = false) ObjectProvider healthCheckHandler) { return EurekaRegistration.builder(instanceConfig).with(applicationInfoManager) .with(eurekaClient).with(healthCheckHandler).build(); } diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java index afa369d59..bb6b8278f 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java +++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java @@ -54,7 +54,8 @@ public class EurekaDiscoveryClientConfiguration { } @Configuration - @ConditionalOnProperty(value = "eureka.client.healthcheck.enabled", matchIfMissing = false) + @ConditionalOnProperty(value = "eureka.client.healthcheck.enabled", + matchIfMissing = false) protected static class EurekaHealthCheckHandlerConfiguration { @Autowired(required = false) diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientOptionalArgsConfiguration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientOptionalArgsConfiguration.java index ac6df1691..818043f7f 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientOptionalArgsConfiguration.java +++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientOptionalArgsConfiguration.java @@ -35,14 +35,16 @@ public class DiscoveryClientOptionalArgsConfiguration { @Bean @ConditionalOnMissingClass("com.sun.jersey.api.client.filter.ClientFilter") - @ConditionalOnMissingBean(value = AbstractDiscoveryClientOptionalArgs.class, search = SearchStrategy.CURRENT) + @ConditionalOnMissingBean(value = AbstractDiscoveryClientOptionalArgs.class, + search = SearchStrategy.CURRENT) public RestTemplateDiscoveryClientOptionalArgs restTemplateDiscoveryClientOptionalArgs() { return new RestTemplateDiscoveryClientOptionalArgs(); } @Bean @ConditionalOnClass(name = "com.sun.jersey.api.client.filter.ClientFilter") - @ConditionalOnMissingBean(value = AbstractDiscoveryClientOptionalArgs.class, search = SearchStrategy.CURRENT) + @ConditionalOnMissingBean(value = AbstractDiscoveryClientOptionalArgs.class, + search = SearchStrategy.CURRENT) public MutableDiscoveryClientOptionalArgs discoveryClientOptionalArgs() { return new MutableDiscoveryClientOptionalArgs(); } diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaDiscoveryClientConfigServiceAutoConfiguration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaDiscoveryClientConfigServiceAutoConfiguration.java index 098147e70..8b05bedd5 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaDiscoveryClientConfigServiceAutoConfiguration.java +++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaDiscoveryClientConfigServiceAutoConfiguration.java @@ -33,7 +33,8 @@ import org.springframework.context.ConfigurableApplicationContext; * @author Dave Syer */ @ConditionalOnBean({ EurekaDiscoveryClientConfiguration.class }) -@ConditionalOnProperty(value = "spring.cloud.config.discovery.enabled", matchIfMissing = false) +@ConditionalOnProperty(value = "spring.cloud.config.discovery.enabled", + matchIfMissing = false) public class EurekaDiscoveryClientConfigServiceAutoConfiguration { @Autowired diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaDiscoveryClientConfigServiceBootstrapConfiguration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaDiscoveryClientConfigServiceBootstrapConfiguration.java index 60a493c6a..01c820a09 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaDiscoveryClientConfigServiceBootstrapConfiguration.java +++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaDiscoveryClientConfigServiceBootstrapConfiguration.java @@ -31,7 +31,8 @@ import org.springframework.context.annotation.Import; * @author Dave Syer */ @ConditionalOnClass(ConfigServicePropertySourceLocator.class) -@ConditionalOnProperty(value = "spring.cloud.config.discovery.enabled", matchIfMissing = false) +@ConditionalOnProperty(value = "spring.cloud.config.discovery.enabled", + matchIfMissing = false) @Configuration @Import({ EurekaDiscoveryClientConfiguration.class, // this emulates // @EnableDiscoveryClient, the import diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java index 270af8275..e370ffec7 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java @@ -638,7 +638,8 @@ public class EurekaClientAutoConfigurationTests { } @Bean(destroyMethod = "shutdown") - @ConditionalOnMissingBean(value = EurekaClient.class, search = SearchStrategy.CURRENT) + @ConditionalOnMissingBean(value = EurekaClient.class, + search = SearchStrategy.CURRENT) public EurekaClient eurekaClient(ApplicationInfoManager manager, EurekaClientConfig config, ApplicationContext context) { return new CloudEurekaClient(manager, config, null, context) { diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/ConfigRefreshTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/ConfigRefreshTests.java index d9be29fc0..e0cba004b 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/ConfigRefreshTests.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/ConfigRefreshTests.java @@ -35,7 +35,8 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * @author Ryan Baxter */ @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = RANDOM_PORT, classes = RefreshEurekaSampleApplication.class) +@SpringBootTest(webEnvironment = RANDOM_PORT, + classes = RefreshEurekaSampleApplication.class) public class ConfigRefreshTests { @Autowired diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/JerseyOptionalArgsConfigurationTest.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/JerseyOptionalArgsConfigurationTest.java index 54d85a2a3..acf21bc8f 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/JerseyOptionalArgsConfigurationTest.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/JerseyOptionalArgsConfigurationTest.java @@ -34,7 +34,8 @@ import static org.assertj.core.api.Assertions.assertThat; */ @DirtiesContext @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = EurekaSampleApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT) +@SpringBootTest(classes = EurekaSampleApplication.class, + webEnvironment = WebEnvironment.RANDOM_PORT) public class JerseyOptionalArgsConfigurationTest { @Autowired diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/RestTemplateOptionalArgsConfigurationTest.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/RestTemplateOptionalArgsConfigurationTest.java index 7b1f94afd..43577a861 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/RestTemplateOptionalArgsConfigurationTest.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/RestTemplateOptionalArgsConfigurationTest.java @@ -36,7 +36,8 @@ import static org.assertj.core.api.Assertions.assertThat; */ @RunWith(ModifiedClassPathRunner.class) @ClassPathExclusions({ "jersey-client-*", "jersey-core-*", "jersey-apache-client4-*" }) -@SpringBootTest(classes = EurekaSampleApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT) +@SpringBootTest(classes = EurekaSampleApplication.class, + webEnvironment = WebEnvironment.RANDOM_PORT) public class RestTemplateOptionalArgsConfigurationTest { @Test diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/healthcheck/EurekaHealthCheckTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/healthcheck/EurekaHealthCheckTests.java index 57ef48f55..39811714f 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/healthcheck/EurekaHealthCheckTests.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/healthcheck/EurekaHealthCheckTests.java @@ -40,8 +40,9 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Jakub Narloch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = EurekaHealthCheckTests.EurekaHealthCheckApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = { - "eureka.client.healthcheck.enabled=true", "debug=true" }) +@SpringBootTest(classes = EurekaHealthCheckTests.EurekaHealthCheckApplication.class, + webEnvironment = WebEnvironment.RANDOM_PORT, + value = { "eureka.client.healthcheck.enabled=true", "debug=true" }) @DirtiesContext public class EurekaHealthCheckTests { diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/EurekaServerMockApplication.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/EurekaServerMockApplication.java index 67ef956f1..5caff370e 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/EurekaServerMockApplication.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/EurekaServerMockApplication.java @@ -122,8 +122,8 @@ public class EurekaServerMockApplication { } @ResponseStatus(HttpStatus.OK) - @PutMapping(value = "/apps/{appName}/{id}", params = { "status", - "lastDirtyTimestamp" }) + @PutMapping(value = "/apps/{appName}/{id}", + params = { "status", "lastDirtyTimestamp" }) public ResponseEntity sendHeartBeat(@PathVariable String appName, @PathVariable String id, @RequestParam String status, @RequestParam String lastDirtyTimestamp, @@ -138,8 +138,8 @@ public class EurekaServerMockApplication { } @ResponseStatus(HttpStatus.OK) - @PutMapping(value = "/apps/{appName}/{id}/status", params = { "value", - "lastDirtyTimestamp" }) + @PutMapping(value = "/apps/{appName}/{id}/status", + params = { "value", "lastDirtyTimestamp" }) public void statusUpdate(@PathVariable String appName, @PathVariable String id, @RequestParam String value, @RequestParam String lastDirtyTimestamp) { diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/RestTemplateEurekaHttpClientTest.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/RestTemplateEurekaHttpClientTest.java index 094e80ab2..7cc6fad6a 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/RestTemplateEurekaHttpClientTest.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/RestTemplateEurekaHttpClientTest.java @@ -42,8 +42,9 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Daniel Lavoie */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = EurekaServerMockApplication.class, properties = { "debug=true", - "security.basic.enabled=true" }, webEnvironment = WebEnvironment.RANDOM_PORT) +@SpringBootTest(classes = EurekaServerMockApplication.class, + properties = { "debug=true", "security.basic.enabled=true" }, + webEnvironment = WebEnvironment.RANDOM_PORT) @DirtiesContext public class RestTemplateEurekaHttpClientTest { diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/sample/ApplicationTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/sample/ApplicationTests.java index a3ae3c84a..10628312b 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/sample/ApplicationTests.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/sample/ApplicationTests.java @@ -25,7 +25,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = EurekaSampleApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT) +@SpringBootTest(classes = EurekaSampleApplication.class, + webEnvironment = WebEnvironment.RANDOM_PORT) @DirtiesContext public class ApplicationTests { diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/EurekaDisabledRibbonClientIntegrationTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/EurekaDisabledRibbonClientIntegrationTests.java index 20c5e6def..038235279 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/EurekaDisabledRibbonClientIntegrationTests.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/EurekaDisabledRibbonClientIntegrationTests.java @@ -48,7 +48,8 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Biju Kunjummen */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = TestConfiguration.class, properties = "eureka.client.enabled=false") +@SpringBootTest(classes = TestConfiguration.class, + properties = "eureka.client.enabled=false") @DirtiesContext public class EurekaDisabledRibbonClientIntegrationTests { diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/EurekaRibbonClientPropertyOverrideIntegrationTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/EurekaRibbonClientPropertyOverrideIntegrationTests.java index a111b1e80..a1094f8ee 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/EurekaRibbonClientPropertyOverrideIntegrationTests.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/EurekaRibbonClientPropertyOverrideIntegrationTests.java @@ -45,7 +45,8 @@ import static org.mockito.Mockito.mock; * @author Spencer Gibb */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = EurekaRibbonClientPropertyOverrideIntegrationTests.TestConfiguration.class) +@SpringBootTest( + classes = EurekaRibbonClientPropertyOverrideIntegrationTests.TestConfiguration.class) @DirtiesContext public class EurekaRibbonClientPropertyOverrideIntegrationTests { diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/RibbonEurekaAutoConfigurationTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/RibbonEurekaAutoConfigurationTests.java index a5a8bc9df..7dae9511d 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/RibbonEurekaAutoConfigurationTests.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/RibbonEurekaAutoConfigurationTests.java @@ -39,9 +39,11 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * @author Spencer Gibb */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = RibbonEurekaAutoConfigurationTests.EurekaClientDisabledApp.class, properties = { - "eureka.client.enabled=false", - "spring.application.name=eurekadisabledtest" }, webEnvironment = RANDOM_PORT) +@SpringBootTest( + classes = RibbonEurekaAutoConfigurationTests.EurekaClientDisabledApp.class, + properties = { "eureka.client.enabled=false", + "spring.application.name=eurekadisabledtest" }, + webEnvironment = RANDOM_PORT) @DirtiesContext public class RibbonEurekaAutoConfigurationTests { diff --git a/spring-cloud-netflix-hystrix-dashboard/src/test/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardContextTests.java b/spring-cloud-netflix-hystrix-dashboard/src/test/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardContextTests.java index 32c8d1c05..3ba4b9c03 100644 --- a/spring-cloud-netflix-hystrix-dashboard/src/test/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardContextTests.java +++ b/spring-cloud-netflix-hystrix-dashboard/src/test/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardContextTests.java @@ -37,9 +37,9 @@ import static org.assertj.core.api.Assertions.assertThat; * */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = Application.class, webEnvironment = WebEnvironment.RANDOM_PORT, properties = { - "spring.application.name=hystrix-dashboard", - "server.servlet.context-path=/context" }) +@SpringBootTest(classes = Application.class, webEnvironment = WebEnvironment.RANDOM_PORT, + properties = { "spring.application.name=hystrix-dashboard", + "server.servlet.context-path=/context" }) public class HystrixDashboardContextTests { public static final String JQUERY_PATH = "/context/webjars/jquery/2.1.1/jquery.min.js"; diff --git a/spring-cloud-netflix-hystrix-dashboard/src/test/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardHomePageTests.java b/spring-cloud-netflix-hystrix-dashboard/src/test/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardHomePageTests.java index c22ea4048..58dd457d0 100644 --- a/spring-cloud-netflix-hystrix-dashboard/src/test/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardHomePageTests.java +++ b/spring-cloud-netflix-hystrix-dashboard/src/test/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardHomePageTests.java @@ -39,8 +39,8 @@ import static org.assertj.core.api.Assertions.assertThat; * */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = Application.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = { - "server.port=0", "spring.application.name=hystrix-dashboard" }) +@SpringBootTest(classes = Application.class, webEnvironment = WebEnvironment.RANDOM_PORT, + value = { "server.port=0", "spring.application.name=hystrix-dashboard" }) public class HystrixDashboardHomePageTests { @Value("${local.server.port}") diff --git a/spring-cloud-netflix-hystrix-dashboard/src/test/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardTests.java b/spring-cloud-netflix-hystrix-dashboard/src/test/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardTests.java index 1b6e830f9..6ba23867f 100644 --- a/spring-cloud-netflix-hystrix-dashboard/src/test/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardTests.java +++ b/spring-cloud-netflix-hystrix-dashboard/src/test/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardTests.java @@ -36,8 +36,8 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = Application.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = { - "spring.application.name=hystrix-dashboard" }) +@SpringBootTest(classes = Application.class, webEnvironment = WebEnvironment.RANDOM_PORT, + value = { "spring.application.name=hystrix-dashboard" }) public class HystrixDashboardTests { @Value("${local.server.port}") diff --git a/spring-cloud-netflix-hystrix-stream/src/main/java/org/springframework/cloud/netflix/hystrix/stream/HystrixStreamTask.java b/spring-cloud-netflix-hystrix-stream/src/main/java/org/springframework/cloud/netflix/hystrix/stream/HystrixStreamTask.java index 2862b9052..d94cabd3b 100644 --- a/spring-cloud-netflix-hystrix-stream/src/main/java/org/springframework/cloud/netflix/hystrix/stream/HystrixStreamTask.java +++ b/spring-cloud-netflix-hystrix-stream/src/main/java/org/springframework/cloud/netflix/hystrix/stream/HystrixStreamTask.java @@ -88,7 +88,8 @@ public class HystrixStreamTask implements ApplicationContextAware { } // TODO: use integration to split this up? - @Scheduled(fixedRateString = "${hystrix.stream.queue.sendRate:${hystrix.stream.queue.send-rate:500}}") + @Scheduled( + fixedRateString = "${hystrix.stream.queue.sendRate:${hystrix.stream.queue.send-rate:500}}") public void sendMetrics() { ArrayList metrics = new ArrayList<>(); this.jsonMetrics.drainTo(metrics); @@ -116,7 +117,8 @@ public class HystrixStreamTask implements ApplicationContextAware { } } - @Scheduled(fixedRateString = "${hystrix.stream.queue.gatherRate:${hystrix.stream.queue.gather-rate:500}}") + @Scheduled( + fixedRateString = "${hystrix.stream.queue.gatherRate:${hystrix.stream.queue.gather-rate:500}}") public void gatherMetrics() { try { // command metrics diff --git a/spring-cloud-netflix-hystrix-stream/src/test/java/org/springframework/cloud/netflix/hystrix/stream/StreamSourceTestBase.java b/spring-cloud-netflix-hystrix-stream/src/test/java/org/springframework/cloud/netflix/hystrix/stream/StreamSourceTestBase.java index bea34b0fe..36e39faa0 100644 --- a/spring-cloud-netflix-hystrix-stream/src/test/java/org/springframework/cloud/netflix/hystrix/stream/StreamSourceTestBase.java +++ b/spring-cloud-netflix-hystrix-stream/src/test/java/org/springframework/cloud/netflix/hystrix/stream/StreamSourceTestBase.java @@ -60,8 +60,8 @@ import org.springframework.web.bind.annotation.RestController; * @author Marius Bogoevici */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = TestApplication.class, properties = { - "spring.application.name=application" }) +@SpringBootTest(classes = TestApplication.class, + properties = { "spring.application.name=application" }) @AutoConfigureMessageVerifier public abstract class StreamSourceTestBase { diff --git a/spring-cloud-netflix-hystrix/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixAutoConfiguration.java b/spring-cloud-netflix-hystrix/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixAutoConfiguration.java index 759623555..7f79b2572 100644 --- a/spring-cloud-netflix-hystrix/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixAutoConfiguration.java +++ b/spring-cloud-netflix-hystrix/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixAutoConfiguration.java @@ -63,7 +63,8 @@ public class HystrixAutoConfiguration { } @Configuration - @ConditionalOnProperty(value = "management.metrics.binders.hystrix.enabled", matchIfMissing = true) + @ConditionalOnProperty(value = "management.metrics.binders.hystrix.enabled", + matchIfMissing = true) @ConditionalOnClass({ HystrixMetricsBinder.class }) protected static class HystrixMetricsConfiguration { diff --git a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixOnlyTests.java b/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixOnlyTests.java index e2a7a3153..e4a0cf40b 100644 --- a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixOnlyTests.java +++ b/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixOnlyTests.java @@ -55,8 +55,8 @@ import static org.springframework.cloud.netflix.test.TestAutoConfiguration.USER; * @author Spencer Gibb */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = HystrixOnlyApplication.class, webEnvironment = RANDOM_PORT, properties = { - "management.endpoint.health.show-details=ALWAYS" }) +@SpringBootTest(classes = HystrixOnlyApplication.class, webEnvironment = RANDOM_PORT, + properties = { "management.endpoint.health.show-details=ALWAYS" }) @DirtiesContext @ActiveProfiles("proxysecurity") public class HystrixOnlyTests { diff --git a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixStreamEndpointTests.java b/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixStreamEndpointTests.java index 4e2a1a813..4ef86c4aa 100644 --- a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixStreamEndpointTests.java +++ b/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixStreamEndpointTests.java @@ -54,8 +54,9 @@ import static org.assertj.core.api.Assertions.fail; * @author Spencer Gibb */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = HystrixStreamEndpointTests.Application.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = { - "spring.application.name=hystrixstreamtest" }) +@SpringBootTest(classes = HystrixStreamEndpointTests.Application.class, + webEnvironment = WebEnvironment.RANDOM_PORT, + value = { "spring.application.name=hystrixstreamtest" }) @DirtiesContext public class HystrixStreamEndpointTests { diff --git a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixWebfluxEndpointTests.java b/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixWebfluxEndpointTests.java index 8dc3b8a8e..82f68fcd3 100644 --- a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixWebfluxEndpointTests.java +++ b/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixWebfluxEndpointTests.java @@ -48,9 +48,9 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * @author Spencer Gibb */ @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = RANDOM_PORT, properties = { - "spring.main.web-application-type=reactive", - "spring.application.name=hystrixstreamwebfluxtest" /* "debug=true" */ }) +@SpringBootTest(webEnvironment = RANDOM_PORT, + properties = { "spring.main.web-application-type=reactive", + "spring.application.name=hystrixstreamwebfluxtest" /* "debug=true" */ }) @DirtiesContext public class HystrixWebfluxEndpointTests { diff --git a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/resttemplate/RestTemplateRetryTests.java b/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/resttemplate/RestTemplateRetryTests.java index 55f3749f3..e3b0fcb10 100644 --- a/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/resttemplate/RestTemplateRetryTests.java +++ b/spring-cloud-netflix-hystrix/src/test/java/org/springframework/cloud/netflix/resttemplate/RestTemplateRetryTests.java @@ -61,11 +61,14 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; @RunWith(SpringRunner.class) -@SpringBootTest(classes = RestTemplateRetryTests.Application.class, webEnvironment = RANDOM_PORT, properties = { - "spring.application.name=resttemplatetest", "logging.level.com.netflix=DEBUG", - "logging.level.org.springframework.cloud.netflix.resttemplate=DEBUG", - "logging.level.com.netflix=DEBUG", "badClients.ribbon.MaxAutoRetries=25", - "badClients.ribbon.OkToRetryOnAllOperations=true", "ribbon.http.client.enabled" }) +@SpringBootTest(classes = RestTemplateRetryTests.Application.class, + webEnvironment = RANDOM_PORT, + properties = { "spring.application.name=resttemplatetest", + "logging.level.com.netflix=DEBUG", + "logging.level.org.springframework.cloud.netflix.resttemplate=DEBUG", + "logging.level.com.netflix=DEBUG", "badClients.ribbon.MaxAutoRetries=25", + "badClients.ribbon.OkToRetryOnAllOperations=true", + "ribbon.http.client.enabled" }) @DirtiesContext public class RestTemplateRetryTests { diff --git a/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfiguration.java b/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfiguration.java index cfc27ae99..30060225c 100644 --- a/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfiguration.java +++ b/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfiguration.java @@ -59,7 +59,8 @@ import org.springframework.web.client.RestTemplate; @Configuration @Conditional(RibbonAutoConfiguration.RibbonClassesConditions.class) @RibbonClients -@AutoConfigureAfter(name = "org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration") +@AutoConfigureAfter( + name = "org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration") @AutoConfigureBefore({ LoadBalancerAutoConfiguration.class, AsyncLoadBalancerAutoConfiguration.class }) @EnableConfigurationProperties({ RibbonEagerLoadProperties.class, diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonApplicationContextInitializerTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonApplicationContextInitializerTests.java index 335f05d7e..54786b695 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonApplicationContextInitializerTests.java +++ b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonApplicationContextInitializerTests.java @@ -38,9 +38,9 @@ import static org.assertj.core.api.Assertions.assertThat; */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = { RibbonAutoConfiguration.class, - ArchaiusAutoConfiguration.class, - RibbonApplicationContextInitializerTests.RibbonInitializerConfig.class }) +@SpringBootTest( + classes = { RibbonAutoConfiguration.class, ArchaiusAutoConfiguration.class, + RibbonApplicationContextInitializerTests.RibbonInitializerConfig.class }) @DirtiesContext public class RibbonApplicationContextInitializerTests { diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfigurationIntegrationTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfigurationIntegrationTests.java index 25b95bf30..7caa9fcbb 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfigurationIntegrationTests.java +++ b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfigurationIntegrationTests.java @@ -37,8 +37,8 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = TestConfiguration.class, value = { - "ribbon.ConnectTimeout=25000" }) +@SpringBootTest(classes = TestConfiguration.class, + value = { "ribbon.ConnectTimeout=25000" }) @DirtiesContext public class RibbonAutoConfigurationIntegrationTests { diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientConfigurationIntegrationTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientConfigurationIntegrationTests.java index 3122aa468..57ae3b928 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientConfigurationIntegrationTests.java +++ b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientConfigurationIntegrationTests.java @@ -37,7 +37,8 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Dave Syer */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = RibbonClientConfigurationIntegrationTests.TestLBConfig.class, properties = "test.ribbon.ServerListRefreshInterval=999") +@SpringBootTest(classes = RibbonClientConfigurationIntegrationTests.TestLBConfig.class, + properties = "test.ribbon.ServerListRefreshInterval=999") @DirtiesContext public class RibbonClientConfigurationIntegrationTests { diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientHttpRequestFactoryTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientHttpRequestFactoryTests.java index 2d73d468d..ea971468c 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientHttpRequestFactoryTests.java +++ b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientHttpRequestFactoryTests.java @@ -57,10 +57,11 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * @author Spencer Gibb */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = RibbonClientHttpRequestFactoryTests.App.class, webEnvironment = RANDOM_PORT, value = { - "spring.application.name=ribbonclienttest", "spring.jmx.enabled=true", - "spring.cloud.netflix.metrics.enabled=false", "ribbon.restclient.enabled=true", - "debug=true" }) +@SpringBootTest(classes = RibbonClientHttpRequestFactoryTests.App.class, + webEnvironment = RANDOM_PORT, + value = { "spring.application.name=ribbonclienttest", "spring.jmx.enabled=true", + "spring.cloud.netflix.metrics.enabled=false", + "ribbon.restclient.enabled=true", "debug=true" }) @DirtiesContext public class RibbonClientHttpRequestFactoryTests { diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorOverridesIntegrationTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorOverridesIntegrationTests.java index 8d533e320..1316ec638 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorOverridesIntegrationTests.java +++ b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorOverridesIntegrationTests.java @@ -48,7 +48,8 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = RibbonClientPreprocessorOverridesIntegrationTests.TestConfiguration.class) +@SpringBootTest( + classes = RibbonClientPreprocessorOverridesIntegrationTests.TestConfiguration.class) @DirtiesContext public class RibbonClientPreprocessorOverridesIntegrationTests { diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorOverridesRetryTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorOverridesRetryTests.java index 376aec70f..569f73007 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorOverridesRetryTests.java +++ b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorOverridesRetryTests.java @@ -44,10 +44,11 @@ import org.springframework.util.Assert; * @author Tyler Van Gorder */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = RibbonClientPreprocessorOverridesRetryTests.TestConfiguration.class, value = { - "customRetry.ribbon.MaxAutoRetries=0", - "customRetry.ribbon.MaxAutoRetriesNextServer=1", - "customRetry.ribbon.OkToRetryOnAllOperations=true" }) +@SpringBootTest( + classes = RibbonClientPreprocessorOverridesRetryTests.TestConfiguration.class, + value = { "customRetry.ribbon.MaxAutoRetries=0", + "customRetry.ribbon.MaxAutoRetriesNextServer=1", + "customRetry.ribbon.OkToRetryOnAllOperations=true" }) @DirtiesContext public class RibbonClientPreprocessorOverridesRetryTests { diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorPropertiesOverridesIntegrationTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorPropertiesOverridesIntegrationTests.java index 87ce23444..b7bc9b7fe 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorPropertiesOverridesIntegrationTests.java +++ b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorPropertiesOverridesIntegrationTests.java @@ -49,7 +49,8 @@ import static org.junit.Assume.assumeThat; * @author Spencer Gibb */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = RibbonClientPreprocessorPropertiesOverridesIntegrationTests.TestConfiguration.class) +@SpringBootTest( + classes = RibbonClientPreprocessorPropertiesOverridesIntegrationTests.TestConfiguration.class) @DirtiesContext public class RibbonClientPreprocessorPropertiesOverridesIntegrationTests { diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/SpringRetryEnabledTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/SpringRetryEnabledTests.java index f1b85b957..fbb588742 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/SpringRetryEnabledTests.java +++ b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/SpringRetryEnabledTests.java @@ -38,9 +38,9 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Ryan Baxter */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = { RibbonAutoConfiguration.class, - RibbonClientConfiguration.class, LoadBalancerAutoConfiguration.class, - HttpClientConfiguration.class }) +@ContextConfiguration( + classes = { RibbonAutoConfiguration.class, RibbonClientConfiguration.class, + LoadBalancerAutoConfiguration.class, HttpClientConfiguration.class }) public class SpringRetryEnabledTests implements ApplicationContextAware { private ApplicationContext context; diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/okhttp/SpringRetryEnabledOkHttpClientTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/okhttp/SpringRetryEnabledOkHttpClientTests.java index 72e8957ba..334e67a23 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/okhttp/SpringRetryEnabledOkHttpClientTests.java +++ b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/okhttp/SpringRetryEnabledOkHttpClientTests.java @@ -62,9 +62,9 @@ import static org.mockito.Mockito.mock; */ @RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest({ "ribbon.okhttp.enabled: true", "ribbon.httpclient.enabled: false" }) -@ContextConfiguration(classes = { RibbonAutoConfiguration.class, - HttpClientConfiguration.class, RibbonClientConfiguration.class, - LoadBalancerAutoConfiguration.class }) +@ContextConfiguration( + classes = { RibbonAutoConfiguration.class, HttpClientConfiguration.class, + RibbonClientConfiguration.class, LoadBalancerAutoConfiguration.class }) public class SpringRetryEnabledOkHttpClientTests implements ApplicationContextAware { private ApplicationContext context; diff --git a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/test/RibbonClientDefaultConfigurationTests.java b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/test/RibbonClientDefaultConfigurationTests.java index 6e3d8d9ed..9a4aa2623 100644 --- a/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/test/RibbonClientDefaultConfigurationTests.java +++ b/spring-cloud-netflix-ribbon/src/test/java/org/springframework/cloud/netflix/ribbon/test/RibbonClientDefaultConfigurationTests.java @@ -38,7 +38,8 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Spencer Gibb */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = RibbonClientDefaultConfigurationTestsConfig.class, value = "ribbon.eureka.enabled=true") +@SpringBootTest(classes = RibbonClientDefaultConfigurationTestsConfig.class, + value = "ribbon.eureka.enabled=true") @DirtiesContext public class RibbonClientDefaultConfigurationTests {