Remove useless warning when a source file suffix is declared by several languages

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 a1e14f618ee7edbf8568a9035709eea7bfadf857..fa8269afaadf404689aecff5752910c9e8da6eaf 100644 (file)
--- 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 209f515f2cb14faea14c010d859fd2de623fbb03..3903cd11df069f933ffa85776e22a9fd07b2cc4a 100644 (file)
--- 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
@@ -68,22 +68,6 @@ public class LanguageRecognizerTest {
     recognizer.stop();
   }
 
-  @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")));