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

formatting

Browse Source
This commit is contained in:
spencergibb
2020-09-28 11:45:30 -04:00
parent f77192b569
commit c56dfc47e8
6 changed files with 26 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulHealthIndicator.java
View File

@@ -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<String> leaderStatus = this.consul.getStatusLeader();
builder.up().withDetail("leader", leaderStatus.getValue());
if (properties.isIncludeServicesQuery()) {
final Response<Map<String, List<String>>> services = this.consul
.getCatalogServices(CatalogServicesRequest.newBuilder()
.setQueryParams(QueryParams.DEFAULT).build());
final Response<Map<String, List<String>>> services = this.consul.getCatalogServices(
CatalogServicesRequest.newBuilder().setQueryParams(QueryParams.DEFAULT).build());
builder.withDetail("services", services.getValue());
}
}

3
spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulHealthIndicatorProperties.java
View File

@@ -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();
}
}

40
spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulAutoConfigurationTests.java
View File

@@ -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));
}
}

9
spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulHealthIndicatorDownTest.java
View File

@@ -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<String> leaderStatus = new Response<>("OK", 5150L, true,
System.currentTimeMillis());
Response<String> 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));
}

9
spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulHealthIndicatorLightweightUpTest.java
View File

@@ -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

3
spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulHealthIndicatorUpTest.java
View File

@@ -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));
}