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

formatting

Browse Source
This commit is contained in:
spencergibb
2021-07-27 23:21:51 -04:00
parent 82eb86a33f
commit fd35b6ecbd
3 changed files with 24 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocator.java
View File

@@ -81,14 +81,13 @@ public class ConfigServicePropertySourceLocator implements PropertySourceLocator
ConfigClientProperties properties = this.defaultProperties.override(environment);
if (StringUtils.startsWithIgnoreCase(properties.getName(), "application-")) {
InvalidApplicationNameException exception = new InvalidApplicationNameException(
properties.getName());
InvalidApplicationNameException exception = new InvalidApplicationNameException(properties.getName());
if (properties.isFailFast()) {
throw exception;
}
else {
logger.warn(NAME_PLACEHOLDER + " resolved to " + properties.getName()
+ ", not going to load remote properties. Ensure application name doesn't start with 'application-'");
+ ", not going to load remote properties. Ensure application name doesn't start with 'application-'");
return null;
}
}

6
spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/diagnostics/analyzer/InvalidApplicationNameExceptionFailureAnalyzer.java
View File

@@ -30,10 +30,8 @@ public class InvalidApplicationNameExceptionFailureAnalyzer
extends AbstractFailureAnalyzer<InvalidApplicationNameException> {
@Override
protected FailureAnalysis analyze(Throwable rootFailure,
InvalidApplicationNameException cause) {
StringBuilder description = new StringBuilder(
String.format("%s:%n", cause.getMessage()));
protected FailureAnalysis analyze(Throwable rootFailure, InvalidApplicationNameException cause) {
StringBuilder description = new StringBuilder(String.format("%s:%n", cause.getMessage()));
description.append(String.format("%n Property: %s", cause.getProperty()));
description.append(String.format("%n Value: %s", cause.getValue()));
String action = "Change ${spring.application.name} or the ${spring.cloud.config.name} "

53
spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigClientAutoConfigurationTests.java
View File

@@ -16,7 +16,6 @@
package org.springframework.cloud.config.client;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.BeanFactoryUtils;
@@ -53,62 +52,50 @@ public class ConfigClientAutoConfigurationTests {
@Test
public void invalidApplicationNameOverrideWithFailFastEnabledFailsToStartup() {
SpringApplication application = new SpringApplicationBuilder(
ConfigClientAutoConfiguration.class)
.web(WebApplicationType.NONE)
.properties("spring.cloud.config.fail-fast=true",
"spring.cloud.bootstrap.enabled=true",
"spring.cloud.config.name=application-service")
.application();
SpringApplication application = new SpringApplicationBuilder(ConfigClientAutoConfiguration.class)
.web(WebApplicationType.NONE).properties("spring.cloud.config.fail-fast=true",
"spring.cloud.bootstrap.enabled=true", "spring.cloud.config.name=application-service")
.application();
assertThatThrownBy(application::run)
.isInstanceOf(InvalidApplicationNameException.class).extracting("value")
assertThatThrownBy(application::run).isInstanceOf(InvalidApplicationNameException.class).extracting("value")
.isEqualTo("application-service");
}
@Test
public void invalidApplicationNameOverrideWithFailFastDisabledStartsUpButNoConfigServerPropertiesAreLoaded() {
SpringApplication application = new SpringApplicationBuilder(
ConfigClientAutoConfiguration.class).web(WebApplicationType.NONE)
.properties("spring.cloud.config.name=application-service",
"spring.cloud.bootstrap.enabled=true")
.application();
SpringApplication application = new SpringApplicationBuilder(ConfigClientAutoConfiguration.class)
.web(WebApplicationType.NONE)
.properties("spring.cloud.config.name=application-service", "spring.cloud.bootstrap.enabled=true")
.application();
ConfigurableApplicationContext context = application.run();
assertThat(context.getEnvironment().getPropertySources().get("configService"))
.isNull();
assertThat(context.getEnvironment().getPropertySources().get("configService")).isNull();
context.close();
}
@Test
public void invalidApplicationNameWithFailFastEnabledFailsToStartup() {
SpringApplication application = new SpringApplicationBuilder(
ConfigClientAutoConfiguration.class)
.web(WebApplicationType.NONE)
.properties("spring.cloud.config.fail-fast=true",
"spring.cloud.bootstrap.enabled=true",
"spring.application.name=application-service")
.application();
SpringApplication application = new SpringApplicationBuilder(ConfigClientAutoConfiguration.class)
.web(WebApplicationType.NONE).properties("spring.cloud.config.fail-fast=true",
"spring.cloud.bootstrap.enabled=true", "spring.application.name=application-service")
.application();
assertThatThrownBy(application::run)
.isInstanceOf(InvalidApplicationNameException.class).extracting("value")
assertThatThrownBy(application::run).isInstanceOf(InvalidApplicationNameException.class).extracting("value")
.isEqualTo("application-service");
}
@Test
public void invalidApplicationNameWithFailFastDisabledStartsUpButNoConfigServerPropertiesAreLoaded() {
SpringApplication application = new SpringApplicationBuilder(
ConfigClientAutoConfiguration.class).web(WebApplicationType.NONE)
.properties("spring.application.name=application-service",
"spring.cloud.bootstrap.enabled=true")
.application();
SpringApplication application = new SpringApplicationBuilder(ConfigClientAutoConfiguration.class)
.web(WebApplicationType.NONE)
.properties("spring.application.name=application-service", "spring.cloud.bootstrap.enabled=true")
.application();
ConfigurableApplicationContext context = application.run();
assertThat(context.getEnvironment().getPropertySources().get("configService"))
.isNull();
assertThat(context.getEnvironment().getPropertySources().get("configService")).isNull();
context.close();
}