File tree Expand file tree Collapse file tree 2 files changed +6
-8
lines changed
src/main/groovy/com/github/spotbugs/snom Expand file tree Collapse file tree 2 files changed +6
-8
lines changed Original file line number Diff line number Diff line change @@ -36,15 +36,13 @@ public abstract class SpotBugsReport
36
36
CustomizableHtmlReport // to expose CustomizableHtmlReport#setStylesheet to build script
37
37
{
38
38
private final RegularFileProperty destination ;
39
- private final Property <Boolean > isEnabled ;
40
39
private final Property <Boolean > isRequired ;
41
40
private final SpotBugsTask task ;
42
41
43
42
@ Inject
44
43
public SpotBugsReport (ObjectFactory objects , SpotBugsTask task ) {
45
44
this .destination = objects .fileProperty ();
46
- this .isEnabled = objects .property (Boolean .class );
47
- this .isRequired = objects .property (Boolean .class ).value (Boolean .TRUE );
45
+ this .isRequired = objects .property (Boolean .class ).convention (Boolean .TRUE );
48
46
this .task = task ;
49
47
}
50
48
@@ -79,21 +77,21 @@ public Property<Boolean> getRequired() {
79
77
@ Deprecated
80
78
@ Override
81
79
public boolean isEnabled () {
82
- return isEnabled . getOrElse ( Boolean . TRUE );
80
+ return isRequired . get ( );
83
81
}
84
82
85
83
/** @deprecated use {@code getRequired().set(value)} instead. */
86
84
@ Deprecated
87
85
@ Override
88
86
public void setEnabled (boolean b ) {
89
- isEnabled .set (b );
87
+ isRequired .set (b );
90
88
}
91
89
92
90
/** @deprecated use {@code getRequired().set(provider)} instead. */
93
91
@ Deprecated
94
92
@ Override
95
93
public void setEnabled (Provider <Boolean > provider ) {
96
- isEnabled .set (provider );
94
+ isRequired .set (provider );
97
95
}
98
96
99
97
/** @deprecated use {@code getOutputLocation().set(file)} instead. */
Original file line number Diff line number Diff line change @@ -434,15 +434,15 @@ abstract class SpotBugsTask extends DefaultTask implements VerificationTask {
434
434
@Optional
435
435
@Nested
436
436
SpotBugsReport getFirstEnabledReport () {
437
- java.util.Optional<SpotBugsReport > report = reports. stream(). filter({ report -> report. enabled || report . required }). findFirst()
437
+ java.util.Optional<SpotBugsReport > report = reports. stream(). filter({ report -> report. enabled }). findFirst()
438
438
return report. orElse(null )
439
439
}
440
440
441
441
@NonNull
442
442
@Optional
443
443
@Nested
444
444
Set<SpotBugsReport > getEnabledReports () {
445
- return reports. findAll {it. enabled}
445
+ return reports. findAll { it. enabled }
446
446
}
447
447
448
448
void setReportLevel (@Nullable String name ) {
You can’t perform that action at this time.
0 commit comments