Extracted methods to eliminate duplicated logic and improve clarity

Author: ritvik

src/main/java/org/springframework/cli/merger/ProjectMerger.java

@@ -174,19 +174,15 @@ public void merge() {
 	private void mergeSpringBootApplicationClassAnnotations() throws IOException {
 		logger.debug("Looking for @SpringBootApplication in directory " + this.toMergeProjectPath.toFile());
 		Optional<File> springBootApplicationFile = RootPackageFinder
-				.findSpringBootApplicationFile(this.toMergeProjectPath.toFile());
+			.findSpringBootApplicationFile(this.toMergeProjectPath.toFile());
 
 		if (springBootApplicationFile.isPresent()) {
+			Consumer<Throwable> onError = e -> logger.error("error in javaParser execution", e);
+			List<SourceFile> mergeCompilationUnits = parseJavaFile(springBootApplicationFile.get().toPath(), onError);
+
 			CollectAnnotationAndImportInformationRecipe annotationImportRecipe = new CollectAnnotationAndImportInformationRecipe();
-			Consumer<Throwable> onError = e -> {
-				logger.error("error in javaParser execution", e);
-			};
 			InMemoryExecutionContext executionContext = new InMemoryExecutionContext(onError);
-			List<Path> paths = new ArrayList<>();
-			paths.add(springBootApplicationFile.get().toPath());
-			JavaParser javaParser = new Java17Parser.Builder().build();
-			List<SourceFile> compilationUnits = javaParser.parse(paths, null, executionContext).toList();
-			annotationImportRecipe.run(new InMemoryLargeSourceSet(compilationUnits), executionContext);
+			runRecipeOnFile(annotationImportRecipe, mergeCompilationUnits, executionContext);
 
 			List<Annotation> declaredAnnotations = annotationImportRecipe.getDeclaredAnnotations();
 			List<String> declaredImports = annotationImportRecipe.getDeclaredImports();
@@ -197,7 +193,6 @@ private void mergeSpringBootApplicationClassAnnotations() throws IOException {
 					continue;
 				}
 				for (String declaredImport : declaredImports) {
-					// get the import statement that matches the annotation
 					if (declaredImport.contains(declaredAnnotation.getSimpleName())) {
 						annotationImportMap.put(declaredAnnotation.toString(), declaredImport);
 					}
@@ -206,22 +201,20 @@ private void mergeSpringBootApplicationClassAnnotations() throws IOException {
 
 			logger.debug("Looking for @SpringBootApplication in directory " + this.currentProjectPath.toFile());
 			Optional<File> currentSpringBootApplicationFile = RootPackageFinder
-					.findSpringBootApplicationFile(this.currentProjectPath.toFile());
+				.findSpringBootApplicationFile(this.currentProjectPath.toFile());
 			if (currentSpringBootApplicationFile.isPresent()) {
+				List<SourceFile> currentCompilationUnits = parseJavaFile(
+						currentSpringBootApplicationFile.get().toPath(), onError);
 				executionContext = new InMemoryExecutionContext(onError);
-				paths = new ArrayList<>();
-				paths.add(currentSpringBootApplicationFile.get().toPath());
-				javaParser = new Java17Parser.Builder().build();
-				compilationUnits = javaParser.parse(paths, null, executionContext).toList();
+
 				for (Entry<String, String> annotationImportEntry : annotationImportMap.entrySet()) {
 					String annotation = annotationImportEntry.getKey();
 					String importStatement = annotationImportEntry.getValue();
+
 					AddImport addImport = new AddImport(importStatement, null, false);
 					AddImportRecipe addImportRecipe = new AddImportRecipe(addImport);
-					List<Result> results = addImportRecipe
-							.run(new InMemoryLargeSourceSet(compilationUnits), executionContext)
-							.getChangeset()
-							.getAllResults();
+					List<Result> results = runRecipeOnFile(addImportRecipe, currentCompilationUnits, executionContext);
+
 					updateSpringApplicationClass(currentSpringBootApplicationFile.get().toPath(), results);
 
 					AttributedStringBuilder sb = new AttributedStringBuilder();
@@ -235,6 +228,21 @@ private void mergeSpringBootApplicationClassAnnotations() throws IOException {
 		}
 	}
 
+	private List<SourceFile> parseJavaFile(Path filePath, Consumer<Throwable> onError) {
+		InMemoryExecutionContext executionContext = new InMemoryExecutionContext(onError);
+		List<Path> paths = new ArrayList<>();
+		paths.add(filePath);
+		JavaParser javaParser = new Java17Parser.Builder().build();
+		return javaParser.parse(paths, null, executionContext).toList();
+	}
+
+	private List<Result> runRecipeOnFile(Recipe recipe, List<SourceFile> compilationUnits,
+			InMemoryExecutionContext executionContext) {
+		return recipe.run(new InMemoryLargeSourceSet(compilationUnits), executionContext)
+			.getChangeset()
+			.getAllResults();
+	}
+
 	private void injectAnnotation(Path pathToFile, String annotation) {
 		try {
 			List<String> lines = Files.readAllLines(pathToFile);