Search rules into repository. Add COM.DEFAULT for unknown rules

Author: CfrancCyrille

src/main/java/fr/cnes/sonarqube/plugins/icode/report/AnalysisProject.java

@@ -3,13 +3,21 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.sonar.api.utils.log.Logger;
+import org.sonar.api.utils.log.Loggers;
+
+import fr.cnes.sonarqube.plugins.icode.measures.ICodeSensor;
+import fr.cnes.sonarqube.plugins.icode.rules.ICodeRulesDefinition;
+
 /**
  * 
  * @author Cyrille FRANCOIS
  *
  */
 public class AnalysisProject implements ReportInterface{
 
+	private static final Logger LOGGER = Loggers.get(AnalysisProject.class);
+	
 	static final String ANALYSIS_PROJECT_NAME = "analysisProjectName";
 	static final String ANALYSIS_PROJECT_VERSION = "analysisProjectVersion";
 
@@ -188,17 +196,10 @@ public ErrorInterface[] getErrors() {
 					if(isUnexpectedRule(analysisRule)){
 
 						// Unexcepted rule analyse is save as a COM.DEFAULT rule issue...
-						if(this.isF77()){
-							analysisRule.analysisRuleId = AnalysisRule.F77+"COM.DEFAULT";
-						}
-						if(this.isF90()){
-							analysisRule.analysisRuleId = AnalysisRule.F77+"COM.DEFAULT";
-						}
-						else{
-							analysisRule.analysisRuleId = AnalysisRule.SHELL+"COM.DEFAULT";
-						}	
+						analysisRule.analysisRuleId = "COM.DEFAULT";	
 					}
 					listOfRes.add(analysisRule);
+					LOGGER.debug("AnalysisRule: "+analysisRule.toString());
 				}
 			}
 		}
@@ -208,9 +209,12 @@ public ErrorInterface[] getErrors() {
 
 	private boolean isUnexpectedRule(AnalysisRule analysisRule){
 		boolean res=true;
-		if(analysisRule.analysisRuleId.equals("COM.DATA.FloatCompare")){
-			res=false;
-		}
+		
+//		if(analysisRule.analysisRuleId.equals("COM.DATA.FloatCompare")){
+//			res=false;
+//		}
+		res = !ICodeRulesDefinition.existRule(analysisRule.analysisRuleId);
+		
 		return res;
 	}	
 

src/main/java/fr/cnes/sonarqube/plugins/icode/report/AnalysisRule.java

@@ -55,7 +55,7 @@ public String getComplexity() {
 	@Override
 	public String getLineDescriptor() {
 		// TODO Auto-generated method stub
-		return "";
+		return result.resultLine;
 	}
 
 	@Override
@@ -66,8 +66,11 @@ public String getRuleKey() {
 
 	@Override
 	public String getDescription() {
-		// TODO Auto-generated method stub
-		return "";
+		String res="";
+		if(result != null && result.resultValue != null){
+			res = result.resultValue;
+		}
+		return res;
 	}
 
 

src/main/java/fr/cnes/sonarqube/plugins/icode/rules/ICodeRulesDefinition.java

@@ -21,9 +21,13 @@
 
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 
 import org.sonar.api.server.rule.RulesDefinition;
 import org.sonar.api.server.rule.RulesDefinitionXmlLoader;
+import org.sonar.api.server.rule.RulesDefinition.NewRule;
 
 import fr.cnes.sonarqube.plugins.icode.languages.ICodeLanguage;
 
@@ -43,6 +47,7 @@ public final class ICodeRulesDefinition implements RulesDefinition {
 	protected static final String REPO_NAME = ICodeLanguage.NAME;
 
 	private static NewRepository repository;
+	private static List<String> allRuleIds = new ArrayList<String>();
 
 	protected String rulesDefinitionFilePath() {
 		return PATH_TO_RULES_XML;
@@ -57,8 +62,12 @@ private void defineRulesForLanguage(Context context, String repositoryKey, Strin
 			RulesDefinitionXmlLoader rulesLoader = new RulesDefinitionXmlLoader();
 			rulesLoader.load(repository, rulesXml, StandardCharsets.UTF_8.name());
 		}
-
 		repository.done();
+		Collection<NewRule> col = repository.rules();
+		allRuleIds = new ArrayList<String>();
+		for (NewRule newRule : col) {
+			allRuleIds.add(newRule.key());
+		}
 	}
 
 	@Override
@@ -69,4 +78,8 @@ public void define(Context context) {
 	public static String getRepositoryKeyForLanguage() {
 		    return ICodeLanguage.KEY + "-" + KEY;
 	 }
+	
+	public static boolean existRule(String analysisRuleId){
+		return allRuleIds.contains(analysisRuleId);
+	}
 }