SCANJLIB-207 Remove logic around project.sourceEncoding

Author: ericg138

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

@@ -20,8 +20,9 @@
 package org.sonarsource.scanner.lib;
 
 /**
- * Most commonly used properties for a SonarQube analysis. These properties are passed to EmbeddedScanner#runAnalysis(java.util.Properties).
- * See <a href="http://docs.sonarqube.org/display/SONAR/Analysis+Parameters">documentation</a> for more properties.
+ * Most commonly used properties for an analysis.
+ * See <a href="https://docs.sonarsource.com/sonarqube/latest/analyzing-source-code/analysis-parameters/">documentation</a>
+ * for more details.
  */
 public final class AnalysisProperties {
 
@@ -35,7 +36,7 @@ private AnalysisProperties() {
   public static final String PROJECT_KEY = "sonar.projectKey";
 
   /**
-   * Used to define the exact key of each module. 
+   * Used to define the exact key of each module.
    * If {@link #PROJECT_KEY} is used instead on a module, then final key of the module will be &lt;parent module key&gt;:&lt;PROJECT_KEY&gt;.
    * @since SonarQube 4.1
    */
@@ -69,5 +70,4 @@ private AnalysisProperties() {
    * Encoding of source and test files. By default, it's the platform encoding.
    */
   public static final String PROJECT_SOURCE_ENCODING = "sonar.sourceEncoding";
-
 }

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

@@ -19,11 +19,8 @@
  */
 package org.sonarsource.scanner.lib;
 
-import java.nio.charset.Charset;
 import java.util.HashMap;
-import java.util.Locale;
 import java.util.Map;
-import java.util.Optional;
 import javax.annotation.Nullable;
 import org.sonarsource.scanner.lib.internal.JreCacheHit;
 import org.sonarsource.scanner.lib.internal.cache.Logger;
@@ -78,22 +75,9 @@ private void addStatsProperties(Map<String, String> allProps) {
   abstract void doAnalyze(Map<String, String> allProps);
 
   private void initAnalysisProperties(Map<String, String> p) {
-    initSourceEncoding(p);
     new Dirs(logger).init(p);
   }
 
-  private void initSourceEncoding(Map<String, String> p) {
-    String sourceEncoding = Optional.ofNullable(p.get(AnalysisProperties.PROJECT_SOURCE_ENCODING)).orElse("");
-    boolean platformDependent = false;
-    if ("".equals(sourceEncoding)) {
-      sourceEncoding = Charset.defaultCharset().name();
-      platformDependent = true;
-      p.put(AnalysisProperties.PROJECT_SOURCE_ENCODING, sourceEncoding);
-    }
-    logger.info("Default locale: \"" + Locale.getDefault() + "\", source code encoding: \"" + sourceEncoding + "\""
-      + (platformDependent ? " (analysis is platform dependent)" : ""));
-  }
-
   public Map<String, String> getBootstrapProperties() {
     return bootstrapProperties;
   }

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

@@ -20,8 +20,9 @@
 package org.sonarsource.scanner.lib;
 
 /**
- * Mostly used properties that can be passed to EmbeddedScanner#addGlobalProperties(java.util.Properties).
- * See <a href="https://docs.sonarqube.org/latest/analysis/analysis-parameters/">documentation</a> for more properties.
+ * Properties used by the scanner bootstrapper.
+ * See <a href="https://docs.sonarsource.com/sonarqube/latest/analyzing-source-code/analysis-parameters/">documentation</a>
+ * for more details.
  */
 public final class ScannerProperties {
 

lib/src/main/java/org/sonarsource/scanner/lib/internal/ScannerEngineLauncherFactory.java

@@ -20,7 +20,6 @@
 package org.sonarsource.scanner.lib.internal;
 
 import com.google.gson.Gson;
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Collections;

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

@@ -20,11 +20,9 @@
 package org.sonarsource.scanner.lib;
 
 import java.io.IOException;
-import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.HashMap;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Properties;
 import org.junit.jupiter.api.BeforeEach;
@@ -198,46 +196,6 @@ void should_set_properties() throws Exception {
     }
   }
 
-  @Test
-  void should_set_default_platform_encoding() throws Exception {
-    try (var scannerEngine = underTest
-      .setBootstrapProperty(InternalProperties.SCANNER_DUMP_TO_FILE, dumpFile.toString())
-      .bootstrap()) {
-
-      scannerEngine.analyze(Map.of());
-
-      assertThat(readDumpedProps().getProperty("sonar.sourceEncoding")).isEqualTo(Charset.defaultCharset().name());
-    }
-    verify(logOutput).log("Default locale: \"" + Locale.getDefault() + "\", source code encoding: \"" + Charset.defaultCharset().name() + "\" (analysis is platform dependent)",
-      LogOutput.Level.INFO);
-  }
-
-  @Test
-  void should_set_default_platform_encoding_when_empty() throws Exception {
-    try (var scannerEngine = underTest
-      .setBootstrapProperty(InternalProperties.SCANNER_DUMP_TO_FILE, dumpFile.toString())
-      .bootstrap()) {
-
-      scannerEngine.analyze(Map.of("sonar.sourceEncoding", ""));
-
-      assertThat(readDumpedProps().getProperty("sonar.sourceEncoding")).isEqualTo(Charset.defaultCharset().name());
-    }
-    verify(logOutput).log("Default locale: \"" + Locale.getDefault() + "\", source code encoding: \"" + Charset.defaultCharset().name() + "\" (analysis is platform dependent)",
-      LogOutput.Level.INFO);
-  }
-
-  @Test
-  void should_use_parameterized_encoding() throws Exception {
-    try (var scannerEngine = underTest
-      .setBootstrapProperty(InternalProperties.SCANNER_DUMP_TO_FILE, dumpFile.toString())
-      .bootstrap()) {
-
-      scannerEngine.analyze(Map.of("sonar.sourceEncoding", "THE_ISO_1234"));
-
-      assertThat(readDumpedProps().getProperty("sonar.sourceEncoding")).isEqualTo("THE_ISO_1234");
-    }
-  }
-
   @Test
   void should_set_os_and_arch() throws Exception {
     try (var scannerEngine = underTest