Reformat.

spring-cloud · May 7, 2024 · ac46234 · ac46234
1 parent 7a35ad7
commit ac46234
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 45 deletions.
diff --git a/...rk/cloud/config/server/aot/CompositeEnvironmentBeanFactoryInitializationAotProcessor.java b/...rk/cloud/config/server/aot/CompositeEnvironmentBeanFactoryInitializationAotProcessor.java
@@ -55,8 +55,8 @@
 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

diff --git a/...oud/config/server/aot/CompositeEnvironmentBeanFactoryInitializationAotProcessorTests.java b/...oud/config/server/aot/CompositeEnvironmentBeanFactoryInitializationAotProcessorTests.java
@@ -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 {
+
+	}
 
 }