diff options
author | Simon Brandhof <simon.brandhof@gmail.com> | 2013-11-06 13:03:50 +0100 |
---|---|---|
committer | Simon Brandhof <simon.brandhof@gmail.com> | 2013-11-06 13:08:49 +0100 |
commit | 7e4c5a386749131ca31c2f056ec831145ced3d06 (patch) | |
tree | d9f298108e08f32b4bec90bb98b768489d5d56ad /sonar-batch | |
parent | 107824cc26bbd4be3ec1798c00a4040f1ecf1e7d (diff) | |
download | sonarqube-7e4c5a386749131ca31c2f056ec831145ced3d06.tar.gz sonarqube-7e4c5a386749131ca31c2f056ec831145ced3d06.zip |
Remove useless warning when a source file suffix is declared by several languages
Diffstat (limited to 'sonar-batch')
-rw-r--r-- | sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/LanguageRecognizer.java | 17 | ||||
-rw-r--r-- | sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/LanguageRecognizerTest.java | 16 |
2 files changed, 0 insertions, 33 deletions
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/LanguageRecognizer.java b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/LanguageRecognizer.java index a1e14f618ee..fa8269afaad 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/LanguageRecognizer.java +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/LanguageRecognizer.java @@ -19,19 +19,16 @@ */ package org.sonar.batch.scan.filesystem; -import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.HashMultimap; import com.google.common.collect.SetMultimap; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang.StringUtils; import org.picocontainer.Startable; -import org.slf4j.LoggerFactory; import org.sonar.api.BatchComponent; import org.sonar.api.resources.Language; import org.sonar.api.resources.Project; import javax.annotation.CheckForNull; - import java.io.File; import java.util.Set; @@ -80,20 +77,6 @@ public class LanguageRecognizer implements BatchComponent, Startable { } } } - - for (String extension : langsByExtension.keySet()) { - Set<String> langs = langsByExtension.get(extension); - if (langs.size() > 1) { - warnConflict(extension, langs); - } - } - } - - @VisibleForTesting - void warnConflict(String extension, Set<String> langs) { - LoggerFactory.getLogger(LanguageRecognizer.class).warn(String.format( - "File extension '%s' is declared by several plugins: %s", extension, StringUtils.join(langs, ", ") - )); } @Override diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/LanguageRecognizerTest.java b/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/LanguageRecognizerTest.java index 209f515f2cb..3903cd11df0 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/LanguageRecognizerTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/LanguageRecognizerTest.java @@ -69,22 +69,6 @@ public class LanguageRecognizerTest { } @Test - public void fail_if_conflict_of_file_extensions() throws Exception { - Language[] languages = new Language[] {new MockLanguage("java", "java"), new MockLanguage("java2", "java", "java2")}; - - LanguageRecognizer recognizer = spy(new LanguageRecognizer(newProject("java"), languages)); - recognizer.start(); - - verify(recognizer).warnConflict(eq("java"), argThat(new ArgumentMatcher<Set<String>>() { - @Override - public boolean matches(Object o) { - Set<String> set = (Set<String>) o; - return set.contains("java") && set.contains("java2") && set.size() == 2; - } - })); - } - - @Test public void should_not_fail_if_no_language() throws Exception { LanguageRecognizer recognizer = spy(new LanguageRecognizer(newProject("java"))); recognizer.start(); |