Skip to content

Commit 6efc3e1

Browse files
dancing-leavesromani
authored andcommitted
Issue #114: fix javadocTokens values for NonEmptyAtclauseDescriptionCheck
1 parent 3fa8f1e commit 6efc3e1

File tree

2 files changed

+2
-2
lines changed
  • checkstyle-sonar-plugin/src

2 files changed

+2
-2
lines changed

checkstyle-sonar-plugin/src/main/resources/org/sonar/plugins/checkstyle/rules.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1933,7 +1933,7 @@
19331933
<name><![CDATA[Non-Empty Atclause Description]]></name>
19341934
<priority>MAJOR</priority>
19351935
<configKey><![CDATA[Checker/TreeWalker/NonEmptyAtclauseDescription]]></configKey>
1936-
<param key="javadocTokens" type="s[VARIABLE_DEF,INSTANCE_INIT,ARRAY_DECLARATOR,CTOR_DEF]">
1936+
<param key="javadocTokens" type="s[PARAM_LITERAL,RETURN_LITERAL,THROWS_LITERAL,DEPRECATED_LITERAL]">
19371937
<defaultValue>PARAM_LITERAL,RETURN_LITERAL,THROWS_LITERAL,DEPRECATED_LITERAL</defaultValue>
19381938
</param>
19391939
</rule>

checkstyle-sonar-plugin/src/test/java/org/sonar/plugins/checkstyle/internal/ChecksTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ private static void validateSonarRuleProperties(Class<?> module, Set<Node> param
205205
((AbstractCheck) instance).getRequiredTokens()) + "]";
206206
}
207207
else {
208-
expectedTokenType = "s[" + CheckUtil.getTokenText(
208+
expectedTokenType = "s[" + CheckUtil.getJavadocTokenText(
209209
((AbstractJavadocCheck) instance).getAcceptableJavadocTokens(),
210210
((AbstractJavadocCheck) instance).getRequiredJavadocTokens()) + "]";
211211
}

0 commit comments

Comments
 (0)