Code Review
/
yangtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Conform to our own Checkstyle rules in checkstyle-logging utility
[yangtools.git]
/
common
/
checkstyle-logging
/
src
/
main
/
java
/
org
/
opendaylight
/
yangtools
/
checkstyle
/
CheckLoggingUtil.java
diff --git
a/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/CheckLoggingUtil.java
b/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/CheckLoggingUtil.java
index 0747a85e0adb7ca07f3a5d69d181d519f8f9a258..1c5a6e970c43d7565599a8b72f49425c673113fb 100644
(file)
--- a/
common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/CheckLoggingUtil.java
+++ b/
common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/CheckLoggingUtil.java
@@
-16,53
+16,53
@@
import com.google.common.collect.Lists;
import com.puppycrawl.tools.checkstyle.api.DetailAST;
import com.puppycrawl.tools.checkstyle.api.FullIdent;
import com.puppycrawl.tools.checkstyle.api.TokenTypes;
import com.puppycrawl.tools.checkstyle.api.DetailAST;
import com.puppycrawl.tools.checkstyle.api.FullIdent;
import com.puppycrawl.tools.checkstyle.api.TokenTypes;
-import com.puppycrawl.tools.checkstyle.
check
s.CheckUtils;
+import com.puppycrawl.tools.checkstyle.
util
s.CheckUtils;
-public class CheckLoggingUtil {
+public
final
class CheckLoggingUtil {
public static final String LOGGER_TYPE_NAME = Logger.class.getSimpleName();
public static final String LOGGER_TYPE_FULL_NAME = Logger.class.getName();
public static final String LOGGER_VAR_NAME = "LOG";
public static final String LOGGER_TYPE_NAME = Logger.class.getSimpleName();
public static final String LOGGER_TYPE_FULL_NAME = Logger.class.getName();
public static final String LOGGER_VAR_NAME = "LOG";
- private static final List<String> LOG_METHODS = Lists.newArrayList("debug", "info", "error", "warn", "trace");
+ private static final List<String> LOG_METHODS =
+ Lists.newArrayList("LOG.debug", "LOG.info", "LOG.error", "LOG.warn", "LOG.trace");
- private CheckLoggingUtil() {}
+ private CheckLoggingUtil() {
+ throw new UnsupportedOperationException("Utility class should not be instantiated!");
+ }
- public static String getTypeName(final DetailAST a
AST
) {
- final FullIdent ident = CheckUtils.createFullType(a
AST
.findFirstToken(TokenTypes.TYPE));
+ public static String getTypeName(final DetailAST a
st
) {
+ final FullIdent ident = CheckUtils.createFullType(a
st
.findFirstToken(TokenTypes.TYPE));
return ident.getText();
}
return ident.getText();
}
- public static boolean isLoggerType(final DetailAST aAST) {
- final String typeName = getTypeName(aAST);
- if(typeName.equals(LOGGER_TYPE_FULL_NAME) || typeName.equals(LOGGER_TYPE_NAME)) {
- return true;
- }
- return false;
+ public static boolean isLoggerType(final DetailAST ast) {
+ final String typeName = getTypeName(ast);
+ return typeName.equals(LOGGER_TYPE_FULL_NAME) || typeName.equals(LOGGER_TYPE_NAME);
}
}
- public static String getVariableName(final DetailAST a
AST
) {
- DetailAST identifier = a
AST
.findFirstToken(TokenTypes.IDENT);
+ public static String getVariableName(final DetailAST a
st
) {
+ DetailAST identifier = a
st
.findFirstToken(TokenTypes.IDENT);
return identifier.getText();
}
return identifier.getText();
}
- public static boolean isAFieldVariable(final DetailAST a
AST
) {
- return a
AST
.getParent().getType() == TokenTypes.OBJBLOCK;
+ public static boolean isAFieldVariable(final DetailAST a
st
) {
+ return a
st
.getParent().getType() == TokenTypes.OBJBLOCK;
}
}
- public static String getMethodName(final DetailAST a
AST
) {
- if
(aAST
.getFirstChild().getLastChild() != null) {
- return a
AST
.getFirstChild().getLastChild().getText();
+ public static String getMethodName(final DetailAST a
st
) {
+ if
(ast
.getFirstChild().getLastChild() != null) {
+ return a
st.getFirstChild().getFirstChild().getText() + "." + ast
.getFirstChild().getLastChild().getText();
}
}
- return a
AST
.getFirstChild().getText();
+ return a
st
.getFirstChild().getText();
}
public static boolean isLogMethod(final String methodName) {
return LOG_METHODS.contains(methodName);
}
}
public static boolean isLogMethod(final String methodName) {
return LOG_METHODS.contains(methodName);
}
- public static String getClassName(final DetailAST a
AST
) {
- DetailAST parent = a
AST
.getParent();
- while(parent.getType() != TokenTypes.CLASS_DEF && parent.getType() != TokenTypes.ENUM_DEF) {
+ public static String getClassName(final DetailAST a
st
) {
+ DetailAST parent = a
st
.getParent();
+ while
(parent.getType() != TokenTypes.CLASS_DEF && parent.getType() != TokenTypes.ENUM_DEF) {
parent = parent.getParent();
}
return parent.findFirstToken(TokenTypes.IDENT).getText();
parent = parent.getParent();
}
return parent.findFirstToken(TokenTypes.IDENT).getText();