From 98d84a369daeeedfe450577373cd39aa0d87b9a5 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Tue, 20 Nov 2018 12:13:10 -0500 Subject: [PATCH] Adding back in search strategy as we now have a failure analyzer for this condition. Fixes #1193 --- .../server/config/EnvironmentRepositoryConfiguration.java | 2 +- .../config/server/NativeBootstrapFailureAnalyzerTests.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EnvironmentRepositoryConfiguration.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EnvironmentRepositoryConfiguration.java index 0dd474df..538d7713 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EnvironmentRepositoryConfiguration.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EnvironmentRepositoryConfiguration.java @@ -191,7 +191,7 @@ public class EnvironmentRepositoryConfiguration { } @Configuration -@ConditionalOnMissingBean(value = EnvironmentRepository.class)//, search = SearchStrategy.CURRENT) +@ConditionalOnMissingBean(value = EnvironmentRepository.class, search = SearchStrategy.CURRENT) class DefaultRepositoryConfiguration { @Autowired private ConfigurableEnvironment environment; diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/NativeBootstrapFailureAnalyzerTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/NativeBootstrapFailureAnalyzerTests.java index d2243c46..85f1a79c 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/NativeBootstrapFailureAnalyzerTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/NativeBootstrapFailureAnalyzerTests.java @@ -18,8 +18,7 @@ public class NativeBootstrapFailureAnalyzerTests { @Rule public OutputCapture outputCapture = new OutputCapture(); - - @Ignore + @Test public void contextLoads(){ try {