Refactoring of the rules storing

Author: diegorodriguez31

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

@@ -17,6 +17,8 @@
 package fr.cnes.sonar.plugins.icode.languages;
 
 import fr.cnes.sonar.plugins.icode.rules.ICodeRulesDefinition;
+import fr.cnes.sonar.plugins.icode.rules.RulesRepository;
+
 import org.sonar.api.server.profile.BuiltInQualityProfilesDefinition;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
@@ -35,15 +37,18 @@ public final class ICodeQualityProfiles implements BuiltInQualityProfilesDefinit
     /** Display name for the built-in quality profile. **/
     private static final String I_CODE_RULES_PROFILE_NAME = "Sonar way";
 
+    private List<NewRule> f77Rules = RulesRepository.getInstance().getF77Rules();
+    private List<NewRule> f90Rules = RulesRepository.getInstance().getF90Rules();
+
     /**
      * Allow to create a plugin.
      *
      * @param context Context of the plugin.
      */
     @Override
     public void define(final Context context) {
-        createBuiltInProfile(context, ICodeRulesDefinition.FORTRAN77_REPOSITORY, Fortran77Language.KEY, ICodeRulesDefinition.f77Rules);
-        createBuiltInProfile(context, ICodeRulesDefinition.FORTRAN90_REPOSITORY, Fortran90Language.KEY, ICodeRulesDefinition.f90Rules);
+        createBuiltInProfile(context, ICodeRulesDefinition.FORTRAN77_REPOSITORY, Fortran77Language.KEY, f77Rules);
+        createBuiltInProfile(context, ICodeRulesDefinition.FORTRAN90_REPOSITORY, Fortran90Language.KEY, f90Rules);
     }
 
     /**

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

@@ -27,6 +27,7 @@
 import fr.cnes.sonar.plugins.icode.languages.Fortran77Language;
 import fr.cnes.sonar.plugins.icode.languages.Fortran90Language;
 import fr.cnes.sonar.plugins.icode.settings.ICodePluginProperties;
+import fr.cnes.sonar.plugins.icode.rules.RulesRepository;
 
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -61,9 +62,6 @@ public class ICodeRulesDefinition implements RulesDefinition {
 	/** Path to xml file in resources tree (fortran 90 rules). **/
 	public static final String PATH_TO_F90_RULES_XML = "/rules/icode-f90-rules.xml";
 
-	public static List<NewRule> f77Rules;
-	public static List<NewRule> f90Rules;
-
 	/**
 	 * Define i-Code rules in SonarQube thanks to xml configuration files.
 	 *
@@ -95,11 +93,12 @@ protected void createFortranRepository(final Context context, final String langu
 
 			if (inputFile == null) {
 				repository.done();
-				if (language == FORTRAN77_LANGUAGE) {
-					ICodeRulesDefinition.f77Rules = rules;
+				if (language.equals(FORTRAN77_LANGUAGE)) {
+					RulesRepository.getInstance().setF77Rules(rules);
 				} else {
-					ICodeRulesDefinition.f90Rules = rules;
+					RulesRepository.getInstance().setF90Rules(rules);
 				}
+				
 			}
 
 			DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
@@ -143,11 +142,11 @@ protected void createFortranRepository(final Context context, final String langu
 		} catch (Exception e) {
 			LOGGER.error("Error while creating rules.", e);
 		}
-		if (language == FORTRAN77_LANGUAGE) {
-			ICodeRulesDefinition.f77Rules = rules;
+		if (language.equals(FORTRAN77_LANGUAGE)) {
+			RulesRepository.getInstance().setF77Rules(rules);
 		} else {
-			ICodeRulesDefinition.f90Rules = rules;
-		}
+			RulesRepository.getInstance().setF90Rules(rules);
+		}		
 	}
 
 	/**

src/main/java/fr/cnes/sonar/plugins/icode/rules/RulesRepository.java

@@ -0,0 +1,40 @@
+package fr.cnes.sonar.plugins.icode.rules;
+
+import java.util.List;
+import java.util.ArrayList;
+import org.sonar.api.server.rule.RulesDefinition.NewRule;
+
+public class RulesRepository {
+    private static RulesRepository instance = null;
+
+    private List<NewRule> f77Rules;
+    private List<NewRule> f90Rules;
+
+    private RulesRepository() {
+        this.f77Rules = new ArrayList<>();
+        this.f90Rules = new ArrayList<>();
+    }
+
+    public static RulesRepository getInstance() {
+        if (instance == null) {
+            instance = new RulesRepository();
+        }
+        return instance;
+    }
+
+    public List<NewRule> getF77Rules() {
+        return f77Rules;
+    }
+
+    public List<NewRule> getF90Rules() {
+        return f90Rules;
+    }
+
+    public void setF77Rules(List<NewRule> f77Rules) {
+        this.f77Rules = f77Rules;
+    }
+
+    public void setF90Rules(List<NewRule> f90Rules) {
+        this.f90Rules = f90Rules;
+    }
+}