Adjust rewrite gradle parsing

Author: BoykoAlex

headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/gradle/GradleIJavaProjectParser.java

@@ -12,6 +12,7 @@
 
 import static org.openrewrite.Tree.randomId;
 
+import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
@@ -36,11 +37,15 @@
 import org.openrewrite.java.marker.JavaVersion;
 import org.openrewrite.marker.BuildTool;
 import org.openrewrite.marker.Marker;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
 import org.springframework.ide.vscode.commons.rewrite.java.AbstractJavaProjectParser;
 
 public class GradleIJavaProjectParser extends AbstractJavaProjectParser {
 
+	private static final Logger log = LoggerFactory.getLogger(GradleIJavaProjectParser.class);
+
 	public GradleIJavaProjectParser(IJavaProject jp, Builder<?, ?> javaParserBuilder,
 			Function<Path, Input> parserInputProvider) {
 		super(jp, javaParserBuilder, parserInputProvider);
@@ -68,17 +73,22 @@ protected List<Marker> getJavaProvenance(SourceFile buildFileAst, Path projectDi
 
 	@Override
 	public List<G.CompilationUnit> parseBuildFiles(Path projectDir, ExecutionContext ctx) {
-		OpenRewriteModel openRewriteGradleModel = OpenRewriteModelBuilder.forProjectDirectory(projectDir.toFile(), Paths.get(jp.getProjectBuild().getBuildFile()).toFile());
-		GradleProject gradleProject = org.openrewrite.gradle.toolingapi.GradleProject.toMarker(openRewriteGradleModel.gradleProject());
-		GradleParser gradleParser = GradleParser.builder().groovyParser(GroovyParser.builder()).build();
-		
-		Path buildFilePath = Paths.get(jp.getProjectBuild().getBuildFile());
-		
-		List<G.CompilationUnit> gradleFiles = gradleParser.parseInputs(() -> 
-			getInputs(Stream.of(buildFilePath)).iterator(), null, ctx).map(G.CompilationUnit.class::cast).collect(Collectors.toList());
-		return ListUtils.map(
-			gradleFiles, (i, gb) -> gb.withMarkers(gb.getMarkers().addIfAbsent(gradleProject))
-		);
+		try {
+			OpenRewriteModel openRewriteGradleModel = OpenRewriteModelBuilder.forProjectDirectory(projectDir.toFile(), Paths.get(jp.getProjectBuild().getBuildFile()).toFile());
+			GradleProject gradleProject =openRewriteGradleModel.getGradleProject();
+			GradleParser gradleParser = GradleParser.builder().groovyParser(GroovyParser.builder()).build();
+			
+			Path buildFilePath = Paths.get(jp.getProjectBuild().getBuildFile());
+			
+			List<G.CompilationUnit> gradleFiles = gradleParser.parseInputs(() -> 
+				getInputs(Stream.of(buildFilePath)).iterator(), null, ctx).map(G.CompilationUnit.class::cast).collect(Collectors.toList());
+			return ListUtils.map(
+				gradleFiles, (i, gb) -> gb.withMarkers(gb.getMarkers().addIfAbsent(gradleProject))
+			);
+		} catch (IOException e) {
+			log.error("", e);
+			return List.of();
+		}
 	}
 
 }

headless-services/commons/pom.xml

@@ -138,11 +138,6 @@
                 <artifactId>gradle-tooling-api</artifactId>
                 <version>8.11</version>
             </dependency>
-	        <dependency>
-	            <groupId>org.openrewrite.gradle.tooling</groupId>
-	            <artifactId>model</artifactId>
-	            <version>2.7.0</version>
-	        </dependency>
 			<dependency>
 				<groupId>org.eclipse.jgit</groupId>
 				<artifactId>org.eclipse.jgit</artifactId>

headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexerJava.java

@@ -1066,7 +1066,7 @@ private static String getComplianceJavaVersion(String javaVersion) {
 	}
 
 	private static String extractComplianceVersion(String versionString) {
-        if (versionString.contains(".")) {
+        if (versionString != null && versionString.contains(".")) {
             String[] parts = versionString.split("\\.");
             if ("1".equals(parts[0])) {
     			if (parts.length > 1) {