Skip to content

Pass environment to refresh AOT maven/gralde command on the client #1867

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
BoykoAlex wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Pass environment to refresh AOT maven/gralde command on the client #1867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion ...e-server/src/main/java/org/springframework/ide/vscode/boot/java/BuildCommandProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,26 @@
*******************************************************************************/
package org.springframework.ide.vscode.boot.java;

import java.util.LinkedHashMap;
import java.util.Map;

import org.eclipse.lsp4j.Command;
import org.springframework.ide.vscode.commons.java.IJavaProject;
import org.springframework.ide.vscode.commons.protocol.java.Jre;

public interface BuildCommandProvider {

Command executeMavenGoal(IJavaProject project, String goal);

Command executeGradleBuild(IJavaProject project, String command);


static Map<String, String> buildEnv(IJavaProject project) {
Map<String, String> env = new LinkedHashMap<>();
Jre jre = project.getClasspath().getJre();
if (jre != null && jre.installationPath() != null) {
env.put("JAVA_HOME", jre.installationPath());
}
return env;
}

}
72 changes: 54 additions & 18 deletions ...r/src/main/java/org/springframework/ide/vscode/boot/java/DefaultBuildCommandProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,19 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;

import org.eclipse.lsp4j.Command;
import org.springframework.ide.vscode.commons.java.IJavaProject;
import org.springframework.ide.vscode.commons.languageserver.util.OS;
import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer;

import com.google.gson.JsonObject;
import com.google.gson.JsonPrimitive;

