Merge branch 'componentKey-fix' into 'master'

Attempt to solve #104 componentKey

See merge request !20

data-collection/src/main/java/org/ow2/mrl/data/collect/MainCollector.java

@@ -398,9 +398,9 @@ public class MainCollector {
     }
 
     /**
-     * Retrieves sonar component key
+     * Retrieves sonar component
      * @param project The project name
-     * @return The sonarqube componentKey (or Id)
+     * @return The sonarqube component (or Id)
      */
     public String getSonarqubeId(String project) {
         return trim(config.getProperty(project + ".sonarqube"));
@@ -561,15 +561,15 @@ public class MainCollector {
      * @return Script part to gather SonarQube data (single project)
      */
     public String generateSonarScript(String project) {
-        String componentKey = getSonarqubeId(project);
+        String component = getSonarqubeId(project);
         String server = getSonarqubeServer(project);
         String credentials = getSonarqubeCredentials(project);
         if (credentials.length() > 0) credentials = " -u " + credentials;
-        if (componentKey == null) return null;
+        if (component == null) return null;
         else {
             return "curl -X GET" + credentials + " -H \"Content-Type: application/json\" '"
-                    + complementUrl(server, "/api/measures/component?metricKeys=coverage,blocker_violations,critical_violations,test_success_density,ncloc&componentKey=")
-                    + componentKey + "' > " + getOutputDir(true) + project + "_sonar.json";
+                    + complementUrl(server, "/api/measures/component?metricKeys=coverage,blocker_violations,critical_violations,test_success_density,ncloc&component=")
+                    + component + "' > " + getOutputDir(true) + project + "_sonar.json";
         }
     }