Format Java

spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/OpenRewriteProjectParser.java

@@ -50,131 +50,148 @@
  */
 public class OpenRewriteProjectParser {
 
-    private final SpringRewriteProperties properties;
-    private final ExecutionContext executionContext;
-
-    public OpenRewriteProjectParser(SpringRewriteProperties properties, ExecutionContext executionContext) {
-        this.properties = properties;
-        this.executionContext = executionContext;
-    }
-
-    public RewriteProjectParsingResult parse(Path givenBaseDir) {
-
-        AtomicReference<List<SourceFile>> mavenSessionRef = new AtomicReference<>();
-        new MavenExecutor(executionEvent -> {
-            MavenSession mavenSession = executionEvent.getSession();
-            Log logger = new Slf4jToMavenLoggerAdapter(LoggerFactory.getLogger("OpenRewriteProjectParser"));
-            boolean pomCacheEnabled = properties.isPomCacheEnabled();
-            @Nullable String pomCacheDirectory = properties.getPomCacheDirectory();
-            Class<RuntimeInformation> aClass = RuntimeInformation.class;
-            RuntimeInformation runtimeInformation = lookup(mavenSession.getContainer(), aClass);
-            boolean skipMavenParsing = properties.isSkipMavenParsing();
-            Collection<String> exclusions = properties.getIgnoredPathPatterns();
-            Collection<String> plainTextMasks = properties.getPlainTextMasks();
-            int sizeThresholdMb = properties.getSizeThresholdMb();
-            SettingsDecrypter settingsDecrypter = lookup(mavenSession.getContainer(), SettingsDecrypter.class);
-            boolean runPerSubmodule = properties.isRunPerSubmodule();
-            boolean parseAdditionalResources = properties.isParseAdditionalResources();
-
-            MavenMojoProjectParser mojoProjectParser = new MavenMojoProjectParser(logger, givenBaseDir, pomCacheEnabled, pomCacheDirectory, runtimeInformation, skipMavenParsing, exclusions, plainTextMasks, sizeThresholdMb, mavenSession, settingsDecrypter, runPerSubmodule, parseAdditionalResources);
-            FakedRewriteRunMojo fakedRewriteRunMojo = FakedRewriteRunMojo.from(mavenSession);
-            Environment env = Environment.builder().build();
-            try {
-                // LargeSoruceSet hides access to source files
-//                LargeSourceSet largeSourceSet = fakedRewriteRunMojo.loadSourceSet(givenBaseDir, env, executionContext);
-                List<SourceFile> sourceFiles = fakedRewriteRunMojo.loadSources(givenBaseDir, env, executionContext);
-                mavenSessionRef.set(sourceFiles);
-            } catch (DependencyResolutionRequiredException e) {
-                throw new RuntimeException(e);
-            } catch (MojoExecutionException e) {
-                throw new RuntimeException(e);
-            }
-        }).execute(List.of("clean", "package", "--fail-at-end"), givenBaseDir);
-
-        RewriteProjectParsingResult parsingResult = new RewriteProjectParsingResult(mavenSessionRef.get(), executionContext);
-
-        return parsingResult;
-    }
-
-    private  static <T> T lookup(PlexusContainer plexusContainer, Class<T> aClass) {
-        try {
-            return plexusContainer.lookup(aClass);
-        } catch (ComponentLookupException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private static class FakedRewriteRunMojo extends AbstractRewriteDryRunMojo {
-        private final MavenSession mavenSession1;
-
-        public FakedRewriteRunMojo(MavenSession mavenSession) {
-            mavenSession1 = mavenSession;
-        }
-
-        public static FakedRewriteRunMojo from(MavenSession mavenSession) {
-            FakedRewriteRunMojo fakedRewriteRunMojo = new FakedRewriteRunMojo(mavenSession);
-            // project
-            setField(fakedRewriteRunMojo, "project", mavenSession.getCurrentProject());
-            // runtime
-            PlexusContainer plexusContainer = mavenSession.getContainer();
-            RuntimeInformation runtimeInformation = lookup(plexusContainer, RuntimeInformation.class);
-            setField(fakedRewriteRunMojo, "runtime", runtimeInformation);
-            setField(fakedRewriteRunMojo, "mavenSession", mavenSession);
-            setField(fakedRewriteRunMojo, "settingsDecrypter", lookup(plexusContainer, SettingsDecrypter.class));
-            return fakedRewriteRunMojo;
-        }
-
-        private static void setField(FakedRewriteRunMojo fakedRewriteRunMojo, String fieldName, Object value) {
-            Field project = ReflectionUtils.findField(FakedRewriteRunMojo.class, fieldName);
-            ReflectionUtils.makeAccessible(project);
-            ReflectionUtils.setField(project, fakedRewriteRunMojo, value);
-        }
-
-        @Override
-        public ResultsContainer listResults(ExecutionContext ctx) {
-            try {
-                super.project = mavenSession.getCurrentProject();
-                return super.listResults(ctx);
-            } catch (MojoExecutionException e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        public List<SourceFile> loadSources(Path repositoryRoot, Environment env, ExecutionContext ctx) throws DependencyResolutionRequiredException, MojoExecutionException {
-            List<NamedStyles> styles = loadStyles(project, env);
-
-            //Parse and collect source files from each project in the maven session.
-            MavenMojoProjectParser projectParser = new MavenMojoProjectParser(getLog(), repositoryRoot, pomCacheEnabled, pomCacheDirectory, runtime, skipMavenParsing, getExclusions(), getPlainTextMasks(), sizeThresholdMb, mavenSession, settingsDecrypter, runPerSubmodule, true);
-
-            Stream<SourceFile> sourceFiles = projectParser.listSourceFiles(project, styles, ctx);
-            Method m = ReflectionUtils.findMethod(AbstractRewriteMojo.class, "sourcesWithAutoDetectedStyles", Stream.class);
-            ReflectionUtils.makeAccessible(m);
-            List<SourceFile> sourceFileList = (List<SourceFile>) ReflectionUtils.invokeMethod(m, this, sourceFiles);
-            return sourceFileList;
-        }
-    }
-
-    /**
-     * Container for gathered Maven runtime information required for parsing.
-     */
-    private record MavenRuntimeInformation(RuntimeInformation runtimeInformation) {
-
-        public static MavenRuntimeInformation gathering(MavenSession mavenSession) {
-
-            RuntimeInformation runtimeInformation = lookup(mavenSession.getContainer(), RuntimeInformation.class);
-
-
-            MavenRuntimeInformation mavenRuntimeInformation = new MavenRuntimeInformation(runtimeInformation);
-            return mavenRuntimeInformation;
-        }
-
-        private  static <T> T lookup(PlexusContainer plexusContainer, Class<T> aClass) {
-            try {
-                return plexusContainer.lookup(aClass);
-            } catch (ComponentLookupException e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-    }
+	private final SpringRewriteProperties properties;
+
+	private final ExecutionContext executionContext;
+
+	public OpenRewriteProjectParser(SpringRewriteProperties properties, ExecutionContext executionContext) {
+		this.properties = properties;
+		this.executionContext = executionContext;
+	}
+
+	public RewriteProjectParsingResult parse(Path givenBaseDir) {
+
+		AtomicReference<List<SourceFile>> mavenSessionRef = new AtomicReference<>();
+		new MavenExecutor(executionEvent -> {
+			MavenSession mavenSession = executionEvent.getSession();
+			Log logger = new Slf4jToMavenLoggerAdapter(LoggerFactory.getLogger("OpenRewriteProjectParser"));
+			boolean pomCacheEnabled = properties.isPomCacheEnabled();
+			@Nullable
+			String pomCacheDirectory = properties.getPomCacheDirectory();
+			Class<RuntimeInformation> aClass = RuntimeInformation.class;
+			RuntimeInformation runtimeInformation = lookup(mavenSession.getContainer(), aClass);
+			boolean skipMavenParsing = properties.isSkipMavenParsing();
+			Collection<String> exclusions = properties.getIgnoredPathPatterns();
+			Collection<String> plainTextMasks = properties.getPlainTextMasks();
+			int sizeThresholdMb = properties.getSizeThresholdMb();
+			SettingsDecrypter settingsDecrypter = lookup(mavenSession.getContainer(), SettingsDecrypter.class);
+			boolean runPerSubmodule = properties.isRunPerSubmodule();
+			boolean parseAdditionalResources = properties.isParseAdditionalResources();
+
+			MavenMojoProjectParser mojoProjectParser = new MavenMojoProjectParser(logger, givenBaseDir, pomCacheEnabled,
+					pomCacheDirectory, runtimeInformation, skipMavenParsing, exclusions, plainTextMasks,
+					sizeThresholdMb, mavenSession, settingsDecrypter, runPerSubmodule, parseAdditionalResources);
+			FakedRewriteRunMojo fakedRewriteRunMojo = FakedRewriteRunMojo.from(mavenSession);
+			Environment env = Environment.builder().build();
+			try {
+				// LargeSoruceSet hides access to source files
+				// LargeSourceSet largeSourceSet =
+				// fakedRewriteRunMojo.loadSourceSet(givenBaseDir, env, executionContext);
+				List<SourceFile> sourceFiles = fakedRewriteRunMojo.loadSources(givenBaseDir, env, executionContext);
+				mavenSessionRef.set(sourceFiles);
+			}
+			catch (DependencyResolutionRequiredException e) {
+				throw new RuntimeException(e);
+			}
+			catch (MojoExecutionException e) {
+				throw new RuntimeException(e);
+			}
+		}).execute(List.of("clean", "package", "--fail-at-end"), givenBaseDir);
+
+		RewriteProjectParsingResult parsingResult = new RewriteProjectParsingResult(mavenSessionRef.get(),
+				executionContext);
+
+		return parsingResult;
+	}
+
+	private static <T> T lookup(PlexusContainer plexusContainer, Class<T> aClass) {
+		try {
+			return plexusContainer.lookup(aClass);
+		}
+		catch (ComponentLookupException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	private static class FakedRewriteRunMojo extends AbstractRewriteDryRunMojo {
+
+		private final MavenSession mavenSession1;
+
+		public FakedRewriteRunMojo(MavenSession mavenSession) {
+			mavenSession1 = mavenSession;
+		}
+
+		public static FakedRewriteRunMojo from(MavenSession mavenSession) {
+			FakedRewriteRunMojo fakedRewriteRunMojo = new FakedRewriteRunMojo(mavenSession);
+			// project
+			setField(fakedRewriteRunMojo, "project", mavenSession.getCurrentProject());
+			// runtime
+			PlexusContainer plexusContainer = mavenSession.getContainer();
+			RuntimeInformation runtimeInformation = lookup(plexusContainer, RuntimeInformation.class);
+			setField(fakedRewriteRunMojo, "runtime", runtimeInformation);
+			setField(fakedRewriteRunMojo, "mavenSession", mavenSession);
+			setField(fakedRewriteRunMojo, "settingsDecrypter", lookup(plexusContainer, SettingsDecrypter.class));
+			return fakedRewriteRunMojo;
+		}
+
+		private static void setField(FakedRewriteRunMojo fakedRewriteRunMojo, String fieldName, Object value) {
+			Field project = ReflectionUtils.findField(FakedRewriteRunMojo.class, fieldName);
+			ReflectionUtils.makeAccessible(project);
+			ReflectionUtils.setField(project, fakedRewriteRunMojo, value);
+		}
+
+		@Override
+		public ResultsContainer listResults(ExecutionContext ctx) {
+			try {
+				super.project = mavenSession.getCurrentProject();
+				return super.listResults(ctx);
+			}
+			catch (MojoExecutionException e) {
+				throw new RuntimeException(e);
+			}
+		}
+
+		public List<SourceFile> loadSources(Path repositoryRoot, Environment env, ExecutionContext ctx)
+				throws DependencyResolutionRequiredException, MojoExecutionException {
+			List<NamedStyles> styles = loadStyles(project, env);
+
+			// Parse and collect source files from each project in the maven session.
+			MavenMojoProjectParser projectParser = new MavenMojoProjectParser(getLog(), repositoryRoot, pomCacheEnabled,
+					pomCacheDirectory, runtime, skipMavenParsing, getExclusions(), getPlainTextMasks(), sizeThresholdMb,
+					mavenSession, settingsDecrypter, runPerSubmodule, true);
+
+			Stream<SourceFile> sourceFiles = projectParser.listSourceFiles(project, styles, ctx);
+			Method m = ReflectionUtils.findMethod(AbstractRewriteMojo.class, "sourcesWithAutoDetectedStyles",
+					Stream.class);
+			ReflectionUtils.makeAccessible(m);
+			List<SourceFile> sourceFileList = (List<SourceFile>) ReflectionUtils.invokeMethod(m, this, sourceFiles);
+			return sourceFileList;
+		}
+
+	}
+
+	/**
+	 * Container for gathered Maven runtime information required for parsing.
+	 */
+	private record MavenRuntimeInformation(RuntimeInformation runtimeInformation) {
+
+		public static MavenRuntimeInformation gathering(MavenSession mavenSession) {
+
+			RuntimeInformation runtimeInformation = lookup(mavenSession.getContainer(), RuntimeInformation.class);
+
+			MavenRuntimeInformation mavenRuntimeInformation = new MavenRuntimeInformation(runtimeInformation);
+			return mavenRuntimeInformation;
+		}
+
+		private static <T> T lookup(PlexusContainer plexusContainer, Class<T> aClass) {
+			try {
+				return plexusContainer.lookup(aClass);
+			}
+			catch (ComponentLookupException e) {
+				throw new RuntimeException(e);
+			}
+		}
+
+	}
+
 }

spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/RewriteProjectParser.java

@@ -15,10 +15,12 @@
  */
 package org.springframework.rewrite;
 
+import org.apache.maven.execution.ExecutionEvent;
 import org.jetbrains.annotations.NotNull;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.SourceFile;
 import org.openrewrite.marker.Marker;
+import org.openrewrite.maven.utilities.MavenArtifactDownloader;
 import org.openrewrite.style.NamedStyles;
 import org.openrewrite.tree.ParsingEventListener;
 import org.openrewrite.tree.ParsingExecutionContextView;
@@ -27,7 +29,9 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
+import org.springframework.rewrite.maveninvokerplayground.MavenExecutor;
 import org.springframework.rewrite.parser.*;
 import org.springframework.rewrite.parser.events.StartedParsingProjectEvent;
 import org.springframework.rewrite.parser.events.SuccessfullyParsedProjectEvent;
@@ -38,10 +42,12 @@
 import org.springframework.rewrite.scopes.ScanScope;
 import org.springframework.util.StringUtils;
 
+import java.io.File;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * Project parser parsing resources under a given {@link Path} to OpenRewrite Lossless
@@ -94,6 +100,8 @@ public class RewriteProjectParser {
 
 	private final MavenProjectAnalyzer mavenProjectAnalyzer;
 
+	private MavenArtifactDownloader artifactDownloader;
+
 	public RewriteProjectParser(ProvenanceMarkerFactory provenanceMarkerFactory, MavenBuildFileParser buildFileParser,
 			SourceFileParser sourceFileParser, StyleDetector styleDetector,
 			SpringRewriteProperties springRewriteProperties, ParsingEventListener parsingEventListener,
@@ -137,9 +145,25 @@ public RewriteProjectParsingResult parse(Path givenBaseDir, List<Resource> resou
 		// TODO: See ConfigurableRewriteMojo#getPlainTextMasks()
 		// TODO: where to retrieve styles from? --> see
 		// AbstractRewriteMojo#getActiveStyles() & AbstractRewriteMojo#loadStyles()
+
+		AtomicReference<List<SourceFile>> sourceFilesRef = new AtomicReference<>();
+		new MavenExecutor(onSuccess -> {
+			List<SourceFile> sourceFiles = runInMavenSession(onSuccess, baseDir, resources);
+			sourceFilesRef.set(sourceFiles);
+		}).execute(List.of("clean", "package", "--fail-at-end"), baseDir);
+
+		return new RewriteProjectParsingResult(sourceFilesRef.get(), executionContext);
+	}
+
+	private List<SourceFile> runInMavenSession(ExecutionEvent onSuccess, Path baseDir, List<Resource> resources) {
 		List<NamedStyles> styles = List.of();
+		onSuccess.getSession()
+			.getProjectDependencyGraph()
+			.getSortedProjects()
+			.stream()
+			.map(p -> this.mavenProjectToMavenProject(p, resources))
+			.toList();
 
-		// Get the ordered otherSourceFiles of projects
 		List<MavenProject> sortedProjects = mavenProjectAnalyzer.getBuildProjects(baseDir, resources);
 		ParserContext parserContext = new ParserContext(baseDir, resources, sortedProjects);
 
@@ -169,8 +193,16 @@ public RewriteProjectParsingResult parse(Path givenBaseDir, List<Resource> resou
 		List<SourceFile> sourceFiles = styleDetector.sourcesWithAutoDetectedStyles(resultingList.stream());
 
 		eventPublisher.publishEvent(new SuccessfullyParsedProjectEvent(sourceFiles));
+		return sourceFiles;
+	}
 
-		return new RewriteProjectParsingResult(sourceFiles, executionContext);
+	private MavenProject mavenProjectToMavenProject(org.apache.maven.project.MavenProject mavenProject,
+			MavenArtifactDownloader artifactDownloader, List<Resource> resources) {
+		Path baseDir = mavenProject.getBasedir().toPath();
+		File file = mavenProject.getExecutionProject().getFile();
+		Resource rootPom = new FileSystemResource(file);
+		new MavenProject(baseDir, rootPom, artifactDownloader, resources);
+		return null;
 	}
 
 	@NotNull

spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/RewriteLauncherConfiguration.java

@@ -41,7 +41,8 @@ RewriteRecipeLauncher rewriteRecipeLauncher(RewriteProjectParser parser, Rewrite
 	}
 
 	@Bean
-	OpenRewriteProjectParser openRewriteProjectParser(SpringRewriteProperties properties, ExecutionContext executionContext) {
+	OpenRewriteProjectParser openRewriteProjectParser(SpringRewriteProperties properties,
+			ExecutionContext executionContext) {
 		return new OpenRewriteProjectParser(properties, executionContext);
 	}
 

spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/ParserParityTestHelper.java

@@ -317,7 +317,8 @@ static void verifyEqualSourceFileMarkers(SourceFile curExpectedSourceFile, Sourc
 
 		static void compareMavenResolutionResultMarker(SoftAssertions softAssertions, MavenResolutionResult expected,
 				MavenResolutionResult actual) {
-			 softAssertions.assertThat(actual).usingRecursiveComparison()
+			softAssertions.assertThat(actual)
+				.usingRecursiveComparison()
 				.withEqualsForFieldsMatchingRegexes(customRepositoryEquals("mavenSettings.localRepository"),
 						"mavenSettings.localRepository", ".*\\.repository", "mavenSettings.mavenLocal.uri")
 				.ignoringFields("modules", // checked further down