Merge pull request #48 from lequal/dev

Merge dev to master

Author: louisjdmartin

.travis.yml

@@ -4,7 +4,8 @@ sudo: false
 install: true
 
 jdk:
-  - oraclejdk8
+  - openjdk8
+  - openjdk11
 
 cache:
   directories:

pom.xml

@@ -5,7 +5,7 @@
     <groupId>fr.cnes.sonarqube.plugins</groupId>
     <artifactId>sonaricode</artifactId>
     <packaging>sonar-plugin</packaging>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
     <name>Sonar i-Code CNES plugin</name>
 
     <description>i-Code CNES plugin for SonarQube</description>
@@ -43,6 +43,12 @@
             <url>https://github.com/begarco</url>
             <id>begarco</id>
         </developer>
+        <developer>
+            <name>Louis Martin</name>
+            <organization>CNES</organization>
+            <url>https://github.com/louisjdmartin</url>
+            <id>louisjdmartin</id>
+        </developer>
         <developer>
             <name>Omar Waldmann</name>
             <organization>CNES</organization>
@@ -91,17 +97,22 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.9.0</version>
+            <version>3.0.0</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>1.4.11.1</version>
+        </dependency>
     </dependencies>
 
     <build>
         <plugins>
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.7.6.201602180812</version>
+                <version>0.8.4</version>
                 <executions>
                     <execution>
                         <id>prepare-agent</id>

src/main/java/fr/cnes/sonar/plugins/icode/check/ICodeSensor.java

