Skip to content

Commit b9f274b

Browse files
committed
Fix gradle integration
1 parent fec3fe5 commit b9f274b

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
import java.io.File;
2121
import java.util.ArrayList;
22+
import java.util.Collection;
2223
import java.util.List;
2324
import java.util.Objects;
2425

@@ -283,9 +284,9 @@ public class CleanthatJavaConfig {
283284

284285
private String sourceJdk = CleanthatJavaStep.defaultSourceJdk();
285286

286-
private List<String> mutators = CleanthatJavaStep.defaultMutators();
287+
private List<String> mutators = new ArrayList<>(CleanthatJavaStep.defaultMutators());
287288

288-
private List<String> excludedMutators = CleanthatJavaStep.defaultExcludedMutators();
289+
private List<String> excludedMutators = new ArrayList<>(CleanthatJavaStep.defaultExcludedMutators());
289290

290291
CleanthatJavaConfig() {
291292
addStep(createStep());
@@ -319,14 +320,20 @@ public CleanthatJavaConfig clearMutators() {
319320
return this;
320321
}
321322

322-
// The fully qualified name of a class implementing eu.solven.cleanthat.engine.java.refactorer.meta.IMutator
323-
// or '*' to include all default mutators
323+
// An id of a mutator (see IMutator.getIds()) or
324+
// tThe fully qualified name of a class implementing eu.solven.cleanthat.engine.java.refactorer.meta.IMutator
324325
public CleanthatJavaConfig addMutator(String mutator) {
325326
this.mutators.add(mutator);
326327
replaceStep(createStep());
327328
return this;
328329
}
329330

331+
public CleanthatJavaConfig addMutators(Collection<String> mutators) {
332+
this.mutators.addAll(mutators);
333+
replaceStep(createStep());
334+
return this;
335+
}
336+
330337
// useful to exclude a mutator amongst the default list of mutators
331338
public CleanthatJavaConfig excludeMutator(String mutator) {
332339
this.excludedMutators.add(mutator);

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/CleanthatJavaIntegrationTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ void integration() throws IOException {
3131
"spotless {",
3232
" java {",
3333
" target file('test.java')",
34-
" cleanthat().sourceCompatibility('11')",
34+
" cleanthat()" +
35+
" .sourceCompatibility('11')",
36+
" .addMutators(['LiteralsFirstInComparisons', 'OptionalNotEmpty'])",
3537
" }",
3638
"}");
3739

0 commit comments

Comments
 (0)