diff --git a/pom.xml b/pom.xml index 4a0ee3fe1..de316cff1 100644 --- a/pom.xml +++ b/pom.xml @@ -813,8 +813,6 @@ .*.checks.header.RegexpHeaderCheck8793 - .*.checks.imports.AvoidStarImportCheck95100 - .*.checks.imports.AvoidStaticImportCheck91100 .*.checks.imports.CustomImportOrderCheck9391 .*.checks.imports.Guard86100 .*.checks.imports.ImportControlCheck8573 diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportCheck.java index 582685a34..08e400c0e 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportCheck.java @@ -154,17 +154,10 @@ public class AvoidStarImportCheck */ private void logsStarredImportViolation(DetailAST startingDot) { final FullIdent name = FullIdent.createFullIdent(startingDot); - if (isStaredImport(name) && !excludes.contains(name.getText())) { - log(startingDot.getLineNo(), MSG_KEY, name.getText()); + final String importText = name.getText(); + if (importText.endsWith(".*") && !excludes.contains(importText)) { + log(startingDot.getLineNo(), MSG_KEY, importText); } } - /** - * Checks is an import is a stared import. - * @param importIdent the full import identifier - * @return true if a start import false if not - */ - private boolean isStaredImport(FullIdent importIdent) { - return null != importIdent && importIdent.getText().endsWith(".*"); - } }