Replace JAXB with XStream and udpdate to JDK11

louisjdmartin · Sancretor · commit 6e866297218e · 2019-09-09T11:37:30.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,8 @@ sudo: false
 install: true
 
 jdk:
-  - oraclejdk8
+  - openjdk8
+  - openjdk11
 
 cache:
   directories:
diff --git a/pom.xml b/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>
diff --git a/src/main/java/fr/cnes/sonar/plugins/icode/check/ICodeSensor.java b/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,7 +114,7 @@ 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);
@@ -133,7 +134,7 @@ public void execute(SensorContext sensorContext) {
 
                 ICodeMetricsProcessor.saveExtraMeasures(sensorContext, scannedFiles, analysisProject);
 
-            } catch (JAXBException e) {
+            } catch (FileNotFoundException e) {
                 LOGGER.error(e.getMessage(), e);
                 sensorContext.newAnalysisError().message(e.getMessage()).save();
             }
diff --git a/src/main/java/fr/cnes/sonar/plugins/icode/languages/ICodeQualityProfiles.java b/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.key);
         }
         // Save the default profile.
         defaultProfile.setDefault(true);
diff --git a/src/main/java/fr/cnes/sonar/plugins/icode/model/AnalysisFile.java b/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,6 @@
  * @author lequal
  */
 public class AnalysisFile {
-    @XmlAttribute
     public String language;
-    @XmlAttribute
     public String fileName;
 }
diff --git a/src/main/java/fr/cnes/sonar/plugins/icode/model/AnalysisInformations.java b/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,7 @@
  * @author lequal
  */
 public class AnalysisInformations {
-    @XmlAttribute
     public String analysisConfigurationId;
-    @XmlAttribute
     public String analysisDate;
-    @XmlAttribute
     public String author;
 }
diff --git a/src/main/java/fr/cnes/sonar/plugins/icode/model/AnalysisProject.java b/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,17 +27,11 @@
  *
  * @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;
 
     /**
diff --git a/src/main/java/fr/cnes/sonar/plugins/icode/model/AnalysisRule.java b/src/main/java/fr/cnes/sonar/plugins/icode/model/AnalysisRule.java
@@ -16,8 +16,6 @@
  */
 package fr.cnes.sonar.plugins.icode.model;
 
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
 
 /**
  * Class used to unmarshal i-Code xml file.
@@ -28,9 +26,7 @@
  */
 public class AnalysisRule {
 
-    @XmlAttribute
     public String analysisRuleId;
-    @XmlElement
     public Result result;
 
 }
diff --git a/src/main/java/fr/cnes/sonar/plugins/icode/model/Result.java b/src/main/java/fr/cnes/sonar/plugins/icode/model/Result.java
@@ -16,9 +16,6 @@
  */
 package fr.cnes.sonar.plugins.icode.model;
 
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-
 /**
  * Class used to unmarshal i-Code xml file.
  *
@@ -28,19 +25,12 @@
  */
 public class Result {
 
-    @XmlAttribute
     public String resultId;
-    @XmlAttribute
     public String fileName;
-    @XmlAttribute
     public String resultLine;
-    @XmlAttribute
     public String resultTypePlace;
-    @XmlAttribute
     public String resultNamePlace;
-    @XmlAttribute
     public String resultValue;
-    @XmlElement
     public String resultMessage;
 
 }
diff --git a/src/main/java/fr/cnes/sonar/plugins/icode/model/Rule.java b/src/main/java/fr/cnes/sonar/plugins/icode/model/Rule.java
@@ -17,7 +17,6 @@
  */
 package fr.cnes.sonar.plugins.icode.model;
 
-import javax.xml.bind.annotation.XmlElement;
 
 /**
  * Class used to unmarshal i-Code xml file.
@@ -28,27 +27,17 @@
  */
 public class Rule {
 
-    @XmlElement
+
     public String key;
-    @XmlElement
     public String name;
-    @XmlElement
     public String internalKey;
-    @XmlElement
     public String description;
-    @XmlElement
     public String severity;
-    @XmlElement
     public String cardinality;
-    @XmlElement
     public String status;
-    @XmlElement
     public String type;
-    @XmlElement
     public String tag;
-    @XmlElement
     public String remediationFunction;
-    @XmlElement
     public String remediationFunctionBaseEffort;
 
 }
