Remove useless code

Author: louisjdmartin

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

@@ -25,26 +25,8 @@
  * @author lequal
  */
 public class AnalysisInformations {
-    private String analysisConfigurationId;
-    private String analysisDate;
     private String author;
 
-    public String getAnalysisConfigurationId() {
-        return analysisConfigurationId;
-    }
-
-    public void setAnalysisConfigurationId(String analysisConfigurationId) {
-        this.analysisConfigurationId = analysisConfigurationId;
-    }
-
-    public String getAnalysisDate() {
-        return analysisDate;
-    }
-
-    public void setAnalysisDate(String analysisDate) {
-        this.analysisDate = analysisDate;
-    }
-
     public String getAuthor() {
         return author;
     }

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

@@ -28,8 +28,6 @@
  * @author lequal
  */
 public class AnalysisProject {
-    private String analysisProjectName;
-    private String analysisProjectVersion;
     private AnalysisInformations analysisInformations;
     private AnalysisFile[] analysisFile;
     private AnalysisRule[] analysisRule;
@@ -64,21 +62,6 @@ public List<AnalysisFile> getAnalysisFiles() {
         return files;
     }
 
-    public String getAnalysisProjectName() {
-        return analysisProjectName;
-    }
-
-    public void setAnalysisProjectName(String analysisProjectName) {
-        this.analysisProjectName = analysisProjectName;
-    }
-
-    public String getAnalysisProjectVersion() {
-        return analysisProjectVersion;
-    }
-
-    public void setAnalysisProjectVersion(String analysisProjectVersion) {
-        this.analysisProjectVersion = analysisProjectVersion;
-    }
 
     public AnalysisInformations getAnalysisInformations() {
         return analysisInformations;

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

@@ -25,22 +25,12 @@
  */
 public class Result {
 
-    private String resultId;
     private String fileName;
     private String resultLine;
     private String resultTypePlace;
-    private String resultNamePlace;
     private String resultValue;
     private String resultMessage;
 
-    public String getResultId() {
-        return resultId;
-    }
-
-    public void setResultId(String resultId) {
-        this.resultId = resultId;
-    }
-
     public String getFileName() {
         return fileName;
     }
@@ -65,14 +55,6 @@ public void setResultTypePlace(String resultTypePlace) {
         this.resultTypePlace = resultTypePlace;
     }
 
-    public String getResultNamePlace() {
-        return resultNamePlace;
-    }
-
-    public void setResultNamePlace(String resultNamePlace) {
-        this.resultNamePlace = resultNamePlace;
-    }
-
     public String getResultValue() {
         return resultValue;
     }

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

@@ -30,15 +30,7 @@ public class Rule {
 
     private String key;
     private String name;
-    private String internalKey;
-    private String description;
-    private String severity;
-    private String cardinality;
-    private String status;
     private String type;
-    private String tag;
-    private String remediationFunction;
-    private String remediationFunctionBaseEffort;
 
     public String getKey() {
         return key;
@@ -56,75 +48,11 @@ public void setName(String name) {
         this.name = name;
     }
 
-    public String getInternalKey() {
-        return internalKey;
-    }
-
-    public void setInternalKey(String internalKey) {
-        this.internalKey = internalKey;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getSeverity() {
-        return severity;
-    }
-
-    public void setSeverity(String severity) {
-        this.severity = severity;
-    }
-
-    public String getCardinality() {
-        return cardinality;
-    }
-
-    public void setCardinality(String cardinality) {
-        this.cardinality = cardinality;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
     public String getType() {
         return type;
     }
 
     public void setType(String type) {
         this.type = type;
     }
-
-    public String getTag() {
-        return tag;
-    }
-
-    public void setTag(String tag) {
-        this.tag = tag;
-    }
-
-    public String getRemediationFunction() {
-        return remediationFunction;
-    }
-
-    public void setRemediationFunction(String remediationFunction) {
-        this.remediationFunction = remediationFunction;
-    }
-
-    public String getRemediationFunctionBaseEffort() {
-        return remediationFunctionBaseEffort;
-    }
-
-    public void setRemediationFunctionBaseEffort(String remediationFunctionBaseEffort) {
-        this.remediationFunctionBaseEffort = remediationFunctionBaseEffort;
-    }
 }

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

@@ -46,19 +46,12 @@ public class RulesDefinition {
     public List<Rule> getRules() {
         // Retrieve issues (called rules)
         List<Rule> rules;
-        if(this.getIcodeRules() !=null) {
-            rules = this.getIcodeRules();
+        if(this.icodeRules !=null) {
+            rules = icodeRules;
         } else {
             rules = new ArrayList<>();
         }
         return rules;
     }
 
-    public List<Rule> getIcodeRules() {
-        return icodeRules;
-    }
-
-    public void setIcodeRules(List<Rule> icodeRules) {
-        this.icodeRules = icodeRules;
-    }
 }

src/test/java/fr/cnes/sonar/plugins/icode/check/ICodeSensorTest.java

@@ -200,8 +200,6 @@ public void test_save_issue() {
         rule.getResult().setResultValue("3");
         rule.getResult().setResultLine("4");
         rule.getResult().setResultTypePlace("class");
-        rule.getResult().setResultNamePlace("yolo");
-        rule.getResult().setResultId("11");
         rule.getResult().setResultMessage("Small file");
 
         ICodeSensor.saveIssue(context, files, rule);
@@ -216,8 +214,6 @@ public void test_save_issue_with_unknown_file() {
         rule.getResult().setResultValue("3");
         rule.getResult().setResultLine("110");
         rule.getResult().setResultTypePlace("class");
-        rule.getResult().setResultNamePlace("yolo");
-        rule.getResult().setResultId("11");
         rule.getResult().setResultMessage("Small file");
 
         ICodeSensor.saveIssue(context, files, rule);

src/test/java/fr/cnes/sonar/plugins/icode/measures/ICodeMetricsProcessorTest.java

@@ -92,8 +92,6 @@ public void test_save_nominal_measures() {
         rule.getResult().setResultValue("3");
         rule.getResult().setResultLine("3");
         rule.getResult().setResultTypePlace("class");
-        rule.getResult().setResultNamePlace("yolo");
-        rule.getResult().setResultId("11");
         rule.getResult().setResultMessage("Small file");
         final String key = bash_sh.key();
 
@@ -110,8 +108,6 @@ public void test_save_line_of_comment_measures() {
         rule.getResult().setResultValue("3");
         rule.getResult().setResultLine("3");
         rule.getResult().setResultTypePlace("class");
-        rule.getResult().setResultNamePlace("yolo");
-        rule.getResult().setResultId("11");
         rule.getResult().setResultMessage("Small file");
         final String key = bash_sh.key();
 
@@ -128,8 +124,6 @@ public void test_save_shell_complexity_measures() {
         rule.getResult().setResultValue("3");
         rule.getResult().setResultLine("3");
         rule.getResult().setResultTypePlace("class");
-        rule.getResult().setResultNamePlace("yolo");
-        rule.getResult().setResultId("11");
         rule.getResult().setResultMessage("Small file");
         final String key = bash_sh.key();
 
@@ -146,8 +140,6 @@ public void test_save_other_measures() {
         rule.getResult().setResultValue("3");
         rule.getResult().setResultLine("3");
         rule.getResult().setResultTypePlace("class");
-        rule.getResult().setResultNamePlace("yolo");
-        rule.getResult().setResultId("11");
         rule.getResult().setResultMessage("Small file");
         final String key = bash_sh.key();
 
@@ -164,8 +156,6 @@ public void test_save_other_measures_on_inexistant_file() {
         rule.getResult().setResultValue("3");
         rule.getResult().setResultLine("3");
         rule.getResult().setResultTypePlace("class");
-        rule.getResult().setResultNamePlace("yolo");
-        rule.getResult().setResultId("11");
         rule.getResult().setResultMessage("Small file");
         final String key = bash_sh.key();
 
@@ -185,8 +175,6 @@ public void test_compute_complexity() {
         rule.getResult().setResultValue("3");
         rule.getResult().setResultLine("3");
         rule.getResult().setResultTypePlace("method");
-        rule.getResult().setResultNamePlace("yolo");
-        rule.getResult().setResultId("11");
         rule.getResult().setResultMessage("Small file");
 
         project.setAnalysisRule(new AnalysisRule[]{rule});
@@ -207,8 +195,6 @@ public void test_compute_nesting() {
         rule.getResult().setResultValue("3");
         rule.getResult().setResultLine("3");
         rule.getResult().setResultTypePlace("method");
-        rule.getResult().setResultNamePlace("yolo");
-        rule.getResult().setResultId("11");
         rule.getResult().setResultMessage("Small file");
 
         project.setAnalysisRule(new AnalysisRule[]{rule});
@@ -229,8 +215,6 @@ public void test_compute_functions() {
         rule.getResult().setResultValue("3");
         rule.getResult().setResultLine("3");
         rule.getResult().setResultTypePlace("method");
-        rule.getResult().setResultNamePlace("yolo");
-        rule.getResult().setResultId("11");
         rule.getResult().setResultMessage("Small file");
 
         project.setAnalysisRule(new AnalysisRule[]{rule});
@@ -252,8 +236,6 @@ public void test_compute_comment() {
         rule.getResult().setResultValue("20");
         rule.getResult().setResultLine("3");
         rule.getResult().setResultTypePlace("method");
-        rule.getResult().setResultNamePlace("yolo");
-        rule.getResult().setResultId("11");
         rule.getResult().setResultMessage("Small file");
 
         rule2.setResult(new Result());
@@ -262,8 +244,6 @@ public void test_compute_comment() {
         rule2.getResult().setResultValue("50");
         rule2.getResult().setResultLine("3");
         rule2.getResult().setResultTypePlace("method");
-        rule2.getResult().setResultNamePlace("yolo");
-        rule2.getResult().setResultId("11");
         rule2.getResult().setResultMessage("Small file");
 
         project.setAnalysisRule(new AnalysisRule[]{rule, rule2});

src/test/java/fr/cnes/sonar/plugins/icode/model/ModelTest.java

@@ -36,11 +36,7 @@ public void before() {
         project = new AnalysisProject();
 
         project.setAnalysisInformations(new AnalysisInformations());
-        project.getAnalysisInformations().setAnalysisConfigurationId("azerty");
-        project.getAnalysisInformations().setAnalysisDate("10/10/10");
         project.getAnalysisInformations().setAuthor("Me");
-        project.setAnalysisProjectName("My Project");
-        project.setAnalysisProjectVersion("1.0");
 
         file = new AnalysisFile();
         file.setFileName("foo.sh");
@@ -50,24 +46,14 @@ public void before() {
         rule.setAnalysisRuleId("WOW");
         rule.setResult(new Result());
         rule.getResult().setFileName("a");
-        rule.getResult().setResultId("z");
         rule.getResult().setResultLine("e");
         rule.getResult().setResultMessage("r");
-        rule.getResult().setResultNamePlace("t");
         rule.getResult().setResultTypePlace("y");
         rule.getResult().setResultValue("u");
 
         check = new Rule();
         check.setKey("a");
-        check.setCardinality("a");
-        check.setDescription("a");
-        check.setInternalKey("a");
         check.setName("a");
-        check.setRemediationFunction("a");
-        check.setRemediationFunctionBaseEffort("a");
-        check.setSeverity("a");
-        check.setStatus("a");
-        check.setTag("a");
         check.setType("a");
 
         rulesDefinition = new RulesDefinition();
@@ -78,10 +64,6 @@ public void test_getters() {
         Assert.assertEquals(0, project.getAnalysisFiles().size());
         Assert.assertEquals(0, project.getAnalysisRules().size());
         Assert.assertEquals(0, rulesDefinition.getRules().size());
-        ArrayList<Rule> rules = new ArrayList<>();
-        rules.add(check);
-        rulesDefinition.setIcodeRules(new ArrayList(rules));
-        Assert.assertEquals(1, rulesDefinition.getRules().size());
     }
 
     @Test