Skip to content

Commit 210b866

Browse files
committed
Make sure that the removeUnusedImports step isn't named cleanthat.
1 parent 3cbfbd2 commit 210b866

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public static FormatterStep create(Provisioner provisioner) {
7474

7575
/** Creates a step that applies default CleanThat mutators. */
7676
public static FormatterStep create(String version, Provisioner provisioner) {
77-
return create(MAVEN_COORDINATE, version, defaultSourceJdk(), defaultMutators(), defaultExcludedMutators(), defaultIncludeDraft(), provisioner);
77+
return createWithStepName(NAME, MAVEN_COORDINATE, version, defaultSourceJdk(), defaultMutators(), defaultExcludedMutators(), defaultIncludeDraft(), provisioner);
7878
}
7979

8080
public static String defaultSourceJdk() {
@@ -101,7 +101,8 @@ public static boolean defaultIncludeDraft() {
101101
}
102102

103103
/** Creates a step that applies selected CleanThat mutators. */
104-
public static FormatterStep create(String groupArtifact,
104+
static FormatterStep createWithStepName(String stepName,
105+
String groupArtifact,
105106
String version,
106107
String sourceJdkVersion,
107108
List<String> included,
@@ -114,12 +115,23 @@ public static FormatterStep create(String groupArtifact,
114115
}
115116
Objects.requireNonNull(version, "version");
116117
Objects.requireNonNull(provisioner, "provisioner");
117-
return FormatterStep.create(NAME,
118+
return FormatterStep.create(stepName,
118119
new CleanthatJavaStep(JarState.promise(() -> JarState.from(groupArtifact + ":" + version, provisioner)), version, sourceJdkVersion, included, excluded, includeDraft),
119120
CleanthatJavaStep::equalityState,
120121
State::createFormat);
121122
}
122123

124+
/** Creates a step that applies selected CleanThat mutators. */
125+
public static FormatterStep create(String groupArtifact,
126+
String version,
127+
String sourceJdkVersion,
128+
List<String> included,
129+
List<String> excluded,
130+
boolean includeDraft,
131+
Provisioner provisioner) {
132+
return createWithStepName(NAME, groupArtifact, version, sourceJdkVersion, included, excluded, includeDraft, provisioner);
133+
}
134+
123135
/** Get default formatter version */
124136
public static String defaultVersion() {
125137
return Objects.requireNonNull(JVM_SUPPORT.getRecommendedFormatterVersion());

lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public static FormatterStep create(String unusedImportRemover, Provisioner provi
5151
case GJF:
5252
return GoogleJavaFormatStep.createRemoveUnusedImportsOnly(provisioner);
5353
case CLEANTHAT:
54-
return CleanthatJavaStep.create(CleanthatJavaStep.defaultGroupArtifact(), CleanthatJavaStep.defaultVersion(), "99.9", List.of(CLEANTHAT_MUTATOR), List.of(), false, provisioner);
54+
return CleanthatJavaStep.createWithStepName(NAME, CleanthatJavaStep.defaultGroupArtifact(), CleanthatJavaStep.defaultVersion(), "99.9", List.of(CLEANTHAT_MUTATOR), List.of(), false, provisioner);
5555
default:
5656
throw new IllegalArgumentException("Invalid unusedImportRemover: " + unusedImportRemover);
5757
}

0 commit comments

Comments
 (0)