Adopt the vscode-gradle changes

Signed-off-by: BoykoAlex <alex.boyko@broadcom.com>

Author: BoykoAlex

eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/commands/ExecuteGradleTaskHandler.java

@@ -90,7 +90,6 @@ private void runBuild(Command cmd) throws ExecutionException {
 			String buildGradlePath = (String) cmd.getArguments().get(0);
 			GradleCommandLine commandLine = GradleCommandLine.parse((String) cmd.getArguments().get(1));
 			String javaHome = cmd.getArguments().size() > 2 ? javaHome(cmd.getArguments().get(2)) : null;
-			boolean refreshProject = cmd.getArguments().size() > 3 && refreshProject(cmd.getArguments().get(3));
 
 			IResource buildGradle = LSPEclipseUtils.findResourceFor(Paths.get(buildGradlePath).toUri());
 			IProject project = buildGradle.getProject();
@@ -117,11 +116,9 @@ private void runBuild(Command cmd) throws ExecutionException {
 				// Buildship's launch delegate only returns once the build has finished
 				launchConfig.launch(ILaunchManager.RUN_MODE, new NullProgressMonitor());
 			} finally {
-				if (refreshProject) {
-					// The build writes files (e.g. the AOT metadata) the workspace does not know about yet.
-					// Synchronize the project, which refreshes the workspace and updates the source folders.
-					synchronize(project);
-				}
+				// The build writes files (e.g. the AOT metadata) the workspace does not know about yet.
+				// Synchronize the project, which refreshes the workspace and updates the source folders.
+				synchronize(project);
 				if (!existed) {
 					// Created for this build only, the build can use files that are gone after it (an init
 					// script). Do not leave it around, but never delete a configuration of the user.
@@ -178,11 +175,6 @@ static GradleCommandLine parse(String command) {
 		}
 	}
 
-	// Same options as the `gradle.runBuild` command of vscode-gradle: { "refreshJavaProject": true }
-	private static boolean refreshProject(Object options) {
-		return options instanceof Map<?, ?> map && Boolean.TRUE.equals(map.get("refreshJavaProject"));
-	}
-
 	private static String javaHome(Object env) {
 		if (env instanceof Map<?, ?> map && map.get("JAVA_HOME") instanceof String javaHome && !javaHome.isBlank()) {
 			return javaHome;

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

@@ -12,7 +12,6 @@
 
 import java.nio.file.Paths;
 import java.util.List;
-import java.util.Map;
 
 import org.eclipse.lsp4j.Command;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
@@ -40,10 +39,7 @@ public Command executeGradleBuild(IJavaProject project, String command) {
 		cmd.setArguments(List.of(
 				Paths.get(project.getProjectBuild().getBuildFile()).toFile().toString(),
 				command,
-				BuildCommandProvider.buildEnv(project),
-				// Have the client reload the project after the build. The builds are for generating sources and
-				// resources, which only become source folders of the project at a project synchronization.
-				Map.of("refreshJavaProject", true)
+				BuildCommandProvider.buildEnv(project)
 		));
 		return cmd;
 	}

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

@@ -27,12 +27,8 @@
 import org.springframework.ide.vscode.boot.java.jdt.refactoring.JdtRefactorings;
 import org.springframework.ide.vscode.commons.Version;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
-import org.springframework.ide.vscode.commons.java.IProjectBuild;
 import org.springframework.ide.vscode.commons.java.SpringProjectUtil;
 import org.springframework.ide.vscode.commons.languageserver.reconcile.ICollector;
-import org.springframework.ide.vscode.commons.languageserver.util.LspClient;
-import org.springframework.ide.vscode.commons.languageserver.util.LspClient.Client;
-import org.springframework.ide.vscode.commons.protocol.java.ProjectBuild;
 import org.springframework.ide.vscode.commons.util.text.IRegion;
 import org.springframework.ide.vscode.commons.util.text.TextDocument;
 
@@ -56,11 +52,6 @@ public boolean isApplicable(IJavaProject project) {
 	}
 
 	static boolean isValidProject(IJavaProject project) {
-		IProjectBuild build = project.getProjectBuild();
-		if (LspClient.currentClient() == Client.VSCODE && build != null && ProjectBuild.GRADLE_PROJECT_TYPE.equals(build.getType())) {
-			// TODO: remove once `gradle.runBuild` of vscode-gradle takes the arguments of the AOT refresh command (GH-1722)
-			return false;
-		}
 		Version springDataJpaVersion = SpringProjectUtil.getDependencyVersionByPrefix(project, "spring-data-jpa");
 		Version springDataMongoDbVersion = SpringProjectUtil.getDependencyVersionByPrefix(project, "spring-data-mongodb");
 		Version springDataJddbcVersion = SpringProjectUtil.getDependencyVersionByPrefix(project, "spring-data-jdbc");

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

@@ -62,9 +62,7 @@ private void assertCommand(Command cmd, String commandId, int argCount) {
 	void vscodeAndEclipseRunTheBuildWithTheirGradleSupport() {
 		// vscode-gradle: gradle.runBuild(buildFile, command, env); Eclipse: handled by the Buildship launch of the Eclipse client
 		Command cmd = new VSCodeBuildCommandProvider().executeGradleBuild(project(), "classes aotClasses");
-		assertCommand(cmd, "gradle.runBuild", 4);
-		// the client reloads the project after the build: the generated folders become source folders
-		assertEquals(Map.of("refreshJavaProject", true), cmd.getArguments().get(3));
+		assertCommand(cmd, "gradle.runBuild", 3);
 	}
 
 	@Test

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

@@ -160,19 +160,4 @@ void clientWithoutSupportGetsNoCommand() throws Exception {
 		assertFalse(service.regenerateMetadataCommand(project).isPresent());
 	}
 
-	@Test
-	void gradleProjectsAreNotValidInVSCodeUntilVSCodeGradleSupportsTheCommand() throws Exception {
-		String client = System.getProperty("sts.lsp.client");
-		System.setProperty("sts.lsp.client", "vscode");
-		try {
-			assertFalse(QueryMethodCodeActionProvider.isValidProject(gradleProject("spring-boot-4.0.0.jar", projectDir.toFile())));
-		} finally {
-			if (client == null) {
-				System.clearProperty("sts.lsp.client");
-			} else {
-				System.setProperty("sts.lsp.client", client);
-			}
-		}
-	}
-
 }