Mirrors/sonarqube
1
0
Fork 0
mirror of https://github.com/SonarSource/sonarqube.git synced 2024-08-28 05:54:38 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix quality flaws

Browse Source
This commit is contained in:
Daniel Schwarz 2017-10-16 16:32:25 +02:00 committed by Daniel Schwarz
parent 908547bead
commit 3e15ddb6e8
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/sonar-main/src/main/java/org/sonar/application/process/ProcessLauncherImpl.java
View File

@ -42,6 +42,7 @@ import org.sonar.process.sharedmemoryfile.AllProcessesCommands;
import org.sonar.process.sharedmemoryfile.ProcessCommands;
import static java.lang.String.format;
import static java.util.Objects.requireNonNull;
import static org.sonar.process.ProcessEntryPoint.PROPERTY_PROCESS_INDEX;
import static org.sonar.process.ProcessEntryPoint.PROPERTY_PROCESS_KEY;
import static org.sonar.process.ProcessEntryPoint.PROPERTY_SHARED_PATH;
@ -142,7 +143,7 @@ public class ProcessLauncherImpl implements ProcessLauncher {
}
}
private Process launchJava(JavaCommand javaCommand) {
private <T extends JvmOptions> Process launchJava(JavaCommand<T> javaCommand) {
ProcessId processId = javaCommand.getProcessId();
try {
ProcessBuilder processBuilder = create(javaCommand);
@ -164,7 +165,9 @@ public class ProcessLauncherImpl implements ProcessLauncher {
private ProcessBuilder create(EsScriptCommand esScriptCommand) {
List<String> commands = new ArrayList<>();
commands.add(esScriptCommand.getEsInstallation().getExecutable().getAbsolutePath());
EsInstallation esInstallation = esScriptCommand.getEsInstallation();
requireNonNull(esInstallation, () -> "No Elasticsearch installation configuration is available for the command of type " + esScriptCommand.getClass());
commands.add(esInstallation.getExecutable().getAbsolutePath());
commands.addAll(esScriptCommand.getOptions());
return create(esScriptCommand, commands);
@ -205,7 +208,7 @@ public class ProcessLauncherImpl implements ProcessLauncher {
return new File(new File(System.getProperty("java.home")), "bin" + separator + "java").getAbsolutePath();
}
private static List<String> buildClasspath(JavaCommand javaCommand) {
private static <T extends JvmOptions> List<String> buildClasspath(JavaCommand<T> javaCommand) {
String pathSeparator = System.getProperty("path.separator");
return Arrays.asList("-cp", String.join(pathSeparator, javaCommand.getClasspath()));
}