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-03-29 17:08:39 -04:00
parent b884f2088c
commit 2ddc7cb73b
4 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-cloud-config-sample/src/test/java/sample/ApplicationBootstrapTests.java
View File

@@ -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"));
}
}

7
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/composite/CompositeEnvironmentBeanFactoryPostProcessor.java
View File

@@ -60,11 +60,8 @@ public class CompositeEnvironmentBeanFactoryPostProcessor implements BeanFactory
propertiesClass = (Class<? extends EnvironmentRepositoryProperties>) 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

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

@@ -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);
}

12
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/CompositeClasspathTests.java
View File

@@ -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");
});
}