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

Remove @ConditionalOnMissingBean for native configuration. Fixes #1440 (#1453)

Browse Source
This commit is contained in:
Ryan Baxter
2019-08-22 11:15:12 -04:00
committed by GitHub
parent 106cc5f44d
commit add8f26187
3 changed files with 0 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EnvironmentRepositoryConfiguration.java
View File

@@ -282,7 +282,6 @@ class DefaultRepositoryConfiguration {
} }
@Configuration @Configuration
@ConditionalOnMissingBean(EnvironmentRepository.class)
@Profile("native") @Profile("native")
class NativeRepositoryConfiguration { class NativeRepositoryConfiguration {

55
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/NativeBootstrapFailureAnalyzerTests.java
View File

@@ -1,55 +0,0 @@
/*
* Copyright 2018-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.cloud.config.server;
import org.junit.Rule;
import org.junit.Test;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.test.rule.OutputCapture;
import org.springframework.cloud.config.server.diagnostics.GitUriFailureAnalyzer;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
/**
* @author Ryan Baxter
*/
public class NativeBootstrapFailureAnalyzerTests {
@Rule
public OutputCapture outputCapture = new OutputCapture();
@Test
public void contextLoads() {
try {
new SpringApplicationBuilder(ConfigServerApplication.class)
.web(WebApplicationType.SERVLET)
.properties("spring.cloud.bootstrap.name:enable-nativebootstrap")
.profiles("test", "native").run();
fail("Application started successfully");
}
catch (Exception ex) {
assertThat(this.outputCapture.toString())
.contains(GitUriFailureAnalyzer.ACTION);
assertThat(this.outputCapture.toString())
.contains(GitUriFailureAnalyzer.DESCRIPTION);
}
}
}

5
spring-cloud-config-server/src/test/resources/enable-nativebootstrap.yml
View File

@@ -1,5 +0,0 @@
spring:
cloud:
config:
server:
bootstrap: true