@@ -41,8 +41,9 @@
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 
-import javax.xml.bind.JAXBException;
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -113,27 +114,27 @@ public void execute(SensorContext sensorContext) {
         for(final String reportPath : reportFiles) {
             try {
                 // Unmarshall the xml.
-                final File file = new File(reportPath);
+                final FileInputStream file = new FileInputStream(reportPath);
                 final AnalysisProject analysisProject = (AnalysisProject) XmlHandler.unmarshal(file, AnalysisProject.class);
                 // Retrieve file in a SonarQube format.
                 final Map<String, InputFile> scannedFiles = getScannedFiles(fileSystem, analysisProject);
 
                 // Handles issues.
                 for (final AnalysisRule rule : analysisProject.getAnalysisRules()) {
-                    if(isRuleActive(activeRules, rule.analysisRuleId)) { // manage active rules
+                    if(isRuleActive(activeRules, rule.getAnalysisRuleId())) { // manage active rules
                         saveIssue(sensorContext, scannedFiles, rule);
-                    } else if (ICodeMetricsProcessor.isMetric(rule.analysisRuleId)) { // manage trivial measures
+                    } else if (ICodeMetricsProcessor.isMetric(rule.getAnalysisRuleId())) { // manage trivial measures
                         ICodeMetricsProcessor.saveMeasure(sensorContext, scannedFiles, rule);
                     } else { // log ignored data
                         LOGGER.info(String.format(
                                 "An issue for rule '%s' was detected by i-Code but this rule is deactivated in current analysis.",
-                                rule.analysisRuleId));
+                                rule.getAnalysisRuleId()));
                     }
                 }
 
                 ICodeMetricsProcessor.saveExtraMeasures(sensorContext, scannedFiles, analysisProject);
 
-            } catch (JAXBException e) {
+            } catch (FileNotFoundException e) {
                 LOGGER.error(e.getMessage(), e);
                 sensorContext.newAnalysisError().message(e.getMessage()).save();
             }
@@ -192,32 +193,32 @@ protected int runICode(final String command) throws IOException, InterruptedExce
     static void saveIssue(final SensorContext context, final Map<String, InputFile> files, final AnalysisRule issue) {
 
         // Retrieve the file containing the issue.
-        final InputFile inputFile = files.getOrDefault(issue.result.fileName, null);
+        final InputFile inputFile = files.getOrDefault(issue.getResult().getFileName(), null);
 
         if(inputFile!=null) {
             // Retrieve the ruleKey if it exists.
-            final RuleKey ruleKey = RuleKey.of(ICodeRulesDefinition.getRepositoryKeyForLanguage(inputFile.language()), issue.analysisRuleId);
+            final RuleKey ruleKey = RuleKey.of(ICodeRulesDefinition.getRepositoryKeyForLanguage(inputFile.language()), issue.getAnalysisRuleId());
 
             // Create a new issue for SonarQube, but it must be saved using NewIssue.save().
             final NewIssue newIssue = context.newIssue();
             // Create a new location for this issue.
             final NewIssueLocation newIssueLocation = newIssue.newLocation();
 
             // Calculate the line number of the issue (must be between 1 and max, otherwise 1).
-            int issueLine = Integer.parseInt(issue.result.resultLine);
+            int issueLine = Integer.parseInt(issue.getResult().getResultLine());
             issueLine = issueLine > 0 && issueLine <= inputFile.lines() ? issueLine : 1;
 
             // Set trivial issue's attributes from AnalysisRule fields.
             newIssueLocation.on(inputFile);
             newIssueLocation.at(inputFile.selectLine(issueLine));
-            newIssueLocation.message(issue.result.resultMessage);
+            newIssueLocation.message(issue.getResult().getResultMessage());
             newIssue.forRule(ruleKey);
             newIssue.at(newIssueLocation);
             newIssue.save();
         } else {
             LOGGER.error(String.format(
                     "Issue '%s' on file '%s' has not been saved because source file was not found.",
-                    issue.analysisRuleId, issue.result.fileName
+                    issue.getAnalysisRuleId(), issue.getResult().getFileName()
             ));
         }
 
@@ -238,14 +239,14 @@ protected Map<String, InputFile> getScannedFiles(final FileSystem fileSystem, fi
         // Looks for each file in file system, print an error if not found.
         for(final AnalysisFile file : files) {
             // Checks if the file system contains a file with corresponding path (relative or absolute).
-            FilePredicate predicate = fileSystem.predicates().hasPath(file.fileName);
+            FilePredicate predicate = fileSystem.predicates().hasPath(file.getFileName());
             InputFile inputFile = fileSystem.inputFile(predicate);
             if(inputFile!=null) {
-                result.put(file.fileName, inputFile);
+                result.put(file.getFileName(), inputFile);
             } else {
                 LOGGER.error(String.format(
                         "The source file '%s' was not found.",
-                        file.fileName
+                        file.getFileName()
                 ));
             }
         }

src/main/java/fr/cnes/sonar/plugins/icode/languages/ICodeQualityProfiles.java

@@ -24,7 +24,6 @@
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 
-import javax.xml.bind.JAXBException;
 import java.io.InputStream;
 
 /**
@@ -64,16 +63,12 @@ private void createBuiltInProfile(final Context context, final String language,
         final NewBuiltInQualityProfile defaultProfile =
                 context.createBuiltInQualityProfile(I_CODE_RULES_PROFILE_NAME, language);
 
-        try {
-            // Retrieve all defined rules.
-            final InputStream stream = getClass().getResourceAsStream(path);
-            final RulesDefinition rules = (RulesDefinition) XmlHandler.unmarshal(stream, RulesDefinition.class);
-            // Activate all i-Code CNES rules.
-            for(final Rule rule : rules.getRules()) {
-                defaultProfile.activateRule(ICodeRulesDefinition.getRepositoryKeyForLanguage(language), rule.key);
-            }
-        } catch (JAXBException e) {
-            LOGGER.warn(e.getLocalizedMessage(), e);
+        // Retrieve all defined rules.
+        final InputStream stream = getClass().getResourceAsStream(path);
+        final RulesDefinition rules = (RulesDefinition) XmlHandler.unmarshal(stream, RulesDefinition.class);
+        // Activate all i-Code CNES rules.
+        for(final Rule rule : rules.getRules()) {
+            defaultProfile.activateRule(ICodeRulesDefinition.getRepositoryKeyForLanguage(language), rule.getKey());
         }
         // Save the default profile.
         defaultProfile.setDefault(true);

src/main/java/fr/cnes/sonar/plugins/icode/measures/ICodeMetricsProcessor.java

@@ -73,13 +73,13 @@ public static void saveMeasure(final SensorContext context, final Map<String, In
         // Create a new measure from the scan context.
         final NewMeasure<Integer> newMeasure = context.newMeasure();
         // i-Code rule id.
-        final String metricKey = rule.analysisRuleId;
+        final String metricKey = rule.getAnalysisRuleId();
         // Determine if a measure is relative to a file or a method.
-        final String metricScope = rule.result.resultTypePlace;
+        final String metricScope = rule.getResult().getResultTypePlace();
         // Component concerned by the measure.
-        final String metricComponent = rule.result.fileName;
+        final String metricComponent = rule.getResult().getFileName();
         // Component concerned by the measure.
-        final String measureValue = rule.result.resultValue;
+        final String measureValue = rule.getResult().getResultValue();
 
         // Is true if the metric must be interpreted by the plugin.
         boolean isCalculated = false;
@@ -142,8 +142,8 @@ public static void saveExtraMeasures(final SensorContext context, final Map<Stri
 
         // Collect all measures on methods into specific list
         for(final AnalysisRule rule : project.getAnalysisRules()) {
-            final String type = rule.result.resultTypePlace;
-            final String id = rule.analysisRuleId;
+            final String type = rule.getResult().getResultTypePlace();
+            final String id = rule.getAnalysisRuleId();
             if(id.contains(COMMON_METRICS_KEY_PART) && type.equals("method")) {
                 final List<AnalysisRule> sub = measures.getOrDefault(id, new ArrayList<>());
                 sub.add(rule);
@@ -182,7 +182,7 @@ private static void computeFunctions(final SensorContext context, final Map<Stri
 
         // Compute number of functions by file.
         for(final AnalysisRule measure : rawMeasures) {
-            final String file = measure.result.fileName;
+            final String file = measure.getResult().getFileName();
             Integer sum = functions.getOrDefault(file, 0) + 1;
             functions.put(file, sum);
         }
@@ -213,8 +213,8 @@ private static void computeComplexity(final SensorContext context, final Map<Str
 
         // Compute complexity sum value by file.
         for(final AnalysisRule measure : rawMeasures) {
-            final String file = measure.result.fileName;
-            final Integer value = Double.valueOf((measure.result.resultValue)).intValue();
+            final String file = measure.getResult().getFileName();
+            final Integer value = Double.valueOf((measure.getResult().getResultValue())).intValue();
             Integer sum = complexity.getOrDefault(file, 0);
             sum += value;
             complexity.put(file, sum);
@@ -246,8 +246,8 @@ private static void computeNesting(final SensorContext context, final Map<String
 
         // compute max nesting value by file
         for(final AnalysisRule measure : rawMeasures) {
-            final String file = measure.result.fileName;
-            final Integer value = Double.valueOf((measure.result.resultValue)).intValue();
+            final String file = measure.getResult().getFileName();
+            final Integer value = Double.valueOf((measure.getResult().getResultValue())).intValue();
             Integer max = nesting.getOrDefault(file, 0);
             max = Math.max(max,value);
             nesting.put(file, max);

src/main/java/fr/cnes/sonar/plugins/icode/model/AnalysisFile.java

@@ -16,7 +16,6 @@
  */
 package fr.cnes.sonar.plugins.icode.model;
 
-import javax.xml.bind.annotation.XmlAttribute;
 
 /**
  * Class used to unmarshal i-Code xml file.
@@ -26,8 +25,22 @@
  * @author lequal
  */
 public class AnalysisFile {
-    @XmlAttribute
-    public String language;
-    @XmlAttribute
-    public String fileName;
+    private String language;
+    private String fileName;
+
+    public String getLanguage() {
+        return language;
+    }
+
+    public void setLanguage(String language) {
+        this.language = language;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
 }

src/main/java/fr/cnes/sonar/plugins/icode/model/AnalysisInformations.java

@@ -16,7 +16,6 @@
  */
 package fr.cnes.sonar.plugins.icode.model;
 
-import javax.xml.bind.annotation.XmlAttribute;
 
 /**
  * Class used to unmarshal i-Code xml file.
@@ -26,10 +25,13 @@
  * @author lequal
  */
 public class AnalysisInformations {
-    @XmlAttribute
-    public String analysisConfigurationId;
-    @XmlAttribute
-    public String analysisDate;
-    @XmlAttribute
-    public String author;
+    private String author;
+
+    public String getAuthor() {
+        return author;
+    }
+
+    public void setAuthor(String author) {
+        this.author = author;
+    }
 }

src/main/java/fr/cnes/sonar/plugins/icode/model/AnalysisProject.java

@@ -16,9 +16,6 @@
  */
 package fr.cnes.sonar.plugins.icode.model;
 
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -30,18 +27,10 @@
  *
  * @author lequal
  */
-@XmlRootElement
 public class AnalysisProject {
-    @XmlAttribute
-    public String analysisProjectName;
-    @XmlAttribute
-    public String analysisProjectVersion;
-    @XmlElement
-    public AnalysisInformations analysisInformations;
-    @XmlElement
-    public AnalysisFile[] analysisFile;
-    @XmlElement
-    public AnalysisRule[] analysisRule;
+    private AnalysisInformations analysisInformations;
+    private AnalysisFile[] analysisFile;
+    private AnalysisRule[] analysisRule;
 
     /**
      * Getter for accessing analysis rules (issues).
@@ -50,8 +39,8 @@ public class AnalysisProject {
     public List<AnalysisRule> getAnalysisRules() {
         // Retrieve issues (called rules)
         List<AnalysisRule> rules;
-        if(analysisRule!=null) {
-            rules = Arrays.asList(analysisRule);
+        if(getAnalysisRule() !=null) {
+            rules = Arrays.asList(getAnalysisRule());
         } else {
             rules = new ArrayList<>();
         }
@@ -65,11 +54,36 @@ public List<AnalysisRule> getAnalysisRules() {
     public List<AnalysisFile> getAnalysisFiles() {
         // Retrieve files
         List<AnalysisFile> files;
-        if(analysisFile!=null) {
-            files = Arrays.asList(analysisFile);
+        if(getAnalysisFile() !=null) {
+            files = Arrays.asList(getAnalysisFile());
         } else {
             files = new ArrayList<>();
         }
         return files;
     }
+
+
+    public AnalysisInformations getAnalysisInformations() {
+        return analysisInformations;
+    }
+
+    public void setAnalysisInformations(AnalysisInformations analysisInformations) {
+        this.analysisInformations = analysisInformations;
+    }
+
+    public AnalysisFile[] getAnalysisFile() {
+        return analysisFile;
+    }
+
+    public void setAnalysisFile(AnalysisFile[] analysisFile) {
+        this.analysisFile = analysisFile;
+    }
+
+    public AnalysisRule[] getAnalysisRule() {
+        return analysisRule;
+    }
+
+    public void setAnalysisRule(AnalysisRule[] analysisRule) {
+        this.analysisRule = analysisRule;
+    }
 }