From 8b6b46d0113041184676d5d878a6e0e40964149e Mon Sep 17 00:00:00 2001 From: SimonBrandhof Date: Fri, 5 Apr 2013 16:06:43 +0200 Subject: [PATCH] Minor refactoring --- .../src/main/java/org/sonar/runner/api/Runner.java | 12 ++++++------ .../src/main/java/org/sonar/runner/api/Utils.java | 4 ++++ .../org/sonar/runner/api/EmbeddedRunnerTest.java | 4 ++-- .../src/main/java/org/sonar/runner/Cli.java | 8 ++++---- .../src/main/java/org/sonar/runner/Main.java | 4 ++-- .../java/org/sonar/runner/impl/BatchLauncher.java | 4 ++-- .../org/sonar/runner/impl/BatchLauncherMain.java | 2 +- .../main/java/org/sonar/runner/impl/Constants.java | 8 +++++--- .../java/org/sonar/runner/impl/FileDownloader.java | 5 ++--- 9 files changed, 28 insertions(+), 23 deletions(-) diff --git a/sonar-runner-api/src/main/java/org/sonar/runner/api/Runner.java b/sonar-runner-api/src/main/java/org/sonar/runner/api/Runner.java index 4634691..03e0099 100644 --- a/sonar-runner-api/src/main/java/org/sonar/runner/api/Runner.java +++ b/sonar-runner-api/src/main/java/org/sonar/runner/api/Runner.java @@ -43,8 +43,8 @@ public abstract class Runner { // default values properties.put(Constants.HOST_URL, "http://localhost:9000"); properties.put(Constants.TASK, "scan"); - properties.put(Constants.PROP_APP, "SonarRunner"); - properties.put(Constants.PROP_APP_VERSION, RunnerVersion.version()); + properties.put(Constants.RUNNER_APP, "SonarRunner"); + properties.put(Constants.RUNNER_APP_VERSION, RunnerVersion.version()); } public Properties properties() { @@ -74,17 +74,17 @@ public abstract class Runner { * User-agent used in the HTTP requests to the Sonar server */ public T setApp(String app, String version) { - setProperty(Constants.PROP_APP, app); - setProperty(Constants.PROP_APP_VERSION, version); + setProperty(Constants.RUNNER_APP, app); + setProperty(Constants.RUNNER_APP_VERSION, version); return (T) this; } public String app() { - return property(Constants.PROP_APP, null); + return property(Constants.RUNNER_APP, null); } public String appVersion() { - return property(Constants.PROP_APP_VERSION, null); + return property(Constants.RUNNER_APP_VERSION, null); } public void execute() { diff --git a/sonar-runner-api/src/main/java/org/sonar/runner/api/Utils.java b/sonar-runner-api/src/main/java/org/sonar/runner/api/Utils.java index 9be34b8..046c1dd 100644 --- a/sonar-runner-api/src/main/java/org/sonar/runner/api/Utils.java +++ b/sonar-runner-api/src/main/java/org/sonar/runner/api/Utils.java @@ -23,6 +23,10 @@ import java.util.Arrays; import java.util.Iterator; class Utils { + private Utils() { + // only util static methods + } + /** * Similar to org.apache.commons.lang.StringUtils#join() */ diff --git a/sonar-runner-api/src/test/java/org/sonar/runner/api/EmbeddedRunnerTest.java b/sonar-runner-api/src/test/java/org/sonar/runner/api/EmbeddedRunnerTest.java index 437d6bd..798dd05 100644 --- a/sonar-runner-api/src/test/java/org/sonar/runner/api/EmbeddedRunnerTest.java +++ b/sonar-runner-api/src/test/java/org/sonar/runner/api/EmbeddedRunnerTest.java @@ -48,10 +48,10 @@ public class EmbeddedRunnerTest { @Test public void should_set_unmasked_packages() { EmbeddedRunner runner = EmbeddedRunner.create(); - assertThat(runner.property(Constants.UNMASKED_PACKAGES, null)).isNull(); + assertThat(runner.property(Constants.RUNNER_UNMASKED_PACKAGES, null)).isNull(); runner = EmbeddedRunner.create().setUnmaskedPackages("org.apache.ant", "org.ant"); - assertThat(runner.property(Constants.UNMASKED_PACKAGES, null)).isEqualTo("org.apache.ant,org.ant"); + assertThat(runner.property(Constants.RUNNER_UNMASKED_PACKAGES, null)).isEqualTo("org.apache.ant,org.ant"); } @Test diff --git a/sonar-runner-dist/src/main/java/org/sonar/runner/Cli.java b/sonar-runner-dist/src/main/java/org/sonar/runner/Cli.java index 7c7ce90..b23c54a 100644 --- a/sonar-runner-dist/src/main/java/org/sonar/runner/Cli.java +++ b/sonar-runner-dist/src/main/java/org/sonar/runner/Cli.java @@ -31,19 +31,19 @@ class Cli { private boolean displayStackTrace = false; private Properties props = new Properties(); - public boolean isDebugMode() { + boolean isDebugMode() { return debugMode; } - public boolean isDisplayVersionOnly() { + boolean isDisplayVersionOnly() { return displayVersionOnly; } - public boolean isDisplayStackTrace() { + boolean isDisplayStackTrace() { return displayStackTrace; } - public Properties properties() { + Properties properties() { return props; } diff --git a/sonar-runner-dist/src/main/java/org/sonar/runner/Main.java b/sonar-runner-dist/src/main/java/org/sonar/runner/Main.java index fcd4a7a..a158562 100644 --- a/sonar-runner-dist/src/main/java/org/sonar/runner/Main.java +++ b/sonar-runner-dist/src/main/java/org/sonar/runner/Main.java @@ -37,7 +37,7 @@ import java.util.Properties; * * @since 1.0 */ -public final class Main { +public class Main { public static void main(String[] args) { Cli cli = new Cli().parse(args); @@ -59,7 +59,7 @@ public final class Main { } private void printSystem() { - System.out.println("Runner " + RunnerVersion.version()); + System.out.println("Sonar Runner " + RunnerVersion.version()); System.out.println("Java " + System.getProperty("java.version") + " (" + System.getProperty("java.vendor") + ")"); System.out.println(System.getProperty("os.name") + " " + System.getProperty("os.version") + " " + System.getProperty("os.arch")); } diff --git a/sonar-runner-impl/src/main/java/org/sonar/runner/impl/BatchLauncher.java b/sonar-runner-impl/src/main/java/org/sonar/runner/impl/BatchLauncher.java index 93795b0..8a946d5 100644 --- a/sonar-runner-impl/src/main/java/org/sonar/runner/impl/BatchLauncher.java +++ b/sonar-runner-impl/src/main/java/org/sonar/runner/impl/BatchLauncher.java @@ -34,14 +34,14 @@ public class BatchLauncher { if (serverVersion.is35Compatible()) { jarFiles = new Jars35(fileDownloader, new JarExtractor()).download(); } else if (serverVersion.is30Compatible()) { - String workDir = properties.getProperty("sonarRunner.workDir"); + String workDir = properties.getProperty(Constants.RUNNER_WORK_DIR); jarFiles = new Jars30(fileDownloader).download(new File(workDir), new JarExtractor()); } else { throw new IllegalStateException("Sonar " + serverVersion.version() + " is not supported. Please upgrade Sonar to version 3.0 or more."); } - String unmaskedPackages = properties.getProperty(Constants.UNMASKED_PACKAGES, ""); + String unmaskedPackages = properties.getProperty(Constants.RUNNER_UNMASKED_PACKAGES, ""); IsolatedClassloader classloader = new IsolatedClassloader(getClass().getClassLoader(), unmaskedPackages.split(":")); classloader.addFiles(jarFiles); delegateExecution(classloader, properties, extensions); diff --git a/sonar-runner-impl/src/main/java/org/sonar/runner/impl/BatchLauncherMain.java b/sonar-runner-impl/src/main/java/org/sonar/runner/impl/BatchLauncherMain.java index 5e951eb..280157d 100644 --- a/sonar-runner-impl/src/main/java/org/sonar/runner/impl/BatchLauncherMain.java +++ b/sonar-runner-impl/src/main/java/org/sonar/runner/impl/BatchLauncherMain.java @@ -41,7 +41,7 @@ public class BatchLauncherMain { try { props.load(input); // just to be clean, do not forward properties that do not make sense in fork mode - props.remove(Constants.UNMASKED_PACKAGES); + props.remove(Constants.RUNNER_UNMASKED_PACKAGES); } finally { IOUtils.closeQuietly(input); diff --git a/sonar-runner-impl/src/main/java/org/sonar/runner/impl/Constants.java b/sonar-runner-impl/src/main/java/org/sonar/runner/impl/Constants.java index bf2a80a..a06ba1c 100644 --- a/sonar-runner-impl/src/main/java/org/sonar/runner/impl/Constants.java +++ b/sonar-runner-impl/src/main/java/org/sonar/runner/impl/Constants.java @@ -21,9 +21,11 @@ package org.sonar.runner.impl; public interface Constants { String HOST_URL = "sonar.host.url"; - String PROP_APP = "sonarRunner.app"; - String PROP_APP_VERSION = "sonarRunner.appVersion"; - String UNMASKED_PACKAGES = "sonarRunner.unmaskedPackages"; String TASK = "sonar.task"; String SOURCE_ENCODING = "sonar.sourceEncoding"; + + String RUNNER_APP = "sonarRunner.app"; + String RUNNER_APP_VERSION = "sonarRunner.appVersion"; + String RUNNER_UNMASKED_PACKAGES = "sonarRunner.unmaskedPackages"; + String RUNNER_WORK_DIR = "sonarRunner.workDir"; } diff --git a/sonar-runner-impl/src/main/java/org/sonar/runner/impl/FileDownloader.java b/sonar-runner-impl/src/main/java/org/sonar/runner/impl/FileDownloader.java index 2e66b50..d8d0462 100644 --- a/sonar-runner-impl/src/main/java/org/sonar/runner/impl/FileDownloader.java +++ b/sonar-runner-impl/src/main/java/org/sonar/runner/impl/FileDownloader.java @@ -32,7 +32,6 @@ import java.net.ConnectException; import java.net.HttpURLConnection; import java.net.URL; import java.net.UnknownHostException; -import java.util.Map; import java.util.Properties; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -54,8 +53,8 @@ class FileDownloader { static FileDownloader create(Properties properties) { String serverUrl = properties.getProperty(Constants.HOST_URL); - String app = properties.getProperty(Constants.PROP_APP); - String appVersion = properties.getProperty(Constants.PROP_APP_VERSION); + String app = properties.getProperty(Constants.RUNNER_APP); + String appVersion = properties.getProperty(Constants.RUNNER_APP_VERSION); return new FileDownloader(serverUrl, app, appVersion); } -- 2.39.5