From fd35b6ecbd53e1589f8acb944c2b6a7d7a3b0c8a Mon Sep 17 00:00:00 2001 From: spencergibb Date: Tue, 27 Jul 2021 23:21:51 -0400 Subject: [PATCH] formatting --- .../ConfigServicePropertySourceLocator.java | 5 +- ...plicationNameExceptionFailureAnalyzer.java | 6 +-- .../ConfigClientAutoConfigurationTests.java | 53 +++++++------------ 3 files changed, 24 insertions(+), 40 deletions(-) diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocator.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocator.java index 73aeda32..d85ae801 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocator.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocator.java @@ -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; } } diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/diagnostics/analyzer/InvalidApplicationNameExceptionFailureAnalyzer.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/diagnostics/analyzer/InvalidApplicationNameExceptionFailureAnalyzer.java index 0ca31fa8..2b87c448 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/diagnostics/analyzer/InvalidApplicationNameExceptionFailureAnalyzer.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/diagnostics/analyzer/InvalidApplicationNameExceptionFailureAnalyzer.java @@ -30,10 +30,8 @@ public class InvalidApplicationNameExceptionFailureAnalyzer extends AbstractFailureAnalyzer { @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} " diff --git a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigClientAutoConfigurationTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigClientAutoConfigurationTests.java index 9329d440..804bc790 100644 --- a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigClientAutoConfigurationTests.java +++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigClientAutoConfigurationTests.java @@ -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(); }