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

Reformat.

Browse Source
This commit is contained in:
Olga MaciaszekSharma
2024-05-07 15:34:41 +02:00
parent 7a35ad7eb9
commit ac462349f8
2 changed files with 40 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/aot/CompositeEnvironmentBeanFactoryInitializationAotProcessor.java
View File

@@ -55,8 +55,8 @@ import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
/**
* A {@link BeanFactoryInitializationAotProcessor} implementation that generates code
* for registering composite environment repository beans.
* A {@link BeanFactoryInitializationAotProcessor} implementation that generates code for
* registering composite environment repository beans.
*
* @author Olga Maciaszek-Sharma
* @since 4.1.2

81
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/aot/CompositeEnvironmentBeanFactoryInitializationAotProcessorTests.java
View File

@@ -50,53 +50,48 @@ class CompositeEnvironmentBeanFactoryInitializationAotProcessorTests {
@Test
void shouldCreateCompositeEnvironmentBeansRegistrationContribution() {
Set<Class<?>> hintClasses = Set.of(MultipleJGitEnvironmentRepository.class,
SvnKitEnvironmentRepository.class, SvnKitEnvironmentProperties.class,
MultipleJGitEnvironmentRepositoryFactory.class, SvnEnvironmentRepositoryFactory.class,
MultipleJGitEnvironmentProperties.class);
Set<Class<?>> hintClasses = Set.of(MultipleJGitEnvironmentRepository.class, SvnKitEnvironmentRepository.class,
SvnKitEnvironmentProperties.class, MultipleJGitEnvironmentRepositoryFactory.class,
SvnEnvironmentRepositoryFactory.class, MultipleJGitEnvironmentProperties.class);
new WebApplicationContextRunner(AnnotationConfigServletWebApplicationContext::new)
.withUserConfiguration(TestConfigServerApplication.class)
.withPropertyValues("spring.cloud.refresh.enabled=false",
"spring.cloud.config.server.composite[0].uri:file:./target/repos/config-repo",
"spring.cloud.config.server.composite[0].type:git",
"spring.cloud.config.server.composite[1].uri:file:///./target/repos/svn-config-repo",
"spring.cloud.config.server.composite[1].type:svn", "spring.profiles.active:test,composite")
.prepare(context -> {
TestGenerationContext generationContext = new TestGenerationContext(TestTarget.class);
ClassName className = new ApplicationContextAotGenerator().processAheadOfTime(
(GenericApplicationContext) context.getSourceApplicationContext(), generationContext);
generationContext.writeGeneratedContent();
Optional<String> source = getGeneratedSource(generationContext, className.simpleName());
assertThat(source).isNotEmpty();
assertThat(source.get()).contains("beanFactory.registerBeanDefinition(\"git-env-repo-properties0\", propertiesDefinition0);",
"beanFactory.registerBeanDefinition(\"git-env-repo0\", repoBeanDefinition0);",
"beanFactory.registerBeanDefinition(\"svn-env-repo-properties1\", propertiesDefinition1);",
"beanFactory.registerBeanDefinition(\"svn-env-repo1\", repoBeanDefinition1);");
ReflectionHints hints = generationContext.getRuntimeHints().reflection();
hintClasses.forEach(clazz -> assertThat(hints.getTypeHint(clazz)).isNotNull());
});
.withUserConfiguration(TestConfigServerApplication.class)
.withPropertyValues("spring.cloud.refresh.enabled=false",
"spring.cloud.config.server.composite[0].uri:file:./target/repos/config-repo",
"spring.cloud.config.server.composite[0].type:git",
"spring.cloud.config.server.composite[1].uri:file:///./target/repos/svn-config-repo",
"spring.cloud.config.server.composite[1].type:svn", "spring.profiles.active:test,composite")
.prepare(context -> {
TestGenerationContext generationContext = new TestGenerationContext(TestTarget.class);
ClassName className = new ApplicationContextAotGenerator().processAheadOfTime(
(GenericApplicationContext) context.getSourceApplicationContext(), generationContext);
generationContext.writeGeneratedContent();
Optional<String> source = getGeneratedSource(generationContext, className.simpleName());
assertThat(source).isNotEmpty();
assertThat(source.get()).contains(
"beanFactory.registerBeanDefinition(\"git-env-repo-properties0\", propertiesDefinition0);",
"beanFactory.registerBeanDefinition(\"git-env-repo0\", repoBeanDefinition0);",
"beanFactory.registerBeanDefinition(\"svn-env-repo-properties1\", propertiesDefinition1);",
"beanFactory.registerBeanDefinition(\"svn-env-repo1\", repoBeanDefinition1);");
ReflectionHints hints = generationContext.getRuntimeHints().reflection();
hintClasses.forEach(clazz -> assertThat(hints.getTypeHint(clazz)).isNotNull());
});
}
private static Optional<String> getGeneratedSource(TestGenerationContext generationContext, String simpleClassName) {
return generationContext.
getGeneratedFiles()
.getGeneratedFiles(GeneratedFiles.Kind.SOURCE)
.values()
.stream()
.map(inputStreamSource -> {
try {
return new String(inputStreamSource.getInputStream()
.readAllBytes(), Charset.defaultCharset());
}
catch (IOException e) {
throw new RuntimeException(e);
}
})
.filter(source ->
source.contains(simpleClassName))
.findAny();
private static Optional<String> getGeneratedSource(TestGenerationContext generationContext,
String simpleClassName) {
return generationContext.getGeneratedFiles().getGeneratedFiles(GeneratedFiles.Kind.SOURCE).values().stream()
.map(inputStreamSource -> {
try {
return new String(inputStreamSource.getInputStream().readAllBytes(), Charset.defaultCharset());
}
catch (IOException e) {
throw new RuntimeException(e);
}
}).filter(source -> source.contains(simpleClassName)).findAny();
}
static class TestTarget { }
static class TestTarget {
}
}