From ea9404ef81fc9f50d73a7a72e6c5128fff47a669 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Sun, 17 Feb 2019 17:48:28 +0100 Subject: [PATCH] Merge branch '2.0.x' # Conflicts: # spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java # spring-cloud-commons/src/test/java/org/springframework/cloud/client/CommonsClientAutoConfigurationTests.java --- .../cloud/client/CommonsClientAutoConfigurationTests.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/CommonsClientAutoConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/CommonsClientAutoConfigurationTests.java index 9e025b6d..3f60b237 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/CommonsClientAutoConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/CommonsClientAutoConfigurationTests.java @@ -32,6 +32,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; import static org.assertj.core.api.BDDAssertions.then; @@ -96,7 +97,7 @@ public class CommonsClientAutoConfigurationTests { } try (ConfigurableApplicationContext context = init( "spring.cloud.discovery.enabled=true")) { - assertThat(context.getBean(TestBean.class), is(notNullValue())); + assertThat(context.getBean(TestBean.class)).isNotNull(); } } @@ -118,19 +119,20 @@ public class CommonsClientAutoConfigurationTests { @Configuration @EnableAutoConfiguration - @Import({NoopDiscoveryClientAutoConfiguration.class, DiscoveryEnabledConfig.class}) + @Import({ NoopDiscoveryClientAutoConfiguration.class, DiscoveryEnabledConfig.class }) protected static class Config { } - @Configuration @ConditionalOnDiscoveryEnabled protected static class DiscoveryEnabledConfig { + @Bean TestBean testBean() { return new TestBean(); } + } private static class TestBean {