Skip to content

Commit

Permalink
Issue sevntu-checkstyle#662: moved line only Checks to log AST (part 1)
Browse files Browse the repository at this point in the history
  • Loading branch information
rnveach committed May 27, 2018
1 parent 1afb353 commit dc717b6
Show file tree
Hide file tree
Showing 18 changed files with 209 additions and 207 deletions.
Expand Up @@ -109,7 +109,7 @@ public void visitToken(DetailAST annotation) {
&& isForbiddenAnnotationTarget(targetType)) {
final String currentTarget = annotationTarget.getText();

log(annotation.getLineNo(), MSG_KEY,
log(annotation, MSG_KEY,
currentTarget, annotationName);
}
}
Expand Down
Expand Up @@ -109,7 +109,7 @@ public int[] getRequiredTokens() {
@Override
public void visitToken(DetailAST detailAST) {
if (isRefactoringRequired(detailAST)) {
log(detailAST.getLineNo(), MSG_KEY,
log(detailAST, MSG_KEY,
detailAST.getText());
}
}
Expand Down
Expand Up @@ -83,7 +83,7 @@ public void visitToken(DetailAST detailAST) {
&& !hasSerialazableMethods(detailAST)) {
final DetailAST implementsBlock = detailAST
.findFirstToken(TokenTypes.IMPLEMENTS_CLAUSE);
log(implementsBlock.getLineNo(),
log(implementsBlock,
MSG_KEY);
}
}
Expand Down
Expand Up @@ -177,7 +177,7 @@ public void visitToken(DetailAST literalIf) {
if (isRatioBetweenIfAndElseBlockSuitable(literalIf)
&& !(ignoreNullCaseInIf && isIfWithNull(literalIf))
&& isConditionAllNegative(literalIf)) {
log(literalIf.getLineNo(), MSG_KEY);
log(literalIf, MSG_KEY);
}
}
}
Expand Down
Expand Up @@ -558,7 +558,7 @@ private void logWrongOrderedSetters(Map<DetailAST, DetailAST> gettersSetters) {
final DetailAST setterAst = entry.getKey();
final DetailAST getterAst = entry.getValue();

log(setterAst.getLineNo(),
log(setterAst,
MSG_KEY_INVALID_SETTER,
getIdentifier(setterAst),
getIdentifier(getterAst));
Expand Down
Expand Up @@ -109,7 +109,7 @@ public void visitToken(DetailAST methodDefToken) {
final String warningMessage = validateFinalizeMethod(methodDefToken);

if (warningMessage != null) {
log(methodDefToken.getLineNo(), warningMessage);
log(methodDefToken, warningMessage);
}
}
}
Expand Down
Expand Up @@ -206,7 +206,7 @@ private boolean isImportForbidden(String importText) {
* import to be warned.
*/
private void log(DetailAST nodeToWarn, String importText) {
log(nodeToWarn.getLineNo(), MSG_KEY,
log(nodeToWarn, MSG_KEY,
getForbiddenImportRegexp(), importText);
}

Expand Down
Expand Up @@ -70,7 +70,7 @@ public void visitToken(DetailAST finallyNode) {

for (DetailAST returnNode : listOfReturnNodes) {
if (!isReturnInMethodDefinition(returnNode)) {
log(finallyNode.getLineNo(), MSG_KEY);
log(finallyNode, MSG_KEY);
}
}
}
Expand Down
Expand Up @@ -124,15 +124,15 @@ private void identifyThrowingAnonymousException(DetailAST throwDefAst) {

if (throwingLiteralNewAst != null
&& hasObjectBlock(throwingLiteralNewAst)) {
log(throwDefAst.getLineNo(), MSG_KEY);
log(throwDefAst, MSG_KEY);
}
else if (throwingLiteralNewAst == null) {
final DetailAST throwingExceptionNameAst = getThrowingExceptionNameAst(throwDefAst
.getFirstChild());
if (throwingExceptionNameAst != null
&& anonymousExceptions.contains(throwingExceptionNameAst
.getText())) {
log(throwDefAst.getLineNo(), MSG_KEY);
log(throwDefAst, MSG_KEY);
}
}
}
Expand Down
Expand Up @@ -80,10 +80,10 @@ public void testVariableIsForbidden() throws Exception {
checkConfig.addAttribute("annotationTargets", "VARIABLE_DEF");

final String[] expected2 = {
"13: " + getCheckMessage(MSG_KEY, "VARIABLE_DEF", "Edible"),
"20: " + getCheckMessage(MSG_KEY, "VARIABLE_DEF", "Author"),
"21: " + getCheckMessage(MSG_KEY, "VARIABLE_DEF", "Author2"),
"59: " + getCheckMessage(MSG_KEY, "VARIABLE_DEF", "SuppressWarnings"),
"13:5: " + getCheckMessage(MSG_KEY, "VARIABLE_DEF", "Edible"),
"20:7: " + getCheckMessage(MSG_KEY, "VARIABLE_DEF", "Author"),
"21:7: " + getCheckMessage(MSG_KEY, "VARIABLE_DEF", "Author2"),
"59:7: " + getCheckMessage(MSG_KEY, "VARIABLE_DEF", "SuppressWarnings"),
};

verify(checkConfig, getPath("InputForbidAnnotationCheck.java"), expected2);
Expand All @@ -97,11 +97,11 @@ public void testMethodIsForbidden() throws Exception {
checkConfig.addAttribute("annotationTargets", "METHOD_DEF");

final String[] expected3 = {
"28: " + getCheckMessage(MSG_KEY, "METHOD_DEF", "Twizzle"),
"39: " + getCheckMessage(MSG_KEY, "METHOD_DEF", "One"),
"40: " + getCheckMessage(MSG_KEY, "METHOD_DEF", "Two"),
"41: " + getCheckMessage(MSG_KEY, "METHOD_DEF", "Three"),
"47: " + getCheckMessage(MSG_KEY, "METHOD_DEF", "B"),
"28:7: " + getCheckMessage(MSG_KEY, "METHOD_DEF", "Twizzle"),
"39:7: " + getCheckMessage(MSG_KEY, "METHOD_DEF", "One"),
"40:7: " + getCheckMessage(MSG_KEY, "METHOD_DEF", "Two"),
"41:7: " + getCheckMessage(MSG_KEY, "METHOD_DEF", "Three"),
"47:9: " + getCheckMessage(MSG_KEY, "METHOD_DEF", "B"),
};

verify(checkConfig, getPath("InputForbidAnnotationCheck.java"), expected3);
Expand All @@ -115,9 +115,9 @@ public void testClassAndConstuctorIsForbidden() throws Exception {
checkConfig.addAttribute("annotationTargets", "CLASS_DEF,CTOR_DEF");

final String[] expected4 = {
"6: " + getCheckMessage(MSG_KEY, "CLASS_DEF", "Test"),
"8: " + getCheckMessage(MSG_KEY, "CTOR_DEF", "ctor"),
"9: " + getCheckMessage(MSG_KEY, "CTOR_DEF", "ctor2"),
"6:1: " + getCheckMessage(MSG_KEY, "CLASS_DEF", "Test"),
"8:5: " + getCheckMessage(MSG_KEY, "CTOR_DEF", "ctor"),
"9:5: " + getCheckMessage(MSG_KEY, "CTOR_DEF", "ctor2"),
};

verify(checkConfig, getPath("InputForbidAnnotationCheck.java"), expected4);
Expand All @@ -131,8 +131,8 @@ public void testAnnotationIsForbidden() throws Exception {
checkConfig.addAttribute("annotationTargets", "ANNOTATION_DEF");

final String[] expected5 = {
"34: " + getCheckMessage(MSG_KEY, "ANNOTATION_DEF", "Retention"),
"35: " + getCheckMessage(MSG_KEY, "ANNOTATION_DEF", "Target"),
"34:7: " + getCheckMessage(MSG_KEY, "ANNOTATION_DEF", "Retention"),
"35:7: " + getCheckMessage(MSG_KEY, "ANNOTATION_DEF", "Target"),
};

verify(checkConfig, getPath("InputForbidAnnotationCheck.java"), expected5);
Expand All @@ -147,8 +147,8 @@ public void testParameterAndInterfaceIsForbidden() throws Exception {
"PARAMETER_DEF,INTERFACE_DEF");

final String[] expected6 = {
"43: " + getCheckMessage(MSG_KEY, "PARAMETER_DEF", "MyAnnotation"),
"45: " + getCheckMessage(MSG_KEY, "INTERFACE_DEF", "A"),
"43:17: " + getCheckMessage(MSG_KEY, "PARAMETER_DEF", "MyAnnotation"),
"45:7: " + getCheckMessage(MSG_KEY, "INTERFACE_DEF", "A"),
};

verify(checkConfig, getPath("InputForbidAnnotationCheck.java"), expected6);
Expand All @@ -163,10 +163,10 @@ public void testEnumIsForbidden() throws Exception {
"ENUM_DEF,ENUM_CONSTANT_DEF");

final String[] expected7 = {
"50: " + getCheckMessage(MSG_KEY, "ENUM_DEF", "C"),
"52: " + getCheckMessage(MSG_KEY, "ENUM_CONSTANT_DEF", "int1"),
"54: " + getCheckMessage(MSG_KEY, "ENUM_CONSTANT_DEF", "int2"),
"56: " + getCheckMessage(MSG_KEY, "ENUM_CONSTANT_DEF", "int3"),
"50:7: " + getCheckMessage(MSG_KEY, "ENUM_DEF", "C"),
"52:12: " + getCheckMessage(MSG_KEY, "ENUM_CONSTANT_DEF", "int1"),
"54:12: " + getCheckMessage(MSG_KEY, "ENUM_CONSTANT_DEF", "int2"),
"56:12: " + getCheckMessage(MSG_KEY, "ENUM_CONSTANT_DEF", "int3"),
};

verify(checkConfig, getPath("InputForbidAnnotationCheck.java"), expected7);
Expand Down
Expand Up @@ -38,34 +38,35 @@ public void testAll() throws Exception {
final DefaultConfiguration checkConfig =
createModuleConfig(AvoidConstantAsFirstOperandInConditionCheck.class);
final String[] expected = {
"24: " + getCheckMessage(MSG_KEY, "=="),
"25: " + getCheckMessage(MSG_KEY, "=="),
"27: " + getCheckMessage(MSG_KEY, "=="),
"28: " + getCheckMessage(MSG_KEY, "=="),
"29: " + getCheckMessage(MSG_KEY, "=="),
"30: " + getCheckMessage(MSG_KEY, "=="),
"31: " + getCheckMessage(MSG_KEY, "=="),
"46: " + getCheckMessage(MSG_KEY, "=="),
"47: " + getCheckMessage(MSG_KEY, "!="),
"52: " + getCheckMessage(MSG_KEY, "=="),
"53: " + getCheckMessage(MSG_KEY, "!="),
"58: " + getCheckMessage(MSG_KEY, "=="),
"59: " + getCheckMessage(MSG_KEY, "!="),
"67: " + getCheckMessage(MSG_KEY, "=="),
"71: " + getCheckMessage(MSG_KEY, "=="),
"72: " + getCheckMessage(MSG_KEY, "=="),
"73: " + getCheckMessage(MSG_KEY, "=="),
"74: " + getCheckMessage(MSG_KEY, "=="),
"76: " + getCheckMessage(MSG_KEY, "=="),
"77: " + getCheckMessage(MSG_KEY, "=="),
"78: " + getCheckMessage(MSG_KEY, "=="),
"84: " + getCheckMessage(MSG_KEY, "=="),
"85: " + getCheckMessage(MSG_KEY, "=="),
"86: " + getCheckMessage(MSG_KEY, "=="),
"97: " + getCheckMessage(MSG_KEY, "=="),
"101: " + getCheckMessage(MSG_KEY, "=="),
"111: " + getCheckMessage(MSG_KEY, "=="),
"112: " + getCheckMessage(MSG_KEY, "=="),
"24:20: " + getCheckMessage(MSG_KEY, "=="),
"25:15: " + getCheckMessage(MSG_KEY, "=="),
"27:18: " + getCheckMessage(MSG_KEY, "=="),
"28:18: " + getCheckMessage(MSG_KEY, "=="),
"29:16: " + getCheckMessage(MSG_KEY, "=="),
"30:18: " + getCheckMessage(MSG_KEY, "=="),
"31:19: " + getCheckMessage(MSG_KEY, "=="),
"46:18: " + getCheckMessage(MSG_KEY, "=="),
"47:18: " + getCheckMessage(MSG_KEY, "!="),
"52:18: " + getCheckMessage(MSG_KEY, "=="),
"53:18: " + getCheckMessage(MSG_KEY, "!="),
"58:18: " + getCheckMessage(MSG_KEY, "=="),
"59:18: " + getCheckMessage(MSG_KEY, "!="),
"67:30: " + getCheckMessage(MSG_KEY, "=="),
"71:36: " + getCheckMessage(MSG_KEY, "=="),
"72:37: " + getCheckMessage(MSG_KEY, "=="),
"73:19: " + getCheckMessage(MSG_KEY, "=="),
"74:37: " + getCheckMessage(MSG_KEY, "=="),
"76:42: " + getCheckMessage(MSG_KEY, "=="),
"77:18: " + getCheckMessage(MSG_KEY, "=="),
"78:18: " + getCheckMessage(MSG_KEY, "=="),
"78:42: " + getCheckMessage(MSG_KEY, "=="),
"84:25: " + getCheckMessage(MSG_KEY, "=="),
"85:23: " + getCheckMessage(MSG_KEY, "=="),
"86:33: " + getCheckMessage(MSG_KEY, "=="),
"97:21: " + getCheckMessage(MSG_KEY, "=="),
"101:23: " + getCheckMessage(MSG_KEY, "=="),
"111:19: " + getCheckMessage(MSG_KEY, "=="),
"112:40: " + getCheckMessage(MSG_KEY, "=="),
};
verify(checkConfig, getPath("InputAvoidConstantAsFirstOperandInConditionCheck.java"),
expected);
Expand All @@ -77,9 +78,9 @@ public void testAttributes() throws Exception {
createModuleConfig(AvoidConstantAsFirstOperandInConditionCheck.class);
checkConfig.addAttribute("targetConstantTypes", "LITERAL_FALSE,NUM_INT,NUM_FLOAT");
final String[] expected = {
"25: " + getCheckMessage(MSG_KEY, "=="),
"28: " + getCheckMessage(MSG_KEY, "=="),
"31: " + getCheckMessage(MSG_KEY, "=="),
"25:15: " + getCheckMessage(MSG_KEY, "=="),
"28:18: " + getCheckMessage(MSG_KEY, "=="),
"31:19: " + getCheckMessage(MSG_KEY, "=="),
};
verify(checkConfig, getPath("InputAvoidConstantAsFirstOperandInConditionCheck.java"),
expected);
Expand All @@ -93,34 +94,35 @@ public void testNullProperties() throws Exception {
checkConfig.addAttribute("targetConstantTypes", null);

final String[] expected = {
"24: " + getCheckMessage(MSG_KEY, "=="),
"25: " + getCheckMessage(MSG_KEY, "=="),
"27: " + getCheckMessage(MSG_KEY, "=="),
"28: " + getCheckMessage(MSG_KEY, "=="),
"29: " + getCheckMessage(MSG_KEY, "=="),
"30: " + getCheckMessage(MSG_KEY, "=="),
"31: " + getCheckMessage(MSG_KEY, "=="),
"46: " + getCheckMessage(MSG_KEY, "=="),
"47: " + getCheckMessage(MSG_KEY, "!="),
"52: " + getCheckMessage(MSG_KEY, "=="),
"53: " + getCheckMessage(MSG_KEY, "!="),
"58: " + getCheckMessage(MSG_KEY, "=="),
"59: " + getCheckMessage(MSG_KEY, "!="),
"67: " + getCheckMessage(MSG_KEY, "=="),
"71: " + getCheckMessage(MSG_KEY, "=="),
"72: " + getCheckMessage(MSG_KEY, "=="),
"73: " + getCheckMessage(MSG_KEY, "=="),
"74: " + getCheckMessage(MSG_KEY, "=="),
"76: " + getCheckMessage(MSG_KEY, "=="),
"77: " + getCheckMessage(MSG_KEY, "=="),
"78: " + getCheckMessage(MSG_KEY, "=="),
"84: " + getCheckMessage(MSG_KEY, "=="),
"85: " + getCheckMessage(MSG_KEY, "=="),
"86: " + getCheckMessage(MSG_KEY, "=="),
"97: " + getCheckMessage(MSG_KEY, "=="),
"101: " + getCheckMessage(MSG_KEY, "=="),
"111: " + getCheckMessage(MSG_KEY, "=="),
"112: " + getCheckMessage(MSG_KEY, "=="),
"24:20: " + getCheckMessage(MSG_KEY, "=="),
"25:15: " + getCheckMessage(MSG_KEY, "=="),
"27:18: " + getCheckMessage(MSG_KEY, "=="),
"28:18: " + getCheckMessage(MSG_KEY, "=="),
"29:16: " + getCheckMessage(MSG_KEY, "=="),
"30:18: " + getCheckMessage(MSG_KEY, "=="),
"31:19: " + getCheckMessage(MSG_KEY, "=="),
"46:18: " + getCheckMessage(MSG_KEY, "=="),
"47:18: " + getCheckMessage(MSG_KEY, "!="),
"52:18: " + getCheckMessage(MSG_KEY, "=="),
"53:18: " + getCheckMessage(MSG_KEY, "!="),
"58:18: " + getCheckMessage(MSG_KEY, "=="),
"59:18: " + getCheckMessage(MSG_KEY, "!="),
"67:30: " + getCheckMessage(MSG_KEY, "=="),
"71:36: " + getCheckMessage(MSG_KEY, "=="),
"72:37: " + getCheckMessage(MSG_KEY, "=="),
"73:19: " + getCheckMessage(MSG_KEY, "=="),
"74:37: " + getCheckMessage(MSG_KEY, "=="),
"76:42: " + getCheckMessage(MSG_KEY, "=="),
"77:18: " + getCheckMessage(MSG_KEY, "=="),
"78:18: " + getCheckMessage(MSG_KEY, "=="),
"78:42: " + getCheckMessage(MSG_KEY, "=="),
"84:25: " + getCheckMessage(MSG_KEY, "=="),
"85:23: " + getCheckMessage(MSG_KEY, "=="),
"86:33: " + getCheckMessage(MSG_KEY, "=="),
"97:21: " + getCheckMessage(MSG_KEY, "=="),
"101:23: " + getCheckMessage(MSG_KEY, "=="),
"111:19: " + getCheckMessage(MSG_KEY, "=="),
"112:40: " + getCheckMessage(MSG_KEY, "=="),
};

verify(checkConfig, getPath("InputAvoidConstantAsFirstOperandInConditionCheck.java"),
Expand Down
Expand Up @@ -42,21 +42,21 @@ public void testWithAllowPartialFalse()
createModuleConfig(AvoidDefaultSerializableInInnerClassesCheck.class);

final String[] expected = {
"33: " + warningMessage,
"45: " + warningMessage,
"52: " + warningMessage,
"59: " + warningMessage,
"67: " + warningMessage,
"74: " + warningMessage,
"97: " + warningMessage,
"104: " + warningMessage,
"121: " + warningMessage,
"134: " + warningMessage,
"145: " + warningMessage,
"159: " + warningMessage,
"171: " + warningMessage,
"179: " + warningMessage,
"187: " + warningMessage,
"33:48: " + warningMessage,
"45:31: " + warningMessage,
"52:31: " + warningMessage,
"59:30: " + warningMessage,
"67:9: " + warningMessage,
"74:30: " + warningMessage,
"97:30: " + warningMessage,
"104:34: " + warningMessage,
"121:30: " + warningMessage,
"134:30: " + warningMessage,
"145:36: " + warningMessage,
"159:42: " + warningMessage,
"171:39: " + warningMessage,
"179:42: " + warningMessage,
"187:35: " + warningMessage,
};
verify(checkConfig, getPath("InputAvoidDefaultSerializableInInnerClassesCheck1.java"),
expected);
Expand All @@ -70,7 +70,7 @@ public void testPrivateNotRealReadObject()
checkConfig.addAttribute("allowPartialImplementation", "true");

final String[] expected = {
"10: " + warningMessage,
"10:22: " + warningMessage,
};

verify(checkConfig, getPath("InputAvoidDefaultSerializableInInnerClassesCheck2.java"),
Expand All @@ -96,17 +96,17 @@ public void testWithAllowPartialTrue()
createModuleConfig(AvoidDefaultSerializableInInnerClassesCheck.class);
checkConfig.addAttribute("allowPartialImplementation", "true");
final String[] expected = {
"33: " + warningMessage,
"59: " + warningMessage,
"67: " + warningMessage,
"74: " + warningMessage,
"97: " + warningMessage,
"104: " + warningMessage,
"121: " + warningMessage,
"134: " + warningMessage,
"145: " + warningMessage,
"171: " + warningMessage,
"187: " + warningMessage,
"33:48: " + warningMessage,
"59:30: " + warningMessage,
"67:9: " + warningMessage,
"74:30: " + warningMessage,
"97:30: " + warningMessage,
"104:34: " + warningMessage,
"121:30: " + warningMessage,
"134:30: " + warningMessage,
"145:36: " + warningMessage,
"171:39: " + warningMessage,
"187:35: " + warningMessage,
};
verify(checkConfig, getPath("InputAvoidDefaultSerializableInInnerClassesCheck1.java"),
expected);
Expand Down

0 comments on commit dc717b6

Please sign in to comment.