Skip to content

Commit bdfbc05

Browse files
committed
Rename the actual step.
1 parent 3524d3d commit bdfbc05

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

lib/src/main/java/com/diffplug/spotless/java/RemoveWildcardImportsStep.java renamed to lib/src/main/java/com/diffplug/spotless/java/ForbidWildcardImports.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@
1818
import com.diffplug.spotless.FormatterStep;
1919
import com.diffplug.spotless.generic.ReplaceRegexStep;
2020

21-
/** Removes any wildcard import statements. */
22-
public final class RemoveWildcardImportsStep {
21+
/** Forbids any wildcard import statements. */
22+
public final class ForbidWildcardImports {
2323

2424
/**
2525
* Matches lines like 'import foo.*;' or 'import static foo.*;'.
2626
*/
2727
private static final String REGEX = "(?m)^import\\s+(?:static\\s+)?[^;\\n]*\\*;\\R?";
28-
private static final String NAME = "removeWildcardImports";
28+
private static final String NAME = "forbidWildcardImports";
2929
private static final String ERROR = "Do not use wildcard imports (e.g. java.util.*) - replace with specific class imports (e.g. java.util.List) as 'spotlessApply' cannot auto-fix this";
3030

31-
private RemoveWildcardImportsStep() {}
31+
private ForbidWildcardImports() {}
3232

3333
public static FormatterStep create() {
3434
return ReplaceRegexStep.lint(NAME, REGEX, ERROR);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@
3636
import com.diffplug.spotless.extra.java.EclipseJdtFormatterStep;
3737
import com.diffplug.spotless.generic.LicenseHeaderStep;
3838
import com.diffplug.spotless.java.CleanthatJavaStep;
39+
import com.diffplug.spotless.java.ForbidWildcardImports;
3940
import com.diffplug.spotless.java.FormatAnnotationsStep;
4041
import com.diffplug.spotless.java.GoogleJavaFormatStep;
4142
import com.diffplug.spotless.java.ImportOrderStep;
4243
import com.diffplug.spotless.java.PalantirJavaFormatStep;
4344
import com.diffplug.spotless.java.RemoveUnusedImportsStep;
44-
import com.diffplug.spotless.java.RemoveWildcardImportsStep;
4545

4646
public class JavaExtension extends FormatExtension implements HasBuiltinDelimiterForLicense, JvmLang {
4747
static final String NAME = "java";
@@ -159,7 +159,7 @@ public void removeWildcardImports() {
159159
}
160160

161161
public void forbidWildcardImports() {
162-
addStep(RemoveWildcardImportsStep.create());
162+
addStep(ForbidWildcardImports.create());
163163
}
164164

165165
/** Uses the <a href="https://github.com/google/google-java-format">google-java-format</a> jar to format source code. */

plugin-maven/src/main/java/com/diffplug/spotless/maven/java/ForbidWildcardImports.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,12 @@
1616
package com.diffplug.spotless.maven.java;
1717

1818
import com.diffplug.spotless.FormatterStep;
19-
import com.diffplug.spotless.java.RemoveWildcardImportsStep;
2019
import com.diffplug.spotless.maven.FormatterStepConfig;
2120
import com.diffplug.spotless.maven.FormatterStepFactory;
2221

2322
public class ForbidWildcardImports implements FormatterStepFactory {
2423
@Override
2524
public FormatterStep newFormatterStep(FormatterStepConfig config) {
26-
return RemoveWildcardImportsStep.create();
25+
return com.diffplug.spotless.java.ForbidWildcardImports.create();
2726
}
2827
}

0 commit comments

Comments
 (0)