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

Formatting changes

Browse Source
This commit is contained in:
Ryan Baxter
2019-05-23 19:59:36 -04:00
parent eff06c8c57
commit 316040ee94
27 changed files with 67 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java
View File

@@ -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> discoveryClient,
DiscoveryClientHealthIndicatorProperties properties) {
@@ -68,7 +70,9 @@ public class CommonsClientAutoConfiguration {
}
@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<DiscoveryHealthIndicator> indicators) {

3
spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationAutoConfiguration.java
View File

@@ -28,7 +28,8 @@ import org.springframework.context.annotation.Import;
*/
@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)

3
spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationConfiguration.java
View File

@@ -25,7 +25,8 @@ import org.springframework.context.annotation.Configuration;
*/
@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 {
}

6
spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/HttpClientConfiguration.java
View File

@@ -33,7 +33,8 @@ import org.springframework.context.annotation.Configuration;
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 class HttpClientConfiguration {
}
@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 {

3
spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/CompatibilityVerifierAutoConfiguration.java
View File

@@ -33,7 +33,8 @@ import org.springframework.context.annotation.Configuration;
* @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 {

4
spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/AutoRegisterPropertyFalseTests.java
View File

@@ -35,8 +35,8 @@ import static org.assertj.core.api.BDDAssertions.then;
* @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)

4
spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientOrderTest.java
View File

@@ -40,8 +40,8 @@ import static org.springframework.cloud.client.discovery.composite.CompositeDisc
* @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

4
spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientTests.java
View File

@@ -41,8 +41,8 @@ import static org.springframework.cloud.client.discovery.composite.CompositeDisc
"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

6
spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryClientHealthIndicatorTests.java
View File

@@ -44,8 +44,10 @@ import static org.mockito.Mockito.mock;
*/
@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 {

7
spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationMgmtDisabledTests.java
View File

@@ -38,9 +38,10 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
* @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.port=0",
"spring.cloud.service-registry.auto-registration.register-management=false" },
webEnvironment = RANDOM_PORT)
public class AbstractAutoServiceRegistrationMgmtDisabledTests {
@Autowired

3
spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationTests.java
View File

@@ -44,7 +44,8 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
*/
@RunWith(SpringRunner.class)
// @checkstyle:off
@SpringBootTest(classes = AbstractAutoServiceRegistrationTests.Config.class, properties = "management.port=0", webEnvironment = RANDOM_PORT)
@SpringBootTest(classes = AbstractAutoServiceRegistrationTests.Config.class,
properties = "management.port=0", webEnvironment = RANDOM_PORT)
// @checkstyle:on
public class AbstractAutoServiceRegistrationTests {

3
spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/endpoint/ServiceRegistryEndpointNoRegistrationTests.java
View File

@@ -42,7 +42,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
* @author Spencer Gibb
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = ServiceRegistryEndpointNoRegistrationTests.TestConfiguration.class)
@SpringBootTest(
classes = ServiceRegistryEndpointNoRegistrationTests.TestConfiguration.class)
@AutoConfigureMockMvc
public class ServiceRegistryEndpointNoRegistrationTests {

3
spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/endpoint/ServiceRegistryEndpointTests.java
View File

@@ -51,7 +51,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
*/
@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 {

4
spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/CustomHttpClientConfigurationTests.java
View File

@@ -40,8 +40,8 @@ import static org.assertj.core.api.BDDAssertions.then;
* @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

4
spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultHttpClientConfigurationTests.java
View File

@@ -32,8 +32,8 @@ import static org.assertj.core.api.BDDAssertions.then;
* @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

3
spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java
View File

@@ -63,7 +63,8 @@ import org.springframework.util.StringUtils;
*/
@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 {

3
spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/WritableEnvironmentEndpointAutoConfiguration.java
View File

@@ -48,7 +48,8 @@ import org.springframework.core.env.Environment;
@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;

3
spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapDisabledAutoConfigurationIntegrationTests.java
View File

@@ -30,7 +30,8 @@ import org.springframework.test.context.junit4.SpringRunner;
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

4
spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingCustomPropertySourceIntegrationTests.java
View File

@@ -41,8 +41,8 @@ import org.springframework.test.context.junit4.SpringRunner;
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 {

3
spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapOrderingSpringApplicationJsonIntegrationTests.java
View File

@@ -32,7 +32,8 @@ import org.springframework.test.context.junit4.SpringRunner;
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

3
spring-cloud-context/src/test/java/org/springframework/cloud/context/environment/EnvironmentManagerIntegrationTests.java
View File

@@ -51,7 +51,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
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 {

4
spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderProxyIntegrationTests.java
View File

@@ -44,8 +44,8 @@ import org.springframework.test.context.junit4.SpringRunner;
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

4
spring-cloud-context/src/test/java/org/springframework/cloud/context/refresh/ContextRefresherIntegrationTests.java
View File

@@ -36,8 +36,8 @@ import org.springframework.test.context.junit4.SpringRunner;
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

5
spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshEndpointIntegrationTests.java
View File

@@ -51,8 +51,9 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
*
*/
@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();

4
spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeListBindingIntegrationTests.java
View File

@@ -45,8 +45,8 @@ import org.springframework.test.context.junit4.SpringRunner;
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

4
spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeNullBeanIntegrationTests.java
View File

@@ -33,8 +33,8 @@ import org.springframework.test.context.junit4.SpringRunner;
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

6
spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/LoadBalancerTest.java
View File

@@ -132,8 +132,10 @@ public class LoadBalancerTest {
@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 {