Polish

Author: philwebb

spring-javaformat/spring-javaformat-checkstyle/src/main/java/io/spring/javaformat/checkstyle/check/SpringMethodVisibilityCheck.java

@@ -45,21 +45,12 @@ private void visitPublicMethod(DetailAST modifiers, DetailAST method) {
 			return;
 		}
 		DetailAST classDef = getClassDef(method.getParent());
-		if (classDef == null) {
-			return;
-		}
-		DetailAST classModifiers = classDef.findFirstToken(TokenTypes.MODIFIERS);
-		if (classModifiers.findFirstToken(TokenTypes.LITERAL_PUBLIC) != null
-				|| classModifiers.findFirstToken(TokenTypes.LITERAL_PROTECTED) != null) {
+		if (classDef == null || isPublicOrProtected(classDef)) {
 			return;
 		}
 		DetailAST interfaceDef = getInterfaceDef(classDef.getParent());
-		if (interfaceDef != null) {
-			DetailAST interfaceModifiers = interfaceDef.findFirstToken(TokenTypes.MODIFIERS);
-			if (interfaceModifiers.findFirstToken(TokenTypes.LITERAL_PUBLIC) != null
-					|| interfaceModifiers.findFirstToken(TokenTypes.LITERAL_PROTECTED) != null) {
-				return;
-			}
+		if (interfaceDef != null && isPublicOrProtected(interfaceDef)) {
+			return;
 		}
 		DetailAST ident = method.findFirstToken(TokenTypes.IDENT);
 		log(ident.getLineNo(), ident.getColumnNo(), "methodvisibility.publicMethod", ident.getText());
@@ -98,4 +89,13 @@ private DetailAST findParent(DetailAST ast, int classDef) {
 		return null;
 	}
 
+	private boolean isPublicOrProtected(DetailAST ast) {
+		DetailAST modifiers = ast.findFirstToken(TokenTypes.MODIFIERS);
+		if (modifiers == null) {
+			return false;
+		}
+		return modifiers.findFirstToken(TokenTypes.LITERAL_PUBLIC) != null
+				|| modifiers.findFirstToken(TokenTypes.LITERAL_PROTECTED) != null;
+	}
+
 }