Cleaned up redundant logic to SonarProperties loader.

Author: Neltharak

src/main/java/fr/cnes/sonar/plugin/tools/SonarPropertiesLoader.java

@@ -9,22 +9,39 @@
 
 public class SonarPropertiesLoader {
 
+    Properties properties;
+
+    public SonarPropertiesLoader(Path path) throws IOException{
+
+        loadSonarProperties(path);
+    }
+
     /** Logger of this class */
     private static final Logger LOGGER = Logger.getLogger(FileTools.class.getName());
 
-    public Properties loadSonarProperties(Path sonarPropertiesPath)
+    public final Properties loadSonarProperties(Path sonarPropertiesPath)
             throws IOException {
 
-        Properties properties = new Properties();
+        this.properties = new Properties();
         try {
             InputStream sonar = Files.newInputStream(sonarPropertiesPath);
             if (sonar != null) {
-                properties.load(sonar);
+                this.properties.load(sonar);
             }
         } catch (IOException e) {
-            //LOGGER.log(Level.SEVERE, "-i : Could not find or open provided sonar.properties at: " + e.getMessage(), e);
+            // LOGGER.log(Level.SEVERE, "-i : Could not find or open provided
+            // sonar.properties at: " + e.getMessage(), e);
             throw e;
         }
-        return properties;
+        return this.properties;
+    }
+
+    public String getSonarProperty(String propName) {
+        String prop = this.properties.getProperty(propName);
+        // We check that the property existed and was actually returned. If it is we
+        // keep it as is.
+        // If it's not, we assign "" to it for the following checks.
+        prop = prop != null ? prop : "";
+        return prop;
     }
 }

src/main/java/fr/cnes/sonar/report/utils/ReportConfiguration.java

@@ -21,7 +21,6 @@
 import java.nio.file.Paths;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.Properties;
 
 import fr.cnes.sonar.plugin.tools.SonarPropertiesLoader;
 
@@ -140,30 +139,24 @@ public static ReportConfiguration create(final String[] pArgs) throws IOExceptio
         String token = new String();
 
         if (commandLineManager.hasOption("i")) {
-            // If we have a sonar.properties file, we read it and configure url and
-            // projectkey from it, possibly token.
+            // If we have a sonar.properties file, we read it and set server, projectKey and token from it if possible.
             try {
-                SonarPropertiesLoader propLoader = new SonarPropertiesLoader();
-                Properties sonarProps = propLoader
-                        .loadSonarProperties(Paths.get(commandLineManager.getOptionValue("i")));
+                SonarPropertiesLoader propLoader = new SonarPropertiesLoader(Paths.get(commandLineManager.getOptionValue("i")));
 
                 // If -s input does not exist, add it with the value of
-                // sonarprops.get("sonar.host.url"). If it does, no action (Command line is
-                // authoritative).
-                if (!commandLineManager.hasOption("s")) {
-                    server = sonarProps.getProperty(StringManager.SONAR_SERVER);
-                    server = server != null ? server : "";
-                }
-                if (!commandLineManager.hasOption("p")) {
-                    projectKey = sonarProps.getProperty(StringManager.SONAR_KEY);
-                    projectKey = projectKey != null ? projectKey : "";
-                }
-                if (!commandLineManager.hasOption("t")) {
-                    token = sonarProps.getProperty(StringManager.SONAR_TOKEN);
-                    token = token != null ? token : "";
-                }
+                // sonarprops.get("sonar.host.url"). If it does, no action (Command line is authoritative).
                 // Similar logic for other parameters, projectKey, token, etc.
+
+                if (!commandLineManager.hasOption("s"))
+                    server = propLoader.getSonarProperty(StringManager.SONAR_SERVER);
+                if (!commandLineManager.hasOption("p"))
+                    projectKey = propLoader.getSonarProperty(StringManager.SONAR_KEY);
+                if (!commandLineManager.hasOption("t"))
+                    token = propLoader.getSonarProperty(StringManager.SONAR_TOKEN);
+
             } catch (IOException e) {
+                // If sonar.properties was not properly opened, we raise this to main to halt
+                // execution.
                 throw e;
             }
         }
@@ -173,22 +166,16 @@ public static ReportConfiguration create(final String[] pArgs) throws IOExceptio
                 StringManager.NO_BRANCH);
         return new ReportConfiguration(commandLineManager.hasOption("h"), commandLineManager.hasOption("v"),
                 commandLineManager.getOptionValue("i", StringManager.getProperty(StringManager.SONAR_PROPERTIES)),
-                server.isEmpty()
-                        ? commandLineManager.getOptionValue("s", StringManager.getProperty(StringManager.SONAR_URL))
-                        : server,
-                token.isEmpty()
-                        ? commandLineManager.getOptionValue("t", StringManager.getProperty(StringManager.SONAR_TOKEN))
-                        : token,
+                server.isEmpty() ? commandLineManager.getOptionValue("s", StringManager.getProperty(StringManager.SONAR_URL)): server,
+                token.isEmpty() ? commandLineManager.getOptionValue("t", StringManager.getProperty(StringManager.SONAR_TOKEN)): token,
                 projectKey.isEmpty() ? commandLineManager.getOptionValue("p", StringManager.EMPTY) : projectKey,
                 commandLineManager.getOptionValue("o", StringManager.getProperty(StringManager.DEFAULT_OUTPUT)),
                 commandLineManager.getOptionValue("l", StringManager.getProperty(StringManager.DEFAULT_LANGUAGE)),
                 commandLineManager.getOptionValue("a", StringManager.getProperty(StringManager.DEFAULT_AUTHOR)),
                 commandLineManager.getOptionValue("d",
                         new SimpleDateFormat(StringManager.DATE_PATTERN).format(new Date())),
                 !commandLineManager.hasOption("c"), !commandLineManager.hasOption("w"),
-                !commandLineManager.hasOption("e"), !commandLineManager.hasOption("f"), // Why f ? Because every "logic"
-                                                                                        // options like "c" are already
-                                                                                        // used
+                !commandLineManager.hasOption("e"), !commandLineManager.hasOption("f"), // Why f ? Because every "logic" options like "c" are already used
                 !commandLineManager.hasOption("m"), commandLineManager.getOptionValue("r", StringManager.EMPTY),
                 commandLineManager.getOptionValue("x", StringManager.EMPTY),
                 commandLineManager.getOptionValue("n", StringManager.EMPTY),