Merge pull request #1 from fartem/1.1.0

Author: fartem

build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 group 'com.smlnskgmail.jaman.checkstyle'
-version '1.0.0'
+version '1.1.0'
 
 checkstyle {
     toolVersion '8.38'
@@ -35,6 +35,10 @@ cpd {
     language = 'java'
 }
 
+cpdCheck {
+    exclude '*.java'
+}
+
 repositories {
     mavenCentral()
 }

src/main/java/com/smlnskgmail/jaman/checkstyle/checks/AndroidViewFieldNameCheck.java

@@ -24,11 +24,36 @@ public void visitToken(DetailAST ast) {
                         log(ast);
                     }
                     break;
+                case "ImageButton":
+                    if (!ast.findFirstToken(TokenTypes.IDENT).getText().startsWith("ib")) {
+                        log(ast);
+                    }
+                    break;
                 case "EditText":
                     if (!ast.findFirstToken(TokenTypes.IDENT).getText().startsWith("et")) {
                         log(ast);
                     }
                     break;
+                case "Button":
+                    if (!ast.findFirstToken(TokenTypes.IDENT).getText().startsWith("btn")) {
+                        log(ast);
+                    }
+                    break;
+                case "RecyclerView":
+                    if (!ast.findFirstToken(TokenTypes.IDENT).getText().startsWith("rv")) {
+                        log(ast);
+                    }
+                    break;
+                case "AdaptiveRecyclerView":
+                    if (!ast.findFirstToken(TokenTypes.IDENT).getText().startsWith("arv")) {
+                        log(ast);
+                    }
+                    break;
+                case "FloatingActionButton":
+                    if (!ast.findFirstToken(TokenTypes.IDENT).getText().startsWith("fab")) {
+                        log(ast);
+                    }
+                    break;
             }
         }
     }

src/main/java/com/smlnskgmail/jaman/checkstyle/checks/MethodObjectReturnAnnotationCheck.java

@@ -7,8 +7,14 @@
 import java.util.Arrays;
 import java.util.List;
 
+@SuppressWarnings("CPD-START")
 public class MethodObjectReturnAnnotationCheck extends AbstractCheck {
 
+    private static final List<String> REQUIRED_ANNOTATIONS = Arrays.asList(
+            "NonNull",
+            "Nullable"
+    );
+
     private static final String MESSAGE_KEY = "MethodObjectReturnAnnotationCheck";
 
     private static final List<Integer> EXCLUDED_TYPES = Arrays.asList(
@@ -27,11 +33,14 @@ public class MethodObjectReturnAnnotationCheck extends AbstractCheck {
     public void visitToken(DetailAST ast) {
         final DetailAST returnType = ast.findFirstToken(TokenTypes.TYPE);
         if (!EXCLUDED_TYPES.contains(returnType.getFirstChild().getType())) {
-            // TODO: add annotations check
-            @SuppressWarnings("CPD-START")
             final DetailAST modifiers = ast.findFirstToken(TokenTypes.MODIFIERS);
             if (modifiers.getChildCount(TokenTypes.ANNOTATION) == 0) {
                 log(ast.getLineNo(), MESSAGE_KEY);
+            } else {
+                String firstAnnotationName = modifiers.getFirstChild().findFirstToken(TokenTypes.IDENT).getText();
+                if (!REQUIRED_ANNOTATIONS.contains(firstAnnotationName)) {
+                    log(ast.getLineNo(), MESSAGE_KEY);
+                }
             }
         }
     }

src/main/java/com/smlnskgmail/jaman/checkstyle/checks/MethodParametersAnnotationCheck.java

@@ -8,8 +8,14 @@
 import java.util.Arrays;
 import java.util.List;
 
+@SuppressWarnings("CPD-START")
 public class MethodParametersAnnotationCheck extends AbstractCheck {
 
+    private static final List<String> REQUIRED_ANNOTATIONS = Arrays.asList(
+            "NonNull",
+            "Nullable"
+    );
+
     private static final List<Integer> EXCLUDED_TYPES = Arrays.asList(
             TokenTypes.LITERAL_BOOLEAN,
             TokenTypes.LITERAL_CHAR,
@@ -42,11 +48,13 @@ public void visitToken(DetailAST ast) {
     }
 
     private boolean isInvalidParameter(DetailAST parameterAST) {
+        if (EXCLUDED_TYPES.contains(parameterAST.findFirstToken(TokenTypes.TYPE).getFirstChild().getType())) {
+            return false;
+        }
         final DetailAST modifiers = parameterAST.findFirstToken(TokenTypes.MODIFIERS);
-        // TODO: add annotations check
-        return modifiers != null
-                && !EXCLUDED_TYPES.contains(parameterAST.findFirstToken(TokenTypes.TYPE).getFirstChild().getType())
-                && modifiers.findFirstToken(TokenTypes.ANNOTATION) == null;
+        DetailAST firstAnnotation = modifiers.findFirstToken(TokenTypes.ANNOTATION);
+        return firstAnnotation == null
+                || !REQUIRED_ANNOTATIONS.contains(firstAnnotation.findFirstToken(TokenTypes.IDENT).getText());
     }
 
     @Override