Boot RC2 and attempt to fix the test

Signed-off-by: BoykoAlex <[email protected]>

Author: BoykoAlex

headless-services/commons/pom.xml

@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>4.0.0-M3</version>
+		<version>4.0.0-RC2</version>
 		<relativePath></relativePath>
 	</parent>
 

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

@@ -62,7 +62,7 @@ private CompletableFuture<Void> mavenRegenerateMetadata(Path pom, String[] goal)
 		synchronized(MAVEN_LOCK) {
 			String[] cmd = new String[1 + goal.length];
 			Path projectPath = pom.getParent();
-			String mvnw = OS.isWindows() ? "./mvnw.cmd" : "./mvnw";
+			String mvnw = OS.isWindows() ? ".\\mvnw.cmd" : "./mvnw";
 			cmd[0] = Files.isRegularFile(projectPath.resolve(mvnw)) ? mvnw : "mvn";
 			System.arraycopy(goal, 0, cmd, 1, goal.length);
 			try {

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

@@ -24,6 +24,7 @@
 import java.util.concurrent.ConcurrentMap;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.eclipse.lsp4j.Command;
 import org.slf4j.Logger;
@@ -114,6 +115,22 @@ public DataRepositoryAotMetadataService(FileObserver fileObserver, JavaProjectFi
 					notify(removedEntries);
 				}
 			});
+			fileObserver.onFilesDeleted(List.of("**/spring-aot", "**/spring-aot/main", "**/spring-aot/main/resources"), changedFiles -> {
+				// If `spring-aot` folder is deleted VSCode would only notify about the folder deletion, no events for each contained file
+				for (String fileUri : changedFiles) {
+					URI uri = URI.create(fileUri);
+					Path path = Paths.get(uri);
+					List<URI> removedEntries = metadataCache.keySet().stream()
+						.filter(p -> p.startsWith(path))
+						.filter(p -> metadataCache.remove(p).isPresent())
+						.map(p -> p.toUri())
+						.toList();
+					if (!removedEntries.isEmpty()) {
+						log.info("Spring AOT Metadata refreshed: %s".formatted(removedEntries.stream().map(p -> p.toString()).collect(Collectors.joining(", "))));
+						notify(removedEntries);
+					}
+				}
+			});
 		}
 	}
 
@@ -141,7 +158,13 @@ public Command regenerateMetadataCommand(IJavaProject jp) {
 		switch (jp.getProjectBuild().getType()) {
 		case ProjectBuild.MAVEN_PROJECT_TYPE:
 			List<String> goal = new ArrayList<>();
-			if (!IClasspathUtil.getOutputFolders(jp.getClasspath()).map(f -> f.toPath()).allMatch(Files::isDirectory)) {
+			if (!IClasspathUtil.getOutputFolders(jp.getClasspath()).map(f -> f.toPath()).filter(Files::isDirectory).flatMap(d -> {
+				try {
+					return Files.walk(d);
+				} catch (IOException e) {
+					return Stream.empty();
+				}
+			}).anyMatch(f -> Files.isRegularFile(f) && f.getFileName().toString().endsWith(".class"))) {
 				// Check if source is compiled by checking that all output folders exist
 				// If not compiled then add `compile` goal
 				goal.add("compile");

headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/data/test/DataRepositoryAotMetadataCodeLensProviderJpaTest.java

@@ -78,7 +78,7 @@ void codeLensOverMethod() throws Exception {
 		List<CodeLens> cls = editor.getCodeLenses("findUserByUsername", 1);
 		assertEquals("Turn into @Query", cls.get(0).getCommand().getTitle());
 		assertEquals("Implementation", cls.get(1).getCommand().getTitle());
-		assertEquals("SELECT u FROM example.springdata.aot.User u WHERE u.username = :username", cls.get(2).getCommand().getTitle());
+		assertEquals("SELECT u FROM users u WHERE u.username = :username", cls.get(2).getCommand().getTitle());
 	}
 
 	@Test

headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/data/test/DataRepositoryAotMetadataCodeLensProviderTest.java

@@ -96,7 +96,7 @@ void generateMetadataCodeLens() throws Exception {
 		assertTrue(cls.size() > 1);
 		assertEquals("Turn into @Query", cls.get(0).getCommand().getTitle());
 		assertEquals("Implementation", cls.get(1).getCommand().getTitle());
-		assertEquals("SELECT u FROM example.springdata.aot.User u WHERE u.username = :username", cls.get(2).getCommand().getTitle());
+		assertEquals("SELECT u FROM users u WHERE u.username = :username", cls.get(2).getCommand().getTitle());
 		assertEquals("Refresh", cls.get(3).getCommand().getTitle());
 	}
 

headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/data/test/QueryMethodCodeActionProviderJpaTest.java

@@ -85,7 +85,7 @@ void convertToQueryCodeAction() throws Exception {
 		WorkspaceEdit edit = refactorings.createEdit((JsonElement) cmd.getArguments().get(1)).get(5, TimeUnit.SECONDS);
 		TextDocumentEdit docEdit = edit.getDocumentChanges().get(0).getLeft();
 		assertEquals(
-				"@Query(\"SELECT u FROM example.springdata.aot.User u WHERE u.lastname LIKE :lastname ESCAPE '\\\\' ORDER BY u.firstname asc\")",
+				"@Query(\"SELECT u FROM users u WHERE u.lastname LIKE :lastname ESCAPE '\\\\' ORDER BY u.firstname asc\")",
 				docEdit.getEdits().get(0).getNewText().trim());
 		assertEquals(filePath.toUri().toASCIIString(), docEdit.getTextDocument().getUri());
 	}

headless-services/spring-boot-language-server/src/test/resources/test-projects/aot-data-repositories-jpa/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>4.0.0-M3</version>
+		<version>4.0.0-RC2</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 

headless-services/spring-boot-language-server/src/test/resources/test-projects/aot-data-repositories-mongodb/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>4.0.0-M3</version>
+		<version>4.0.0-RC2</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 

headless-services/spring-boot-language-server/src/test/resources/test-projects/data-repositories-jpa-4/mvnw.cmd

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>4.0.0-M3</version>
+		<version>4.0.0-RC2</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>