diff --git a/src/main/groovy/com/github/spotbugs/snom/SpotBugsReport.java b/src/main/groovy/com/github/spotbugs/snom/SpotBugsReport.java index a46778ec..5299aa94 100644 --- a/src/main/groovy/com/github/spotbugs/snom/SpotBugsReport.java +++ b/src/main/groovy/com/github/spotbugs/snom/SpotBugsReport.java @@ -36,15 +36,13 @@ public abstract class SpotBugsReport CustomizableHtmlReport // to expose CustomizableHtmlReport#setStylesheet to build script { private final RegularFileProperty destination; - private final Property isEnabled; private final Property isRequired; private final SpotBugsTask task; @Inject public SpotBugsReport(ObjectFactory objects, SpotBugsTask task) { this.destination = objects.fileProperty(); - this.isEnabled = objects.property(Boolean.class); - this.isRequired = objects.property(Boolean.class).value(Boolean.TRUE); + this.isRequired = objects.property(Boolean.class).convention(Boolean.TRUE); this.task = task; } @@ -79,21 +77,21 @@ public Property getRequired() { @Deprecated @Override public boolean isEnabled() { - return isEnabled.getOrElse(Boolean.TRUE); + return isRequired.get(); } /** @deprecated use {@code getRequired().set(value)} instead. */ @Deprecated @Override public void setEnabled(boolean b) { - isEnabled.set(b); + isRequired.set(b); } /** @deprecated use {@code getRequired().set(provider)} instead. */ @Deprecated @Override public void setEnabled(Provider provider) { - isEnabled.set(provider); + isRequired.set(provider); } /** @deprecated use {@code getOutputLocation().set(file)} instead. */ diff --git a/src/main/groovy/com/github/spotbugs/snom/SpotBugsTask.groovy b/src/main/groovy/com/github/spotbugs/snom/SpotBugsTask.groovy index 5c49b0d5..4a9b835f 100644 --- a/src/main/groovy/com/github/spotbugs/snom/SpotBugsTask.groovy +++ b/src/main/groovy/com/github/spotbugs/snom/SpotBugsTask.groovy @@ -434,7 +434,7 @@ abstract class SpotBugsTask extends DefaultTask implements VerificationTask { @Optional @Nested SpotBugsReport getFirstEnabledReport() { - java.util.Optional report = reports.stream().filter({ report -> report.enabled || report.required}).findFirst() + java.util.Optional report = reports.stream().filter({ report -> report.enabled }).findFirst() return report.orElse(null) } @@ -442,7 +442,7 @@ abstract class SpotBugsTask extends DefaultTask implements VerificationTask { @Optional @Nested Set getEnabledReports() { - return reports.findAll {it.enabled} + return reports.findAll { it.enabled } } void setReportLevel(@Nullable String name) {