diff --git a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulHealthIndicator.java b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulHealthIndicator.java index 086e48b3..30a70734 100644 --- a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulHealthIndicator.java +++ b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulHealthIndicator.java @@ -36,8 +36,7 @@ public class ConsulHealthIndicator extends AbstractHealthIndicator { private ConsulHealthIndicatorProperties properties; - public ConsulHealthIndicator(ConsulClient consul, - ConsulHealthIndicatorProperties properties) { + public ConsulHealthIndicator(ConsulClient consul, ConsulHealthIndicatorProperties properties) { this.consul = consul; this.properties = properties; } @@ -47,9 +46,8 @@ public class ConsulHealthIndicator extends AbstractHealthIndicator { final Response leaderStatus = this.consul.getStatusLeader(); builder.up().withDetail("leader", leaderStatus.getValue()); if (properties.isIncludeServicesQuery()) { - final Response>> services = this.consul - .getCatalogServices(CatalogServicesRequest.newBuilder() - .setQueryParams(QueryParams.DEFAULT).build()); + final Response>> services = this.consul.getCatalogServices( + CatalogServicesRequest.newBuilder().setQueryParams(QueryParams.DEFAULT).build()); builder.withDetail("services", services.getValue()); } } diff --git a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulHealthIndicatorProperties.java b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulHealthIndicatorProperties.java index d9e4daf8..9d80b479 100644 --- a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulHealthIndicatorProperties.java +++ b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulHealthIndicatorProperties.java @@ -47,8 +47,7 @@ public class ConsulHealthIndicatorProperties { @Override public String toString() { - return new ToStringCreator(this) - .append("includeServicesQuery", this.includeServicesQuery).toString(); + return new ToStringCreator(this).append("includeServicesQuery", this.includeServicesQuery).toString(); } } diff --git a/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulAutoConfigurationTests.java b/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulAutoConfigurationTests.java index 2965485e..3bb38156 100644 --- a/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulAutoConfigurationTests.java +++ b/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulAutoConfigurationTests.java @@ -45,26 +45,22 @@ public class ConsulAutoConfigurationTests { @Test public void defaultConfiguration() { - appContextRunner.run(context -> assertThat(context).hasNotFailed() - .hasSingleBean(ConsulProperties.class).hasSingleBean(ConsulClient.class) - .hasSingleBean(ConsulHealthIndicator.class) + appContextRunner.run(context -> assertThat(context).hasNotFailed().hasSingleBean(ConsulProperties.class) + .hasSingleBean(ConsulClient.class).hasSingleBean(ConsulHealthIndicator.class) .doesNotHaveBean(ConsulEndpoint.class)); } @Test public void consulDisabled() { appContextRunner.withPropertyValues("spring.cloud.consul.enabled=false") - .run(context -> assertThat(context).hasNotFailed() - .doesNotHaveBean(ConsulProperties.class) - .doesNotHaveBean(ConsulClient.class) - .doesNotHaveBean(ConsulHealthIndicator.class) + .run(context -> assertThat(context).hasNotFailed().doesNotHaveBean(ConsulProperties.class) + .doesNotHaveBean(ConsulClient.class).doesNotHaveBean(ConsulHealthIndicator.class) .doesNotHaveBean(ConsulEndpoint.class)); } @Test public void tlsConfigured() { - appContextRunner.withPropertyValues( - "spring.cloud.consul.tls.key-store-instance-type=JKS", + appContextRunner.withPropertyValues("spring.cloud.consul.tls.key-store-instance-type=JKS", "spring.cloud.consul.tls.key-store-path=src/test/resources/server.jks", "spring.cloud.consul.tls.key-store-password=letmein", "spring.cloud.consul.tls.certificate-path=src/test/resources/trustStore.jks", @@ -73,9 +69,10 @@ public class ConsulAutoConfigurationTests { ConsulClient consulClient = context.getBean(ConsulClient.class); CatalogConsulClient client = (CatalogConsulClient) ReflectionTestUtils.getField(consulClient, - "catalogClient"); + "catalogClient"); ConsulRawClient rawClient = (ConsulRawClient) ReflectionTestUtils.getField(client, "rawClient"); - HttpTransport httpTransport = (HttpTransport) ReflectionTestUtils.getField(rawClient, "httpTransport"); + HttpTransport httpTransport = (HttpTransport) ReflectionTestUtils.getField(rawClient, + "httpTransport"); assertThat(httpTransport).isInstanceOf(DefaultHttpsTransport.class); }); } @@ -84,17 +81,14 @@ public class ConsulAutoConfigurationTests { public void nonActuatorAppGetsNoEndpointOrHealthIndicator() { appContextRunner.withClassLoader(new FilteredClassLoader(Endpoint.class)) .withPropertyValues("management.endpoints.web.exposure.include=consul") - .run(context -> assertThat(context).hasNotFailed() - .doesNotHaveBean(ConsulHealthIndicator.class) + .run(context -> assertThat(context).hasNotFailed().doesNotHaveBean(ConsulHealthIndicator.class) .doesNotHaveBean(ConsulEndpoint.class)); } @Test public void consulEndpointAvailable() { - appContextRunner - .withPropertyValues("management.endpoints.web.exposure.include=consul") - .run(context -> assertThat(context).hasNotFailed() - .hasSingleBean(ConsulEndpoint.class)); + appContextRunner.withPropertyValues("management.endpoints.web.exposure.include=consul") + .run(context -> assertThat(context).hasNotFailed().hasSingleBean(ConsulEndpoint.class)); } @Test @@ -102,25 +96,21 @@ public class ConsulAutoConfigurationTests { appContextRunner .withPropertyValues("management.endpoints.web.exposure.include=consul", "management.endpoint.consul.enabled=false") - .run(context -> assertThat(context).hasNotFailed() - .doesNotHaveBean(ConsulEndpoint.class)); + .run(context -> assertThat(context).hasNotFailed().doesNotHaveBean(ConsulEndpoint.class)); } @Test public void consulEndpointDisabled() { appContextRunner.withPropertyValues("spring.cloud.consul.enabled=false") - .run(context -> assertThat(context).hasNotFailed() - .doesNotHaveBean(ConsulProperties.class) - .doesNotHaveBean(ConsulClient.class) - .doesNotHaveBean(ConsulHealthIndicator.class) + .run(context -> assertThat(context).hasNotFailed().doesNotHaveBean(ConsulProperties.class) + .doesNotHaveBean(ConsulClient.class).doesNotHaveBean(ConsulHealthIndicator.class) .doesNotHaveBean(ConsulEndpoint.class)); } @Test public void consulHealthIndicatorDisabled() { appContextRunner.withPropertyValues("management.health.consul.enabled=false") - .run(context -> assertThat(context).hasNotFailed() - .doesNotHaveBean(ConsulHealthIndicator.class)); + .run(context -> assertThat(context).hasNotFailed().doesNotHaveBean(ConsulHealthIndicator.class)); } } diff --git a/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulHealthIndicatorDownTest.java b/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulHealthIndicatorDownTest.java index 25d471b6..10c76b91 100644 --- a/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulHealthIndicatorDownTest.java +++ b/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulHealthIndicatorDownTest.java @@ -54,20 +54,17 @@ public class ConsulHealthIndicatorDownTest { @Test public void statusIsDownWhenConsulClientFailsToGetLeaderStatus() { when(consulClient.getStatusLeader()).thenThrow(new RuntimeException("no leader")); - assertThat(this.healthEndpoint.health().getStatus()) - .as("health status was not DOWN").isEqualTo(Status.DOWN); + assertThat(this.healthEndpoint.health().getStatus()).as("health status was not DOWN").isEqualTo(Status.DOWN); verify(consulClient).getStatusLeader(); } @Test public void statusIsDownWhenConsulClientFailsToGetServices() { - Response leaderStatus = new Response<>("OK", 5150L, true, - System.currentTimeMillis()); + Response leaderStatus = new Response<>("OK", 5150L, true, System.currentTimeMillis()); when(consulClient.getStatusLeader()).thenReturn(leaderStatus); when(consulClient.getCatalogServices(any(CatalogServicesRequest.class))) .thenThrow(new RuntimeException("no services")); - assertThat(this.healthEndpoint.health().getStatus()) - .as("health status was not DOWN").isEqualTo(Status.DOWN); + assertThat(this.healthEndpoint.health().getStatus()).as("health status was not DOWN").isEqualTo(Status.DOWN); verify(consulClient).getCatalogServices(any(CatalogServicesRequest.class)); } diff --git a/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulHealthIndicatorLightweightUpTest.java b/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulHealthIndicatorLightweightUpTest.java index 7cf1df79..7d7c62e3 100644 --- a/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulHealthIndicatorLightweightUpTest.java +++ b/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulHealthIndicatorLightweightUpTest.java @@ -44,8 +44,7 @@ import static org.mockito.Mockito.verify; * @author Lomesh Patel (lomeshpatel) */ @RunWith(SpringRunner.class) -@SpringBootTest( - properties = "spring.cloud.consul.health-indicator.include-services-query=false") +@SpringBootTest(properties = "spring.cloud.consul.health-indicator.include-services-query=false") @ContextConfiguration(initializers = ConsulTestcontainers.class) public class ConsulHealthIndicatorLightweightUpTest { @@ -57,11 +56,9 @@ public class ConsulHealthIndicatorLightweightUpTest { @Test public void statusIsUp() { - assertThat(this.healthEndpoint.health().getStatus()) - .as("health status was not UP").isEqualTo(Status.UP); + assertThat(this.healthEndpoint.health().getStatus()).as("health status was not UP").isEqualTo(Status.UP); verify(consulClient).getStatusLeader(); - verify(consulClient, never()) - .getCatalogServices(any(CatalogServicesRequest.class)); + verify(consulClient, never()).getCatalogServices(any(CatalogServicesRequest.class)); } @EnableAutoConfiguration diff --git a/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulHealthIndicatorUpTest.java b/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulHealthIndicatorUpTest.java index a4716e62..91082cf8 100644 --- a/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulHealthIndicatorUpTest.java +++ b/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulHealthIndicatorUpTest.java @@ -54,8 +54,7 @@ public class ConsulHealthIndicatorUpTest { @Test public void statusIsUp() { - assertThat(this.healthEndpoint.health().getStatus()) - .as("health status was not UP").isEqualTo(Status.UP); + assertThat(this.healthEndpoint.health().getStatus()).as("health status was not UP").isEqualTo(Status.UP); verify(consulClient).getStatusLeader(); verify(consulClient).getCatalogServices(any(CatalogServicesRequest.class)); }