Minor refactoring

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 46346917a95f2988081a205741eb7cb96eebde3c..03e009900b72da89a2289517d36aff8b598f15b1 100644 (file)
--- 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<T extends 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<T extends 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 9be34b80ab1885d5fb067e4238b67b5974a4b09f..046c1dda0887c30c90fe193b992b8ff9046a0cdb 100644 (file)
--- 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 437d6bd3598df4963e5b40e7d4452e7100dd837d..798dd053e6ab01e83932c8af6d038d5e1a7f15eb 100644 (file)
--- 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 7c7ce90081a86a24e56ec64418a3082d80150141..b23c54adf734a0b0a16345d6bfdc5da3fbf28b79 100644 (file)
--- 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 fcd4a7a8a37a8994d70b2585d64e98f4533c7095..a1585624acee01e400a9f34d6b98aab98e0e1bba 100644 (file)
--- 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 93795b0e926afd66c7f8e68f36d7d3898852112f..8a946d55a969622eb8953e886f2ddcc7d203e7fa 100644 (file)
--- 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 5e951eb7f08e5f3677a7d3f0c88b0bc25d50f634..280157dc8462ae39ed5c56a259a822dbc3527948 100644 (file)
--- 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 bf2a80a1644938e02db8a5e133165124d03c118a..a06ba1c4f766b892d324e0d52c19c1540b999459 100644 (file)
--- 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 2e66b50d3a4a300e08a772fc2befa5acc4979eeb..d8d04628b57b79e95cd18937263261fb6c8fc1f6 100644 (file)
--- 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);
   }