SCANJLIB-205 Remove code related to tasks

Author: henryju

lib/src/main/java/org/sonarsource/scanner/lib/Dirs.java

@@ -19,7 +19,6 @@
  */
 package org.sonarsource.scanner.lib;
 
-import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -36,15 +35,6 @@ class Dirs {
   }
 
   void init(Map<String, String> p) {
-    boolean onProject = Utils.taskRequiresProject(p);
-    if (onProject) {
-      initProjectDirs(p);
-    } else {
-      initTaskDirs(p);
-    }
-  }
-
-  private void initProjectDirs(Map<String, String> p) {
     String pathString = Optional.ofNullable(p.get(ScanProperties.PROJECT_BASEDIR)).orElse("");
     Path absoluteProjectPath = Paths.get(pathString).toAbsolutePath().normalize();
     if (!Files.isDirectory(absoluteProjectPath)) {
@@ -65,13 +55,4 @@ private void initProjectDirs(Map<String, String> p) {
     p.put(ScannerProperties.WORK_DIR, workDirPath.normalize().toString());
     logger.debug("Work directory: " + workDirPath.normalize().toString());
   }
-
-  /**
-   * Non-scan task
-   */
-  private static void initTaskDirs(Map<String, String> p) {
-    String path = Optional.ofNullable(p.get(ScannerProperties.WORK_DIR)).orElse(".");
-    File workDir = new File(path);
-    p.put(ScannerProperties.WORK_DIR, workDir.getAbsolutePath());
-  }
 }

lib/src/main/java/org/sonarsource/scanner/lib/EmbeddedScanner.java

@@ -114,12 +114,12 @@ public String serverVersion() {
     return launcher.getVersion();
   }
 
-  public void execute(Map<String, String> taskProps) {
+  public void execute(Map<String, String> analysisProps) {
     checkLauncherExists();
     try (IsolatedLauncherFactory launcherFactoryToBeClosed = launcherFactory) {
       Map<String, String> allProps = new HashMap<>();
       allProps.putAll(globalProperties);
-      allProps.putAll(taskProps);
+      allProps.putAll(analysisProps);
       initAnalysisProperties(allProps);
       doExecute(allProps);
     } catch (IOException e) {
@@ -145,18 +145,15 @@ private void initAnalysisProperties(Map<String, String> p) {
   }
 
   void initSourceEncoding(Map<String, String> p) {
-    boolean onProject = Utils.taskRequiresProject(p);
-    if (onProject) {
-      String sourceEncoding = Optional.ofNullable(p.get(ScanProperties.PROJECT_SOURCE_ENCODING)).orElse("");
-      boolean platformDependent = false;
-      if ("".equals(sourceEncoding)) {
-        sourceEncoding = Charset.defaultCharset().name();
-        platformDependent = true;
-        p.put(ScanProperties.PROJECT_SOURCE_ENCODING, sourceEncoding);
-      }
-      logger.info("Default locale: \"" + Locale.getDefault() + "\", source code encoding: \"" + sourceEncoding + "\""
-        + (platformDependent ? " (analysis is platform dependent)" : ""));
+    String sourceEncoding = Optional.ofNullable(p.get(ScanProperties.PROJECT_SOURCE_ENCODING)).orElse("");
+    boolean platformDependent = false;
+    if ("".equals(sourceEncoding)) {
+      sourceEncoding = Charset.defaultCharset().name();
+      platformDependent = true;
+      p.put(ScanProperties.PROJECT_SOURCE_ENCODING, sourceEncoding);
     }
+    logger.info("Default locale: \"" + Locale.getDefault() + "\", source code encoding: \"" + sourceEncoding + "\""
+      + (platformDependent ? " (analysis is platform dependent)" : ""));
   }
 
   private void setGlobalDefaultValue(String key, String value) {

lib/src/main/java/org/sonarsource/scanner/lib/ScanProperties.java

@@ -27,13 +27,6 @@
  */
 public interface ScanProperties {
 
-  /**
-   * Default task
-   *
-   * @see ScannerProperties#TASK
-   */
-  String SCAN_TASK = "scan";
-
   /**
    * Required project key
    */

lib/src/main/java/org/sonarsource/scanner/lib/ScannerProperties.java

@@ -31,11 +31,6 @@ public interface ScannerProperties {
    */
   String HOST_URL = "sonar.host.url";
 
-  /**
-   * Task to execute, "scan" by default
-   */
-  String TASK = "sonar.task";
-
   /**
    * Working directory containing generated reports and temporary data.
    */

lib/src/main/java/org/sonarsource/scanner/lib/Utils.java

@@ -84,11 +84,6 @@ static String join(String[] array, String delimiter) {
     return sb.toString();
   }
 
-  static boolean taskRequiresProject(Map<String, String> props) {
-    Object task = props.get(ScannerProperties.TASK);
-    return task == null || ScanProperties.SCAN_TASK.equals(task);
-  }
-
   static void writeProperties(File outputFile, Properties p) {
     try (OutputStream output = new FileOutputStream(outputFile)) {
       p.store(output, "Generated by sonar-runner");

lib/src/test/java/org/sonarsource/scanner/lib/DirsTest.java

@@ -37,31 +37,8 @@ public class DirsTest {
   @Rule
   public TemporaryFolder temp = new TemporaryFolder();
 
-  @Test
-  public void should_init_default_task_work_dir() throws Exception {
-    p.put("sonar.task", "views");
-    new Dirs(mock(Logger.class)).init(p);
-
-    File workDir = new File(p.get(ScannerProperties.WORK_DIR));
-    assertThat(workDir).isNotNull().isDirectory();
-    assertThat(workDir.getCanonicalPath()).isEqualTo(new File(".").getCanonicalPath());
-  }
-
-  @Test
-  public void should_use_parameterized_task_work_dir() throws Exception {
-    p.put("sonar.task", "views");
-    p.put(ScannerProperties.WORK_DIR, "generated/reports");
-    new Dirs(mock(Logger.class)).init(p);
-
-    File workDir = new File(p.get(ScannerProperties.WORK_DIR));
-    assertThat(workDir).isNotNull();
-    // separators from windows to unix
-    assertThat(workDir.getCanonicalPath().replace("\\", "/")).contains("generated/reports");
-  }
-
   @Test
   public void should_init_default_project_dirs() throws Exception {
-    p.put("sonar.task", "scan");
     new Dirs(mock(Logger.class)).init(p);
 
     File projectDir = new File(p.get(ScanProperties.PROJECT_BASEDIR));
@@ -78,7 +55,6 @@ public void should_init_default_project_dirs() throws Exception {
   @Test
   public void should_set_relative_path_to_project_work_dir() throws Exception {
     File initialProjectDir = temp.getRoot();
-    p.put("sonar.task", "scan");
     p.put(ScannerProperties.WORK_DIR, "relative/path");
     p.put(ScanProperties.PROJECT_BASEDIR, initialProjectDir.getAbsolutePath());
     new Dirs(mock(Logger.class)).init(p);

lib/src/test/java/org/sonarsource/scanner/lib/EmbeddedScannerTest.java

@@ -225,7 +225,6 @@ public void should_launch_in_simulation_mode() throws IOException {
   @Test
   public void should_set_default_platform_encoding() throws Exception {
     Map<String, String> p = new HashMap<>();
-    p.put("sonar.task", "scan");
     scanner.initSourceEncoding(p);
     assertThat(p.get("sonar.sourceEncoding")).isEqualTo(Charset.defaultCharset().name());
     verify(logger).info("Default locale: \"" + Locale.getDefault() + "\", source code encoding: \"" + Charset.defaultCharset().name() + "\" (analysis is platform dependent)");
@@ -234,7 +233,6 @@ public void should_set_default_platform_encoding() throws Exception {
   @Test
   public void should_set_default_platform_encoding_when_empty() throws Exception {
     Map<String, String> p = new HashMap<>();
-    p.put("sonar.task", "scan");
     p.put("sonar.sourceEncoding", "");
     scanner.initSourceEncoding(p);
     assertThat(p.get("sonar.sourceEncoding")).isEqualTo(Charset.defaultCharset().name());
@@ -253,18 +251,9 @@ public void cannot_start_twice() {
   @Test
   public void should_use_parameterized_encoding() throws Exception {
     Map<String, String> p = new HashMap<>();
-    p.put("sonar.task", "scan");
     p.put("sonar.sourceEncoding", "THE_ISO_1234");
     scanner.initSourceEncoding(p);
     assertThat(p.get("sonar.sourceEncoding")).isEqualTo("THE_ISO_1234");
   }
 
-  @Test
-  public void should_not_init_encoding_if_not_project_task() throws Exception {
-    Map<String, String> p = new HashMap<>();
-    p.put("sonar.task", "views");
-    scanner.initSourceEncoding(p);
-    assertThat(p.get("sonar.sourceEncoding")).isNull();
-  }
-
 }

lib/src/test/java/org/sonarsource/scanner/lib/UtilsTest.java

@@ -44,18 +44,9 @@ public class UtilsTest {
 
   @Test
   public void should_join_strings() {
-    assertThat(Utils.join(new String[] {}, ",")).isEqualTo("");
-    assertThat(Utils.join(new String[] {"foo"}, ",")).isEqualTo("foo");
-    assertThat(Utils.join(new String[] {"foo", "bar"}, ",")).isEqualTo("foo,bar");
-  }
-
-  @Test
-  public void task_should_require_project() {
-    Map<String, String> props = new HashMap<>();
-    assertThat(Utils.taskRequiresProject(props)).isTrue();
-
-    props.put("sonar.task", "scan");
-    assertThat(Utils.taskRequiresProject(props)).isTrue();
+    assertThat(Utils.join(new String[]{}, ",")).isEqualTo("");
+    assertThat(Utils.join(new String[]{"foo"}, ",")).isEqualTo("foo");
+    assertThat(Utils.join(new String[]{"foo", "bar"}, ",")).isEqualTo("foo,bar");
   }
 
   @Test
@@ -67,13 +58,6 @@ public void write_properties() throws IOException {
     assertThat(Files.readAllLines(f.toPath(), StandardCharsets.UTF_8)).contains("key=value");
   }
 
-  @Test
-  public void task_should_not_require_project() {
-    Map<String, String> props = new HashMap<>();
-    props.put("sonar.task", "views");
-    assertThat(Utils.taskRequiresProject(props)).isFalse();
-  }
-
   @Test
   public void delete_non_empty_directory() throws IOException {
     /*-