Fix 2 for #43 and #42

uartois · Nov 30, 2017 · adc4e1c · adc4e1c
1 parent 5748779
commit adc4e1c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@
 	<!-- it's recommended to follow the pattern "sonar-{key}-plugin", for example 
 		"sonar-php-plugin" -->
 	<artifactId>sonar-golang-plugin</artifactId>
-	<version>1.2.11-rc5</version>
+	<version>1.2.11-rc6</version>
 
 
 	<name>Golang</name>

diff --git a/src/main/java/fr/univartois/sonargo/core/rules/GoLintIssueLoaderSensor.java b/src/main/java/fr/univartois/sonargo/core/rules/GoLintIssueLoaderSensor.java
@@ -34,6 +34,7 @@
 import javax.xml.stream.XMLStreamException;
 
 import org.apache.commons.lang3.StringUtils;
+import org.sonar.api.batch.fs.FilePredicates;
 import org.sonar.api.batch.fs.FileSystem;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.sensor.Sensor;
@@ -141,10 +142,10 @@ protected void parseAndSaveResults(final File file) throws XMLStreamException, P
 
     private void getResourceAndSaveIssue(final GoError error) {
 
-	InputFile inputFile = fileSystem.inputFile(fileSystem.predicates()
-		.and(fileSystem.predicates().or(fileSystem.predicates().hasRelativePath(error.getFilePath()),
-			fileSystem.predicates().hasAbsolutePath(error.getFilePath()),
-			fileSystem.predicates().hasType(InputFile.Type.MAIN))));
+	FilePredicates predicates = fileSystem.predicates();
+
+	InputFile inputFile = fileSystem.inputFile(
+		predicates.and(predicates.hasPath(error.getFilePath()), predicates.hasType(InputFile.Type.MAIN)));
 
 	GoKeyRule.init();
 	if (inputFile != null) {