From 6a92224cadbc7244ccc6ed3292f6d69d494f7594 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Tue, 18 Jul 2017 16:13:23 +0200 Subject: [PATCH] SONAR-8798 rename JavaCommandFactory to CommandFactory --- .../org/sonar/application/SchedulerImpl.java | 16 ++++++++-------- ...vaCommandFactory.java => CommandFactory.java} | 2 +- ...dFactoryImpl.java => CommandFactoryImpl.java} | 4 ++-- .../application/process/ProcessLauncherImpl.java | 2 +- .../org/sonar/application/SchedulerImplTest.java | 6 +++--- .../src/main/java/org/sonar/application/App.java | 8 ++++---- 6 files changed, 19 insertions(+), 19 deletions(-) rename server/sonar-process-monitor/src/main/java/org/sonar/application/process/{JavaCommandFactory.java => CommandFactory.java} (96%) rename server/sonar-process-monitor/src/main/java/org/sonar/application/process/{JavaCommandFactoryImpl.java => CommandFactoryImpl.java} (97%) diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/SchedulerImpl.java b/server/sonar-process-monitor/src/main/java/org/sonar/application/SchedulerImpl.java index 4446f268e36..d958deee9e5 100644 --- a/server/sonar-process-monitor/src/main/java/org/sonar/application/SchedulerImpl.java +++ b/server/sonar-process-monitor/src/main/java/org/sonar/application/SchedulerImpl.java @@ -30,8 +30,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.sonar.application.config.AppSettings; import org.sonar.application.config.ClusterSettings; +import org.sonar.application.process.CommandFactory; import org.sonar.application.process.JavaCommand; -import org.sonar.application.process.JavaCommandFactory; import org.sonar.application.process.ProcessLauncher; import org.sonar.application.process.Lifecycle; import org.sonar.application.process.ProcessEventListener; @@ -45,7 +45,7 @@ public class SchedulerImpl implements Scheduler, ProcessEventListener, ProcessLi private final AppSettings settings; private final AppReloader appReloader; - private final JavaCommandFactory javaCommandFactory; + private final CommandFactory commandFactory; private final ProcessLauncher processLauncher; private final AppState appState; private final NodeLifecycle nodeLifecycle = new NodeLifecycle(); @@ -60,12 +60,12 @@ public class SchedulerImpl implements Scheduler, ProcessEventListener, ProcessLi private RestarterThread restarterThread; private long processWatcherDelayMs = SQProcess.DEFAULT_WATCHER_DELAY_MS; - public SchedulerImpl(AppSettings settings, AppReloader appReloader, JavaCommandFactory javaCommandFactory, + public SchedulerImpl(AppSettings settings, AppReloader appReloader, CommandFactory commandFactory, ProcessLauncher processLauncher, AppState appState) { this.settings = settings; this.appReloader = appReloader; - this.javaCommandFactory = javaCommandFactory; + this.commandFactory = commandFactory; this.processLauncher = processLauncher; this.appState = appState; this.appState.addListener(this); @@ -105,7 +105,7 @@ public class SchedulerImpl implements Scheduler, ProcessEventListener, ProcessLi private void tryToStartEs() { SQProcess process = processesById.get(ProcessId.ELASTICSEARCH); if (process != null) { - tryToStartProcess(process, javaCommandFactory::createEsCommand); + tryToStartProcess(process, commandFactory::createEsCommand); } } @@ -115,9 +115,9 @@ public class SchedulerImpl implements Scheduler, ProcessEventListener, ProcessLi return; } if (appState.isOperational(ProcessId.WEB_SERVER, false)) { - tryToStartProcess(process, () -> javaCommandFactory.createWebCommand(false)); + tryToStartProcess(process, () -> commandFactory.createWebCommand(false)); } else if (appState.tryToLockWebLeader()) { - tryToStartProcess(process, () -> javaCommandFactory.createWebCommand(true)); + tryToStartProcess(process, () -> commandFactory.createWebCommand(true)); } else { Optional leader = appState.getLeaderHostName(); if (leader.isPresent()) { @@ -131,7 +131,7 @@ public class SchedulerImpl implements Scheduler, ProcessEventListener, ProcessLi private void tryToStartCe() { SQProcess process = processesById.get(ProcessId.COMPUTE_ENGINE); if (process != null && appState.isOperational(ProcessId.WEB_SERVER, false) && isEsClientStartable()) { - tryToStartProcess(process, javaCommandFactory::createCeCommand); + tryToStartProcess(process, commandFactory::createCeCommand); } } diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/JavaCommandFactory.java b/server/sonar-process-monitor/src/main/java/org/sonar/application/process/CommandFactory.java similarity index 96% rename from server/sonar-process-monitor/src/main/java/org/sonar/application/process/JavaCommandFactory.java rename to server/sonar-process-monitor/src/main/java/org/sonar/application/process/CommandFactory.java index 9d56f2c4e5c..6091fb9bd0d 100644 --- a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/JavaCommandFactory.java +++ b/server/sonar-process-monitor/src/main/java/org/sonar/application/process/CommandFactory.java @@ -19,7 +19,7 @@ */ package org.sonar.application.process; -public interface JavaCommandFactory { +public interface CommandFactory { JavaCommand createEsCommand(); diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/JavaCommandFactoryImpl.java b/server/sonar-process-monitor/src/main/java/org/sonar/application/process/CommandFactoryImpl.java similarity index 97% rename from server/sonar-process-monitor/src/main/java/org/sonar/application/process/JavaCommandFactoryImpl.java rename to server/sonar-process-monitor/src/main/java/org/sonar/application/process/CommandFactoryImpl.java index 86f4fd8c476..e41304f6ed5 100644 --- a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/JavaCommandFactoryImpl.java +++ b/server/sonar-process-monitor/src/main/java/org/sonar/application/process/CommandFactoryImpl.java @@ -28,7 +28,7 @@ import java.util.Optional; import static org.sonar.process.ProcessProperties.*; -public class JavaCommandFactoryImpl implements JavaCommandFactory { +public class CommandFactoryImpl implements CommandFactory { /** * Properties about proxy that must be set as system properties */ @@ -44,7 +44,7 @@ public class JavaCommandFactoryImpl implements JavaCommandFactory { private final AppSettings settings; - public JavaCommandFactoryImpl(AppSettings settings) { + public CommandFactoryImpl(AppSettings settings) { this.settings = settings; } diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/ProcessLauncherImpl.java b/server/sonar-process-monitor/src/main/java/org/sonar/application/process/ProcessLauncherImpl.java index 151fafacdf4..c84bcfb5ad8 100644 --- a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/ProcessLauncherImpl.java +++ b/server/sonar-process-monitor/src/main/java/org/sonar/application/process/ProcessLauncherImpl.java @@ -88,7 +88,7 @@ public class ProcessLauncherImpl implements ProcessLauncher { commands.add(buildJavaPath()); commands.addAll(javaCommand.getJavaOptions()); // TODO warning - does it work if temp dir contains a whitespace ? - // TODO move to JavaCommandFactory ? + // TODO move to CommandFactory ? commands.add(format("-Djava.io.tmpdir=%s", tempDir.getAbsolutePath())); commands.addAll(buildClasspath(javaCommand)); commands.add(javaCommand.getClassName()); diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/SchedulerImplTest.java b/server/sonar-process-monitor/src/test/java/org/sonar/application/SchedulerImplTest.java index 1727336da89..9ad38ac6e59 100644 --- a/server/sonar-process-monitor/src/test/java/org/sonar/application/SchedulerImplTest.java +++ b/server/sonar-process-monitor/src/test/java/org/sonar/application/SchedulerImplTest.java @@ -35,8 +35,8 @@ import org.junit.rules.TestRule; import org.junit.rules.Timeout; import org.mockito.Mockito; import org.sonar.application.config.TestAppSettings; +import org.sonar.application.process.CommandFactory; import org.sonar.application.process.JavaCommand; -import org.sonar.application.process.JavaCommandFactory; import org.sonar.application.process.ProcessLauncher; import org.sonar.application.process.ProcessMonitor; import org.sonar.process.ProcessId; @@ -66,7 +66,7 @@ public class SchedulerImplTest { private AppReloader appReloader = mock(AppReloader.class); private TestAppSettings settings = new TestAppSettings(); - private TestJavaCommandFactory javaCommandFactory = new TestJavaCommandFactory(); + private TestCommandFactory javaCommandFactory = new TestCommandFactory(); private TestProcessLauncher processLauncher = new TestProcessLauncher(); private TestAppState appState = new TestAppState(); private List orderedStops = synchronizedList(new ArrayList<>()); @@ -305,7 +305,7 @@ public class SchedulerImplTest { } } - private static class TestJavaCommandFactory implements JavaCommandFactory { + private static class TestCommandFactory implements CommandFactory { @Override public JavaCommand createEsCommand() { return ES_COMMAND; diff --git a/sonar-application/src/main/java/org/sonar/application/App.java b/sonar-application/src/main/java/org/sonar/application/App.java index ae788166045..69098a0a756 100644 --- a/sonar-application/src/main/java/org/sonar/application/App.java +++ b/sonar-application/src/main/java/org/sonar/application/App.java @@ -23,8 +23,8 @@ import java.io.IOException; import org.sonar.application.config.AppSettings; import org.sonar.application.config.AppSettingsLoader; import org.sonar.application.config.AppSettingsLoaderImpl; -import org.sonar.application.process.JavaCommandFactory; -import org.sonar.application.process.JavaCommandFactoryImpl; +import org.sonar.application.process.CommandFactory; +import org.sonar.application.process.CommandFactoryImpl; import org.sonar.application.process.ProcessLauncher; import org.sonar.application.process.ProcessLauncherImpl; import org.sonar.application.process.StopRequestWatcher; @@ -49,11 +49,11 @@ public class App { try (AppState appState = new AppStateFactory(settings).create()) { appState.registerSonarQubeVersion(getSonarqubeVersion()); AppReloader appReloader = new AppReloaderImpl(settingsLoader, fileSystem, appState, logging); - JavaCommandFactory javaCommandFactory = new JavaCommandFactoryImpl(settings); + CommandFactory commandFactory = new CommandFactoryImpl(settings); fileSystem.reset(); try (ProcessLauncher processLauncher = new ProcessLauncherImpl(fileSystem.getTempDir())) { - Scheduler scheduler = new SchedulerImpl(settings, appReloader, javaCommandFactory, processLauncher, appState); + Scheduler scheduler = new SchedulerImpl(settings, appReloader, commandFactory, processLauncher, appState); // intercepts CTRL-C Runtime.getRuntime().addShutdownHook(new ShutdownHook(scheduler)); -- 2.39.5