fix: SpotBugsTask is not configuration cache safe if a stylesheet is …

…set as String for the HTML report

Signed-off-by: Kengo TODA <[email protected]>

src/main/groovy/com/github/spotbugs/snom/internal/SpotBugsHtmlReport.java

@@ -13,6 +13,7 @@
  */
 package com.github.spotbugs.snom.internal;
 
+import com.github.spotbugs.snom.SpotBugsPlugin;
 import com.github.spotbugs.snom.SpotBugsReport;
 import com.github.spotbugs.snom.SpotBugsTask;
 import edu.umd.cs.findbugs.annotations.NonNull;
@@ -21,64 +22,48 @@
 import java.util.Optional;
 import javax.inject.Inject;
 import org.gradle.api.InvalidUserDataException;
+import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.model.ObjectFactory;
 import org.gradle.api.provider.Property;
 import org.gradle.api.resources.TextResource;
+import org.gradle.api.resources.TextResourceFactory;
 
 public abstract class SpotBugsHtmlReport extends SpotBugsReport {
   private final Property<TextResource> stylesheet;
-  private final Property<String> stylesheetPath;
 
   @Inject
   public SpotBugsHtmlReport(ObjectFactory objects, SpotBugsTask task) {
     super(objects, task);
     // the default reportsDir is "$buildDir/reports/spotbugs/${baseName}.html"
     getOutputLocation().convention(task.getReportsDir().file(task.getBaseName() + ".html"));
     stylesheet = objects.property(TextResource.class);
-    stylesheetPath = objects.property(String.class);
   }
 
   @NonNull
   @Override
   public String toCommandLineOption() {
-    @Nullable TextResource stylesheet = getStylesheet();
-
-    if (stylesheet == null) {
-      return "-html";
-    } else {
-      return "-html:" + stylesheet.asFile().getAbsolutePath();
-    }
+    return stylesheet
+        .map(textResource -> "-html:" + textResource.asFile().getAbsolutePath())
+        .getOrElse("-html");
   }
 
   @Override
   public TextResource getStylesheet() {
-    if (stylesheet.isPresent()) {
-      return stylesheet.get();
-    } else if (stylesheetPath.isPresent()) {
-      return resolve(stylesheetPath.get());
-    }
-
-    return null;
+    return stylesheet.getOrNull();
   }
 
-  private TextResource resolve(String path) {
+  private TextResource resolve(
+      String path, Configuration configuration, TextResourceFactory factory) {
     Optional<File> spotbugsJar =
-        getTask()
-            .getProject()
-            .getConfigurations()
-            .getByName("spotbugs")
+        configuration
             .files(
                 dependency ->
                     dependency.getGroup().equals("com.github.spotbugs")
                         && dependency.getName().equals("spotbugs"))
             .stream()
             .findFirst();
     if (spotbugsJar.isPresent()) {
-      return getTask()
-          .getProject()
-          .getResources()
-          .getText()
-          .fromArchiveEntry(spotbugsJar.get(), path);
+      return factory.fromArchiveEntry(spotbugsJar.get(), path);
     } else {
       throw new InvalidUserDataException(
           "The dependency on SpotBugs not found in 'spotbugs' configuration");
@@ -92,6 +77,9 @@ public void setStylesheet(@Nullable TextResource textResource) {
 
   @Override
   public void setStylesheet(@Nullable String path) {
-    stylesheetPath.set(path);
+    Configuration configuration =
+        getTask().getProject().getConfigurations().getByName(SpotBugsPlugin.CONFIG_NAME);
+    TextResourceFactory factory = getTask().getProject().getResources().getText();
+    stylesheet.set(getTask().getProject().provider(() -> resolve(path, configuration, factory)));
   }
 }