diff --git a/src/main/java/fr/cnes/sonar/plugins/icode/model/RulesDefinition.java b/src/main/java/fr/cnes/sonar/plugins/icode/model/RulesDefinition.java
@@ -16,10 +16,12 @@
  */
 package fr.cnes.sonar.plugins.icode.model;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamImplicitCollection;
+import com.thoughtworks.xstream.annotations.XStreamInclude;
+
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -29,21 +31,23 @@
  *
  * @author lequal
  */
-@XmlRootElement(name = "icodelint-rules")
+@XStreamAlias("icodelint-rules")
+@XStreamImplicitCollection("icodeRules")
+@XStreamInclude(Rule.class)
 public class RulesDefinition {
 
-    @XmlElement( name = "rule" )
-    public Rule[] icodeRules;
+    @XStreamAlias("rule")
+    public List<Rule> icodeRules;
 
     /**
-     * Getter for accessing rules (definition).
+     * Getter for accessing definedRules (definition).
      * @return A list of Rule.
      */
     public List<Rule> getRules() {
         // Retrieve issues (called rules)
         List<Rule> rules;
-        if(icodeRules!=null) {
-            rules = Arrays.asList(icodeRules);
+        if(this.icodeRules !=null) {
+            rules = this.icodeRules;
         } else {
             rules = new ArrayList<>();
         }
diff --git a/src/main/java/fr/cnes/sonar/plugins/icode/model/XmlHandler.java b/src/main/java/fr/cnes/sonar/plugins/icode/model/XmlHandler.java
@@ -16,10 +16,9 @@
  */
 package fr.cnes.sonar.plugins.icode.model;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-import java.io.File;
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.mapper.MapperWrapper;
+
 import java.io.InputStream;
 
 /**
@@ -36,34 +35,32 @@ public class XmlHandler {
      */
     private XmlHandler(){}
 
-    /**
-     * This method use JAXB to unmarshal XML report: it transform simply
-     * XML into our Java Object by reading annotations on model classes.
-     *
-     * @param file File descriptor of the report to import as Java Objects.
-     * @param cls Destination class for unmarshalling.
-     * @return AnalysisReport: the main structure of the report.
-     * @throws JAXBException Exception during conversion can be met.
-     */
-    public static Object unmarshal(final File file, final Class<?> cls) throws JAXBException {
-        final JAXBContext jaxbContext = JAXBContext.newInstance(cls);
-        final Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller();
-        return jaxbUnmarshaller.unmarshal(file);
-    }
 
     /**
-     * This method use JAXB to unmarshal XML report: it transform simply
+     * This method use XStream to unmarshal XML report: it transform simply
      * XML into our Java Object by reading annotations on model classes.
      *
      * @param file Stream of the xml file to import as Java Objects.
      * @param cls Destination class for unmarshalling.
      * @return AnalysisReport: the main structure of the report.
-     * @throws JAXBException Exception during conversion can be met.
      */
-    public static Object unmarshal(final InputStream file, final Class<?> cls) throws JAXBException {
-        final JAXBContext jaxbContext = JAXBContext.newInstance(cls);
-        final Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller();
-        return jaxbUnmarshaller.unmarshal(file);
+    public static Object unmarshal(final InputStream file, final Class<?> cls){
+        XStream xStream = new XStream() {
+            @Override
+            protected MapperWrapper wrapMapper(MapperWrapper next) {
+                return new MapperWrapper(next) {
+                    @Override
+                    public boolean shouldSerializeMember(Class definedIn, String fieldName) {
+                        if (definedIn == Object.class) {
+                            return false;
+                        }
+                        return super.shouldSerializeMember(definedIn, fieldName);
+                    }
+                };
+            }
+        };
+        xStream.processAnnotations(cls);
+        return xStream.fromXML(file);
     }
 
 }
diff --git a/src/test/java/fr/cnes/sonar/plugins/icode/check/ICodeSensorTest.java b/src/test/java/fr/cnes/sonar/plugins/icode/check/ICodeSensorTest.java
@@ -167,9 +167,9 @@ protected int runICode(final String command) {
     public void test_run_a_command() throws IOException, InterruptedException {
         final ICodeSensor sensor = new ICodeSensor();
 
-        final int value = sensor.runICode("java --version");
+        final int value = sensor.runICode("java -version");
         
-        Assert.assertEquals(1, value);
+        Assert.assertEquals(0, value);
     }
 
     @Test
diff --git a/src/test/java/fr/cnes/sonar/plugins/icode/model/ModelTest.java b/src/test/java/fr/cnes/sonar/plugins/icode/model/ModelTest.java