public class DefaultBuildCommandProvider implements BuildCommandProvider {
Expand All @@ -38,9 +42,10 @@ public DefaultBuildCommandProvider(SimpleLanguageServer server) {
server.onCommand(CMD_EXEC_MAVEN_GOAL, params -> {
String pomPath = extractString(params.getArguments().get(0));
String goal = extractString(params.getArguments().get(1));
Map<String, String> env = params.getArguments().size() > 2 ? extractEnv(params.getArguments().get(2)) : null;
return CompletableFuture.runAsync(() -> {
try {
executeMaven(Paths.get(pomPath), goal.trim().split("\\s+")).get();
executeMaven(Paths.get(pomPath), goal.trim().split("\\s+"), env).get();
} catch (Exception e) {
throw new CompletionException(e);
}
Expand All @@ -51,9 +56,10 @@ public DefaultBuildCommandProvider(SimpleLanguageServer server) {
server.onCommand(CMD_EXEC_GRADLE_BUILD, params -> {
String gradleBuildPath = extractString(params.getArguments().get(0));
String command = extractString(params.getArguments().get(1));
Map<String, String> env = params.getArguments().size() > 2 ? extractEnv(params.getArguments().get(2)) : null;
return CompletableFuture.runAsync(() -> {
try {
executeGradle(Paths.get(gradleBuildPath), command.trim().split("\\s+")).get();
executeGradle(Paths.get(gradleBuildPath), command.trim().split("\\s+"), env).get();
} catch (Exception e) {
throw new CompletionException(e);
}
Expand All @@ -66,7 +72,13 @@ public Command executeMavenGoal(IJavaProject project, String goal) {
Command cmd = new Command();
cmd.setCommand(CMD_EXEC_MAVEN_GOAL);
cmd.setTitle("Execute Maven Goal");
cmd.setArguments(List.of(Paths.get(project.getProjectBuild().getBuildFile()).toFile().toString(), goal));
List<Object> args = new ArrayList<>(List.of(
Paths.get(project.getProjectBuild().getBuildFile()).toFile().toString(), goal));
Map<String, String> env = BuildCommandProvider.buildEnv(project);
if (!env.isEmpty()) {
args.add(env);
}
cmd.setArguments(args);
return cmd;
}

Expand All @@ -75,25 +87,44 @@ public Command executeGradleBuild(IJavaProject project, String command) {
Command cmd = new Command();
cmd.setCommand(CMD_EXEC_GRADLE_BUILD);
cmd.setTitle("Execute Gradle Build");
cmd.setArguments(List.of(Paths.get(project.getProjectBuild().getBuildFile()).toFile().toString(), command));
List<Object> args = new ArrayList<>(List.of(
Paths.get(project.getProjectBuild().getBuildFile()).toFile().toString(), command));
Map<String, String> env = BuildCommandProvider.buildEnv(project);
if (env != null && !env.isEmpty()) {
args.add(env);
}
cmd.setArguments(args);
return cmd;
}

private static String extractString(Object o) {
return o instanceof JsonPrimitive ? ((JsonPrimitive) o).getAsString() : o.toString();
}

private CompletableFuture<Void> executeMaven(Path pom, String[] goal) {
private static Map<String, String> extractEnv(Object o) {
Map<String, String> env = new LinkedHashMap<>();
if (o instanceof JsonObject jo) {
jo.entrySet().forEach(e -> env.put(e.getKey(), e.getValue().getAsString()));
}
return env;
}

private CompletableFuture<Void> executeMaven(Path pom, String[] goal, Map<String, String> env) {
synchronized(MAVEN_LOCK) {
String[] cmd = new String[1 + goal.length];
Path projectPath = pom.getParent();
Path mvnw = projectPath.resolve(OS.isWindows() ? "mvnw.cmd" : "mvnw");
cmd[0] = Files.isRegularFile(mvnw) ? mvnw.toFile().toString() : "mvn";
System.arraycopy(goal, 0, cmd, 1, goal.length);
List<String> cmdList = new ArrayList<>();
cmdList.add(Files.isRegularFile(mvnw) ? mvnw.toFile().toString() : "mvn");
cmdList.addAll(Arrays.asList(goal));
try {
return Runtime.getRuntime().exec(cmd, null, projectPath.toFile()).onExit().thenAccept(process -> {
ProcessBuilder pb = new ProcessBuilder(cmdList);
pb.directory(projectPath.toFile());
if (env != null && !env.isEmpty()) {
pb.environment().putAll(env);
}
return pb.start().onExit().thenAccept(process -> {
if (process.exitValue() != 0) {
throw new CompletionException("Failed to execute Maven goal", new IllegalStateException("Errors running maven command: %s".formatted(String.join(" ", cmd))));
throw new CompletionException("Failed to execute Maven goal", new IllegalStateException("Errors running maven command: %s".formatted(String.join(" ", cmdList))));
}
});
} catch (IOException e) {
Expand All @@ -102,16 +133,21 @@ private CompletableFuture<Void> executeMaven(Path pom, String[] goal) {
}
}

private CompletableFuture<Void> executeGradle(Path gradleBuildPath, String[] command) {
String[] cmd = new String[1 + command.length];
private CompletableFuture<Void> executeGradle(Path gradleBuildPath, String[] command, Map<String, String> env) {
Path projectPath = gradleBuildPath.getParent();
Path mvnw = projectPath.resolve(OS.isWindows() ? "gradlew.cmd" : "gradlew");
cmd[0] = Files.isRegularFile(mvnw) ? mvnw.toFile().toString() : "gradle";
System.arraycopy(command, 0, cmd, 1, command.length);
Path gradlew = projectPath.resolve(OS.isWindows() ? "gradlew.cmd" : "gradlew");
List<String> cmdList = new ArrayList<>();
cmdList.add(Files.isRegularFile(gradlew) ? gradlew.toFile().toString() : "gradle");
cmdList.addAll(Arrays.asList(command));
try {
return Runtime.getRuntime().exec(cmd, null, projectPath.toFile()).onExit().thenAccept(process -> {
ProcessBuilder pb = new ProcessBuilder(cmdList);
pb.directory(projectPath.toFile());
if (env != null && !env.isEmpty()) {
pb.environment().putAll(env);
}
return pb.start().onExit().thenAccept(process -> {
if (process.exitValue() != 0) {
throw new CompletionException("Failed to execute Gradle build", new IllegalStateException("Errors running gradle command: %s".formatted(String.join(" ", cmd))));
throw new CompletionException("Failed to execute Gradle build", new IllegalStateException("Errors running gradle command: %s".formatted(String.join(" ", cmdList))));
}
});
} catch (IOException e) {
Expand Down
18 changes: 16 additions & 2 deletions ...er/src/main/java/org/springframework/ide/vscode/boot/java/VSCodeBuildCommandProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
package org.springframework.ide.vscode.boot.java;

import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;

import org.eclipse.lsp4j.Command;
import org.springframework.ide.vscode.commons.java.IJavaProject;
Expand All @@ -23,7 +25,13 @@ public Command executeMavenGoal(IJavaProject project, String goal) {
Command cmd = new Command();
cmd.setCommand("maven.goal.custom");
cmd.setTitle("Execute Maven Goal");
cmd.setArguments(List.of(Paths.get(project.getProjectBuild().getBuildFile()).toFile().toString(), goal));
List<Object> args = new ArrayList<>(List.of(
Paths.get(project.getProjectBuild().getBuildFile()).toFile().toString(), goal));
Map<String, String> env = BuildCommandProvider.buildEnv(project);
if (env != null && !env.isEmpty()) {
args.add(env);
}
cmd.setArguments(args);
return cmd;
}

Expand All @@ -32,7 +40,13 @@ public Command executeGradleBuild(IJavaProject project, String command) {
Command cmd = new Command();
cmd.setCommand("gradle.runBuild");
cmd.setTitle("Execute Gradle Build");
cmd.setArguments(List.of(Paths.get(project.getProjectBuild().getBuildFile()).toFile().toString(), command));
List<Object> args = new ArrayList<>(List.of(
Paths.get(project.getProjectBuild().getBuildFile()).toFile().toString(), command));
Map<String, String> env = BuildCommandProvider.buildEnv(project);
if (env != null && !env.isEmpty()) {
args.add(env);
}
cmd.setArguments(args);
return cmd;
}

Expand Down
Loading