Merge pull request #21 from c-a-services/Changing_extension_in_config_still_scanning_.xml_files_#20

Changing extension in config still scanning .xml files #20

Author: fperezpa

src/main/java/com/mulesoft/services/tools/sonarqube/filter/MuleFilePredicate.java

@@ -11,26 +11,36 @@
 import org.sonar.api.utils.log.Loggers;
 
 public class MuleFilePredicate implements FilePredicate {
+
 	private final Logger logger = Loggers.get(MuleFilePredicate.class);
 	SAXBuilder saxBuilder = new SAXBuilder();
 	String muleNamespace = "http://www.mulesoft.org/schema/mule/core";
-	String fileExtension = ".xml";
+	String[] fileExtensions;
+	/**
+	 * 
+	 */
+	public MuleFilePredicate(String[] aFileSuffixes) {
+		super();
+		fileExtensions = aFileSuffixes;
+	}
 
 	@Override
 	public boolean apply(InputFile inputFile) {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Executing Mule Sensor on file:" + inputFile.filename());
 		}
 
-		if (inputFile.filename().endsWith(fileExtension)) {
-			try {
-				Document document = saxBuilder.build(inputFile.inputStream());
-
-				String namespace = document.getRootElement().getNamespaceURI();
-				if (muleNamespace.equals(namespace))
-					return true;
-			} catch (JDOMException | IOException e) {
-				logger.error("Parsing document:" + inputFile.filename(), e);
+		for (String fileExtension : fileExtensions) {
+			if (inputFile.filename().endsWith(fileExtension)) {
+				try {
+					Document document = saxBuilder.build(inputFile.inputStream());
+	
+					String namespace = document.getRootElement().getNamespaceURI();
+					if (muleNamespace.equals(namespace))
+						return true;
+				} catch (JDOMException | IOException e) {
+					logger.error("Parsing document:" + inputFile.filename(), e);
+				}
 			}
 		}
 		return false;

src/main/java/com/mulesoft/services/tools/sonarqube/metrics/AbstractMuleSensor.java

@@ -7,6 +7,7 @@
 import org.sonar.api.batch.sensor.SensorContext;
 
 import com.mulesoft.services.tools.sonarqube.filter.MuleFilePredicate;
+import com.mulesoft.services.tools.sonarqube.language.MuleLanguage;
 import com.mulesoft.services.tools.sonarqube.sensor.MuleSensor;
 
 public abstract class AbstractMuleSensor implements Sensor {
@@ -18,7 +19,7 @@ public void execute(SensorContext context) {
 
 		FileSystem fs = context.fileSystem();
 		// Only ConfigurationFiles
-		Iterable<InputFile> files = fs.inputFiles(new MuleFilePredicate());
+		Iterable<InputFile> files = fs.inputFiles(new MuleFilePredicate(new MuleLanguage(context.config()).getFileSuffixes()));
 		for (InputFile file : files) {
 			process(context, file, MuleSensor.getLanguage(context));
 		}

src/main/java/com/mulesoft/services/tools/sonarqube/metrics/CoverageSensor.java

@@ -62,7 +62,7 @@ public void execute(SensorContext context) {
 					MuleProperties.getProperties(MuleSensor.getLanguage(context)), munitJsonReport);
 			FileSystem fs = context.fileSystem();
 			// Only ConfigurationFiles
-			Iterable<InputFile> files = fs.inputFiles(new MuleFilePredicate());
+			Iterable<InputFile> files = fs.inputFiles(new MuleFilePredicate(new MuleLanguage(context.config()).getFileSuffixes()));
 			for (InputFile file : files) {
 				saveCoverage(coverage, file.filename(), context, file);
 			}

src/main/java/com/mulesoft/services/tools/sonarqube/sensor/MuleSensor.java

@@ -49,7 +49,7 @@ public void execute(SensorContext context) {
 
 		FilePredicates p = fs.predicates();
 		Map<RuleKey, List<NewIssue>> issues = new HashMap<RuleKey, List<NewIssue>>();
-		fs.inputFiles(p.and(p.hasLanguage(MuleLanguage.LANGUAGE_KEY), new MuleFilePredicate()))
+		fs.inputFiles(p.and(p.hasLanguage(MuleLanguage.LANGUAGE_KEY), new MuleFilePredicate(new MuleLanguage(context.config()).getFileSuffixes())))
 				.forEach(new SonarRuleConsumer(getLanguage(context), context, issues));
 
 		// Iterate and save all the issues