Fix quality issues

diff --git a/src/main/java/org/sonarsource/scanner/cli/Conf.java b/src/main/java/org/sonarsource/scanner/cli/Conf.java
index c224204049be2d3d879708674ac9f8dbdb55f27a..3479108f01e3db5926a7315cf76f7035572eb850 100644 (file)
--- a/src/main/java/org/sonarsource/scanner/cli/Conf.java
+++ b/src/main/java/org/sonarsource/scanner/cli/Conf.java
@@ -31,6 +31,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
+import javax.annotation.Nullable;
+
 import org.sonarsource.scanner.api.Utils;
 
 class Conf {
@@ -206,7 +208,7 @@ class Conf {
     return locatePropertiesFile(settingsFile, props, settingsKey);
   }
 
-  private static Path locatePropertiesFile(Path defaultPath, Properties props, String settingsKey) {
+  private static Path locatePropertiesFile(@Nullable Path defaultPath, Properties props, String settingsKey) {
     Path settingsFile = defaultPath;
     if (settingsFile == null || !Files.exists(settingsFile)) {
       String settingsPath = props.getProperty(settingsKey, "");

diff --git a/src/main/java/org/sonarsource/scanner/cli/Logs.java b/src/main/java/org/sonarsource/scanner/cli/Logs.java
index a26a85064854a8bb5926b4513cedfe5d8951f6fc..60d788d4e433765e6f81665db9b35270714b4ff1 100644 (file)
--- a/src/main/java/org/sonarsource/scanner/cli/Logs.java
+++ b/src/main/java/org/sonarsource/scanner/cli/Logs.java
@@ -65,9 +65,7 @@ public class Logs {
 
   public void error(String message, Throwable t) {
     print(stdErr, "ERROR: " + message);
-    if (t != null) {
-      t.printStackTrace(stdErr);
-    }
+    t.printStackTrace(stdErr);
   }
 
   private void print(PrintStream stream, String msg) {