From 2ddc7cb73b5dc4b4f5cefeb6a17149fa5e04223a Mon Sep 17 00:00:00 2001 From: spencergibb Date: Mon, 29 Mar 2021 17:08:39 -0400 Subject: [PATCH] Formatting --- .../test/java/sample/ApplicationBootstrapTests.java | 6 ++---- ...CompositeEnvironmentBeanFactoryPostProcessor.java | 7 ++----- .../config/EnvironmentRepositoryConfiguration.java | 6 ++---- .../cloud/config/server/CompositeClasspathTests.java | 12 ++++-------- 4 files changed, 10 insertions(+), 21 deletions(-) diff --git a/spring-cloud-config-sample/src/test/java/sample/ApplicationBootstrapTests.java b/spring-cloud-config-sample/src/test/java/sample/ApplicationBootstrapTests.java index 885d1150..0f18678c 100644 --- a/spring-cloud-config-sample/src/test/java/sample/ApplicationBootstrapTests.java +++ b/spring-cloud-config-sample/src/test/java/sample/ApplicationBootstrapTests.java @@ -107,10 +107,8 @@ public class ApplicationBootstrapTests { @Test public void propertiesBeansRegisterByCompositeEnvBeanFactoryPostProcessor() { - String[] beanNames = server - .getBeanNamesForType(MultipleJGitEnvironmentProperties.class); - assertThat(beanNames).isNotNull() - .anyMatch(s -> s.matches("git-env-repo-properties\\d")); + String[] beanNames = server.getBeanNamesForType(MultipleJGitEnvironmentProperties.class); + assertThat(beanNames).isNotNull().anyMatch(s -> s.matches("git-env-repo-properties\\d")); } } diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/composite/CompositeEnvironmentBeanFactoryPostProcessor.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/composite/CompositeEnvironmentBeanFactoryPostProcessor.java index 514d4b85..61fddbf7 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/composite/CompositeEnvironmentBeanFactoryPostProcessor.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/composite/CompositeEnvironmentBeanFactoryPostProcessor.java @@ -60,11 +60,8 @@ public class CompositeEnvironmentBeanFactoryPostProcessor implements BeanFactory propertiesClass = (Class) factoryTypes[1]; EnvironmentRepositoryProperties properties = bindProperties(i, propertiesClass, this.environment); AbstractBeanDefinition propertiesDefinition = BeanDefinitionBuilder - .genericBeanDefinition(EnvironmentRepositoryProperties.class, - () -> properties) - .getBeanDefinition(); - String propertiesBeanName = String.format("%s-env-repo-properties%d", type, - i); + .genericBeanDefinition(EnvironmentRepositoryProperties.class, () -> properties).getBeanDefinition(); + String propertiesBeanName = String.format("%s-env-repo-properties%d", type, i); registry.registerBeanDefinition(propertiesBeanName, propertiesDefinition); AbstractBeanDefinition beanDefinition = BeanDefinitionBuilder 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 50f75bea..e73b3d60 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 @@ -122,13 +122,11 @@ public class EnvironmentRepositoryConfiguration { @Configuration(proxyBeanMethods = false) @ConditionalOnClass(AbstractHealthIndicator.class) - @ConditionalOnProperty(value = "spring.cloud.config.server.health.enabled", - matchIfMissing = true) + @ConditionalOnProperty(value = "spring.cloud.config.server.health.enabled", matchIfMissing = true) protected static class ConfigServerActuatorConfiguration { @Bean - public ConfigServerHealthIndicator configServerHealthIndicator( - EnvironmentRepository repository) { + public ConfigServerHealthIndicator configServerHealthIndicator(EnvironmentRepository repository) { return new ConfigServerHealthIndicator(repository); } diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/CompositeClasspathTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/CompositeClasspathTests.java index dec75a79..6571525b 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/CompositeClasspathTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/CompositeClasspathTests.java @@ -49,23 +49,19 @@ public class CompositeClasspathTests { } @RunWith(ModifiedClassPathRunner.class) - @ClassPathExclusions({ "spring-jdbc-*.jar", "spring-data-redis-*.jar", - "spring-boot-actuator-*.jar" }) + @ClassPathExclusions({ "spring-jdbc-*.jar", "spring-data-redis-*.jar", "spring-boot-actuator-*.jar" }) public static class NoActuatorTests { @Test public void contextLoads() { - new WebApplicationContextRunner() - .withUserConfiguration(ConfigServerApplication.class) - .withPropertyValues("spring.profiles.active:test,composite", - "spring.jmx.enabled=false", + new WebApplicationContextRunner().withUserConfiguration(ConfigServerApplication.class) + .withPropertyValues("spring.profiles.active:test,composite", "spring.jmx.enabled=false", "spring.config.name:compositeconfigserver", "spring.cloud.config.server.composite[0].uri:file:./target/repos/config-repo", "spring.cloud.config.server.composite[0].type:git") .run(context -> { CompositeUtils.getCompositeTypeList(context.getEnvironment()); - assertThat(context) - .doesNotHaveBean("configServerHealthIndicator"); + assertThat(context).doesNotHaveBean("configServerHealthIndicator"); }); }