Issue sevntu-checkstyle#552: no exclusions in ForbidCertainImports ga…

…ve no violations
kariem · Jul 26, 2018 · f1cb2de · f1cb2de
1 parent d1f9a3b
commit f1cb2de
Showing 1 changed file with 26 additions and 39 deletions.
diff --git a/...s/src/main/java/com/github/sevntu/checkstyle/checks/coding/ForbidCertainImportsCheck.java b/...s/src/main/java/com/github/sevntu/checkstyle/checks/coding/ForbidCertainImportsCheck.java
@@ -117,14 +117,6 @@ public void setForbiddenImportsRegexp(String forbiddenImportsRegexp) {
         }
     }
 
-    /**
-     * Gets the regexp for excluding imports from checking.
-     * @return regexp for excluding imports from checking.
-     */
-    public String getForbiddenImportsExcludesRegexp() {
-        return forbiddenImportsExcludesRegexp.toString();
-    }
-
     /**
      * Sets the regexp for excluding imports from checking.
      * @param forbiddenImportsExcludesRegexp
@@ -140,16 +132,16 @@ public void setForbiddenImportsExcludesRegexp(String
 
     @Override
     public int[] getDefaultTokens() {
-        final int[] defaultTokens;
-        if (packageNamesRegexp == null || forbiddenImportsRegexp == null
-            || forbiddenImportsExcludesRegexp == null) {
-            defaultTokens = new int[] {};
-        }
-        else {
-            defaultTokens = new int[] {TokenTypes.PACKAGE_DEF,
-                TokenTypes.IMPORT, TokenTypes.LITERAL_NEW, };
-        }
-        return defaultTokens;
+        return new int[] {
+            TokenTypes.PACKAGE_DEF,
+            TokenTypes.IMPORT,
+            TokenTypes.LITERAL_NEW,
+        };
+    }
+
+    @Override
+    public void beginTree(DetailAST rootAST) {
+        packageMatches = false;
     }
 
     @Override
@@ -163,22 +155,16 @@ public void visitToken(DetailAST ast) {
                 }
                 break;
             case TokenTypes.IMPORT:
-                if (packageMatches && forbiddenImportsRegexp != null
-                    && forbiddenImportsExcludesRegexp != null) {
-                    final String importQualifiedText = getText(ast);
-                    if (isImportForbidden(importQualifiedText)) {
-                        log(ast, importQualifiedText);
-                    }
+                final String importQualifiedText = getText(ast);
+                if (isImportForbidden(importQualifiedText)) {
+                    log(ast, importQualifiedText);
                 }
                 break;
             case TokenTypes.LITERAL_NEW:
-                if (forbiddenImportsRegexp != null
-                    && forbiddenImportsExcludesRegexp != null
-                    && packageMatches
-                    && ast.findFirstToken(TokenTypes.DOT) != null) {
-                    final String importQualifiedText = getText(ast);
-                    if (isImportForbidden(importQualifiedText)) {
-                        log(ast, importQualifiedText);
+                if (ast.findFirstToken(TokenTypes.DOT) != null) {
+                    final String classQualifiedText = getText(ast);
+                    if (isImportForbidden(classQualifiedText)) {
+                        log(ast, classQualifiedText);
                     }
                 }
                 break;
@@ -195,8 +181,11 @@ public void visitToken(DetailAST ast) {
      *     classes package, false otherwise
      */
     private boolean isImportForbidden(String importText) {
-        return forbiddenImportsRegexp.matcher(importText).matches()
-                && !forbiddenImportsExcludesRegexp.matcher(importText).matches();
+        return packageMatches
+                && forbiddenImportsRegexp != null
+                && forbiddenImportsRegexp.matcher(importText).matches()
+                && (forbiddenImportsExcludesRegexp == null
+                    || !forbiddenImportsExcludesRegexp.matcher(importText).matches());
     }
 
     /**
@@ -226,12 +215,10 @@ private static String getText(DetailAST packageDefOrImportNode) {
 
         if (identNode == null) {
             final DetailAST parentDotAST = packageDefOrImportNode.findFirstToken(TokenTypes.DOT);
-            if (parentDotAST != null) {
-                final FullIdent dottedPathIdent = FullIdent
-                        .createFullIdentBelow(parentDotAST);
-                final DetailAST nameAST = parentDotAST.getLastChild();
-                result = dottedPathIdent.getText() + "." + nameAST.getText();
-            }
+            final FullIdent dottedPathIdent = FullIdent
+                    .createFullIdentBelow(parentDotAST);
+            final DetailAST nameAST = parentDotAST.getLastChild();
+            result = dottedPathIdent.getText() + "." + nameAST.getText();
         }
         else {
             result = identNode.getText();