Merge pull request #2102 from gradle/sg/findbugs/error

big-guy · web-flow · commit 9a5e1d3c6b9c · 2017-05-24T13:41:54.000-04:00
Do not resolve classes dirs as a file tree
diff --git a/subprojects/code-quality/src/integTest/groovy/org/gradle/api/plugins/quality/AbstractFindBugsPluginIntegrationTest.groovy b/subprojects/code-quality/src/integTest/groovy/org/gradle/api/plugins/quality/AbstractFindBugsPluginIntegrationTest.groovy
@@ -510,6 +510,27 @@ abstract class AbstractFindBugsPluginIntegrationTest extends AbstractIntegration
         result.assertTaskNotSkipped(":findbugsMain")
     }
 
+    def "does not fail if resources are generated into classes"() {
+        given:
+        goodCode()
+        buildFile << """
+            compileJava {
+                doLast {
+                    def manifest = new File(destinationDir, "META-INF/MANIFEST.MF")
+                    manifest.parentFile.mkdirs()
+                    manifest.text = "manifest"
+                    def properties = new File(destinationDir, "com/example/service.properties")
+                    properties.parentFile.mkdirs()
+                    properties.text = "someProp=value"
+                }
+            } 
+        """
+        when:
+        succeeds("check")
+        then:
+        !result.error.contains("Wrong magic bytes")
+    }
+
     private static boolean containsXmlMessages(File xmlReportFile) {
         new XmlSlurper().parseText(xmlReportFile.text).BugInstance.children().collect { it.name() }.containsAll(['ShortMessage', 'LongMessage'])
     }
diff --git a/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/FindBugs.java b/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/FindBugs.java
@@ -328,12 +328,23 @@ public FileTree getSource() {
     @SkipWhenEmpty
     @PathSensitive(PathSensitivity.RELATIVE)
     @InputFiles
+    protected FileCollection getCandidateClassFiles() {
+        // We need to resolve the classes into a set of files so @SkipWhenEmpty will work
+        // Otherwise, a collection of empty directories is not seen as "empty" 
+        return getClasses().getAsFileTree();
+    }
+
+    /**
+     * The class directories to be analyzed.
+     */
+    @Internal
     public FileCollection getClasses() {
         return classes;
     }
 
+
     /**
-     * The classes to be analyzed.
+     * The class directories to be analyzed.
      */
     public void setClasses(FileCollection classes) {
         this.classes = classes;
diff --git a/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/FindBugsPlugin.java b/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/FindBugsPlugin.java
@@ -186,7 +186,7 @@ protected void configureForSourceSet(final SourceSet sourceSet, FindBugs task) {
         taskMapping.map("classes", new Callable<FileCollection>() {
             @Override
             public FileCollection call() {
-                return sourceSet.getOutput().getClassesDirs().getAsFileTree();
+                return sourceSet.getOutput().getClassesDirs();
             }
         });
         taskMapping.map("classpath", new Callable<FileCollection>() {
diff --git a/subprojects/code-quality/src/test/groovy/org/gradle/api/plugins/quality/FindBugsPluginTest.groovy b/subprojects/code-quality/src/test/groovy/org/gradle/api/plugins/quality/FindBugsPluginTest.groovy
@@ -84,7 +84,7 @@ class FindBugsPluginTest extends AbstractProjectBuilderSpec {
             description == "Run FindBugs analysis for ${sourceSet.name} classes"
             source as List == sourceSet.allJava as List
             findbugsClasspath == project.configurations.findbugs
-            classes.empty // no classes to analyze
+            candidateClassFiles.empty // no classes to analyze
             reports.xml.destination == project.file("build/reports/findbugs/${sourceSet.name}.xml")
             !ignoreFailures
             effort == null
diff --git a/subprojects/docs/src/docs/dsl/org.gradle.api.plugins.quality.FindBugs.xml b/subprojects/docs/src/docs/dsl/org.gradle.api.plugins.quality.FindBugs.xml
@@ -10,7 +10,7 @@
             </thead>
             <tr>
                 <td>classes</td>
-                <td><literal><replaceable>sourceSet</replaceable>.output</literal></td>
+                <td><literal><replaceable>sourceSet</replaceable>.output.classesDirs</literal></td>
             </tr>
             <tr>
                 <td>classpath</td>

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ protected void configureForSourceSet(final SourceSet sourceSet, FindBugs task) {`
`186`	`186`	`taskMapping.map("classes", new Callable<FileCollection>() {`
`187`	`187`	`@Override`
`188`	`188`	`public FileCollection call() {`
`189`		`- return sourceSet.getOutput().getClassesDirs().getAsFileTree();`
	`189`	`+ return sourceSet.getOutput().getClassesDirs();`
`190`	`190`	`}`
`191`	`191`	`});`
`192`	`192`	`taskMapping.map("classpath", new Callable<FileCollection>() {`