Skip to content

Commit 3cbfbd2

Browse files
committed
Make sure that the removeUnusedImports step isn't named google-java-format.
1 parent f81c612 commit 3cbfbd2

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,14 @@ public static FormatterStep create(String groupArtifact, String version, String
8787

8888
/** Creates a step which formats everything - groupArtifact, code, import order, and unused imports - and optionally reflows long strings. */
8989
public static FormatterStep create(String groupArtifact, String version, String style, Provisioner provisioner, boolean reflowLongStrings, boolean reorderImports, boolean formatJavadoc) {
90-
return createInternally(groupArtifact, version, style, provisioner, reflowLongStrings, reorderImports, formatJavadoc, false);
90+
return createInternally(NAME, groupArtifact, version, style, provisioner, reflowLongStrings, reorderImports, formatJavadoc, false);
9191
}
9292

9393
static FormatterStep createRemoveUnusedImportsOnly(Provisioner provisioner) {
94-
return createInternally(MAVEN_COORDINATE, defaultVersion(), defaultStyle(), provisioner, defaultReflowLongStrings(), defaultReorderImports(), defaultFormatJavadoc(), true);
94+
return createInternally(RemoveUnusedImportsStep.NAME, MAVEN_COORDINATE, defaultVersion(), defaultStyle(), provisioner, defaultReflowLongStrings(), defaultReorderImports(), defaultFormatJavadoc(), true);
9595
}
9696

97-
private static FormatterStep createInternally(String groupArtifact, String version, String style, Provisioner provisioner, boolean reflowLongStrings, boolean reorderImports, boolean formatJavadoc, boolean removeImports) {
97+
private static FormatterStep createInternally(String name, String groupArtifact, String version, String style, Provisioner provisioner, boolean reflowLongStrings, boolean reorderImports, boolean formatJavadoc, boolean removeImports) {
9898
Objects.requireNonNull(groupArtifact, "groupArtifact");
9999
if (groupArtifact.chars().filter(ch -> ch == ':').count() != 1) {
100100
throw new IllegalArgumentException("groupArtifact must be in the form 'groupId:artifactId'");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/** Uses google-java-format or cleanthat.UnnecessaryImport, but only to remove unused imports. */
2626
public class RemoveUnusedImportsStep implements Serializable {
2727
private static final long serialVersionUID = 1L;
28-
private static final String NAME = "removeUnusedImports";
28+
static final String NAME = "removeUnusedImports";
2929

3030
static final String GJF = "google-java-format";
3131
static final String CLEANTHAT = "cleanthat-javaparser-unnecessaryimport";

0 commit comments

Comments
 (0)