Merge branch '__rultor'

yegor256 · Jan 30, 2019 · abea1d5 · abea1d5 · 0pdd · Jan 30, 2019
2 parents 93cf62a + 742f4bc
commit abea1d5
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/qulice-checkstyle/src/main/java/com/qulice/checkstyle/JavadocTagsCheck.java b/qulice-checkstyle/src/main/java/com/qulice/checkstyle/JavadocTagsCheck.java
@@ -63,10 +63,6 @@
  *
  * @see <a href="http://svnbook.red-bean.com/en/1.4/svn.advanced.props.special.keywords.html">Keywords substitution in Subversion</a>
  * @since 0.3
- * @todo #743:30min Nested classes should have since tag. Implement check to
- *  validate if nested classes javadoc have a valid since tag. After the
- *  implementation add JavadocTagsCheck to checks.xml and ChecksTest (removed
- *  because now the test fails).
  */
 public final class JavadocTagsCheck extends AbstractCheck {
 
@@ -111,21 +107,19 @@ public void init() {
 
     @Override
     public void visitToken(final DetailAST ast) {
-        if (ast.getParent() == null) {
-            final String[] lines = this.getLines();
-            final int start = ast.getLineNo();
-            final int cstart = JavadocTagsCheck.findCommentStart(lines, start);
-            final int cend = JavadocTagsCheck.findCommentEnd(lines, start);
-            if (cend > cstart && cstart >= 0) {
-                for (final String tag : this.prohibited) {
-                    this.findProhibited(lines, start, cstart, cend, tag);
-                }
-                for (final String tag : this.tags.keySet()) {
-                    this.matchTagFormat(lines, cstart, cend, tag);
-                }
-            } else {
-                this.log(0, "Problem finding class/interface comment");
+        final String[] lines = this.getLines();
+        final int start = ast.getLineNo();
+        final int cstart = JavadocTagsCheck.findCommentStart(lines, start);
+        final int cend = JavadocTagsCheck.findCommentEnd(lines, start);
+        if (cend > cstart && cstart >= 0) {
+            for (final String tag : this.prohibited) {
+                this.findProhibited(lines, start, cstart, cend, tag);
+            }
+            for (final String tag : this.tags.keySet()) {
+                this.matchTagFormat(lines, cstart, cend, tag);
             }
+        } else {
+            this.log(0, "Problem finding class/interface comment");
         }
     }
 
@@ -252,7 +246,7 @@ private List<Integer> findTagLineNum(final String[] lines, final int start,
         for (int pos = start; pos <= end; pos += 1) {
             final String line = lines[pos];
             if (line.contains(String.format("@%s ", tag))) {
-                if (!line.startsWith(prefix)) {
+                if (!line.trim().startsWith(prefix.trim())) {
                     this.log(
                         start + pos + 1,
                         "Line with ''@{0}'' does not start with a ''{1}''",

diff --git a/qulice-checkstyle/src/main/resources/com/qulice/checkstyle/checks.xml b/qulice-checkstyle/src/main/resources/com/qulice/checkstyle/checks.xml
@@ -418,6 +418,7 @@
         <module name="com.qulice.checkstyle.FinalSemicolonInTryWithResourcesCheck"/>
         <module name="com.qulice.checkstyle.JavadocEmptyLineCheck"/>
         <module name="com.qulice.checkstyle.DiamondOperatorCheck"/>
+        <module name="com.qulice.checkstyle.JavadocTagsCheck"/>
     </module>
 
     <!--

diff --git a/qulice-checkstyle/src/test/java/com/qulice/checkstyle/ChecksTest.java b/qulice-checkstyle/src/test/java/com/qulice/checkstyle/ChecksTest.java
@@ -79,6 +79,7 @@ public final class ChecksTest {
         "NonStaticMethodCheck",
         "ConstantUsageCheck",
         "JavadocEmptyLineCheck",
+        "JavadocTagsCheck",
     };
 
     /**

diff --git a/...ce-checkstyle/src/test/resources/com/qulice/checkstyle/ValidAbbreviationAsWordInName.java b/...ce-checkstyle/src/test/resources/com/qulice/checkstyle/ValidAbbreviationAsWordInName.java
@@ -24,6 +24,7 @@ public final String UPPERCASE() {
 
     /**
      * ValidInnerHtml example class having the abbreviation in camelcase.
+     * @since 1.0
      */
     public class ValidInnerHtml {
     }

diff --git a/...-checkstyle/src/test/resources/com/qulice/checkstyle/ValidAbbreviationAsWordInNameIT.java b/...-checkstyle/src/test/resources/com/qulice/checkstyle/ValidAbbreviationAsWordInNameIT.java
@@ -10,6 +10,7 @@
 public class ValidAbbreviationAsWordInNameIT {
     /**
      * Valid name on inner class, because the IT abbreviation is allowed.
+     * @since 1.0
      */
     class ValidInnerIT {
     }

diff --git a/qulice-checkstyle/src/test/resources/com/qulice/checkstyle/ValidDiamondsUsage.java b/qulice-checkstyle/src/test/resources/com/qulice/checkstyle/ValidDiamondsUsage.java
@@ -35,12 +35,14 @@ public static void innerClassUsage() {
 
     /**
      * Simple interface, used as wrapper.
+     * @since 1.0
      */
     interface SimpleInterface {
 
         /**
          * Inner class with generic parameter.
          * @param <E> generic parameter
+         * @since 1.0
          */
         final class InnerClass<E> implements SimpleInterface {