SONAR-3572 Remove useless property 'sonar.findbugs.generateXml'

3 files changed, 4 insertions, 28 deletions

diff --git a/plugins/sonar-findbugs-plugin/src/main/java/org/sonar/plugins/findbugs/FindbugsConfiguration.java b/plugins/sonar-findbugs-plugin/src/main/java/org/sonar/plugins/findbugs/FindbugsConfiguration.java
index 70eb010cc2b..a71516c92f6 100644
--- a/plugins/sonar-findbugs-plugin/src/main/java/org/sonar/plugins/findbugs/FindbugsConfiguration.java
+++ b/plugins/sonar-findbugs-plugin/src/main/java/org/sonar/plugins/findbugs/FindbugsConfiguration.java
@@ -33,8 +33,6 @@ import org.sonar.plugins.findbugs.xml.ClassFilter;
 import org.sonar.plugins.findbugs.xml.FindBugsFilter;
 import org.sonar.plugins.findbugs.xml.Match;
 
-import javax.annotation.CheckForNull;
-
 import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
@@ -58,12 +56,8 @@ public class FindbugsConfiguration implements BatchExtension {
     this.projectClasspath = classpath;
   }
 
-  @CheckForNull
   public File getTargetXMLReport() {
-    if (settings.getBoolean(FindbugsConstants.GENERATE_XML_KEY)) {
-      return new File(project.getFileSystem().getSonarWorkingDirectory(), "findbugs-result.xml");
-    }
-    return null;
+    return new File(project.getFileSystem().getSonarWorkingDirectory(), "findbugs-result.xml");
   }
 
   public edu.umd.cs.findbugs.Project getFindbugsProject() {
diff --git a/plugins/sonar-findbugs-plugin/src/main/java/org/sonar/plugins/findbugs/FindbugsConstants.java b/plugins/sonar-findbugs-plugin/src/main/java/org/sonar/plugins/findbugs/FindbugsConstants.java
index 5ba5b7963b2..0a228badda5 100644
--- a/plugins/sonar-findbugs-plugin/src/main/java/org/sonar/plugins/findbugs/FindbugsConstants.java
+++ b/plugins/sonar-findbugs-plugin/src/main/java/org/sonar/plugins/findbugs/FindbugsConstants.java
@@ -29,12 +29,6 @@ public final class FindbugsConstants {
   public static final String PLUGIN_KEY = CoreProperties.FINDBUGS_PLUGIN;
 
   /**
-   * @since 2.4
-   */
-  public static final String GENERATE_XML_KEY = "sonar.findbugs.generateXml";
-  public static final boolean GENERATE_XML_DEFAULT_VALUE = true; // TODO should be false - see SONAR-1880
-
-  /**
    * @since 2.10
    */
   public static final String EXCLUDES_FILTERS_PROPERTY = "sonar.findbugs.excludesFilters";
diff --git a/plugins/sonar-findbugs-plugin/src/main/java/org/sonar/plugins/findbugs/FindbugsExecutor.java b/plugins/sonar-findbugs-plugin/src/main/java/org/sonar/plugins/findbugs/FindbugsExecutor.java
index a6db51eabb8..ea5f8844467 100644
--- a/plugins/sonar-findbugs-plugin/src/main/java/org/sonar/plugins/findbugs/FindbugsExecutor.java
+++ b/plugins/sonar-findbugs-plugin/src/main/java/org/sonar/plugins/findbugs/FindbugsExecutor.java
@@ -20,19 +20,11 @@
 package org.sonar.plugins.findbugs;
 
 import com.google.common.collect.Lists;
-import edu.umd.cs.findbugs.DetectorFactoryCollection;
-import edu.umd.cs.findbugs.FindBugs;
-import edu.umd.cs.findbugs.FindBugs2;
-import edu.umd.cs.findbugs.Plugin;
-import edu.umd.cs.findbugs.PluginException;
-import edu.umd.cs.findbugs.Priorities;
-import edu.umd.cs.findbugs.Project;
-import edu.umd.cs.findbugs.XMLBugReporter;
+import edu.umd.cs.findbugs.*;
 import edu.umd.cs.findbugs.config.UserPreferences;
 import edu.umd.cs.findbugs.plugins.DuplicatePluginIdException;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.io.output.NullOutputStream;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -94,12 +86,8 @@ public class FindbugsExecutor implements BatchExtension {
       xmlBugReporter.setAddMessages(true);
 
       File xmlReport = configuration.getTargetXMLReport();
-      if (xmlReport != null) {
-        LOG.info("Findbugs output report: " + xmlReport.getAbsolutePath());
-        xmlOutput = FileUtils.openOutputStream(xmlReport);
-      } else {
-        xmlOutput = new NullOutputStream();
-      }
+      LOG.info("Findbugs output report: " + xmlReport.getAbsolutePath());
+      xmlOutput = FileUtils.openOutputStream(xmlReport);
       xmlBugReporter.setOutputStream(new PrintStream(xmlOutput));
 
       engine.setBugReporter(xmlBugReporter);