more google style configs

Author: nidi3

code-assert/src/main/java/guru/nidi/codeassert/checkstyle/StyleChecks.java

@@ -59,6 +59,8 @@ protected Google() {
                     "parameterName", "^[a-z][a-z0-9][a-zA-Z0-9]*$",
                     "catchParameterName", "^[a-z][a-z0-9][a-zA-Z0-9]*$",
                     "localVariableName", "^[a-z][a-z0-9][a-zA-Z0-9]*$",
+                    "memberName", "^[a-z][a-z0-9][a-zA-Z0-9]*$",
+                    "methodName", "^[a-z][a-z0-9][a-zA-Z0-9_]*$",
                     "emptyLine-tokens", asList(PACKAGE_DEF, IMPORT, CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
                             STATIC_INIT, INSTANCE_INIT, METHOD_DEF, CTOR_DEF, VARIABLE_DEF));
         }
@@ -99,6 +101,14 @@ public Google localVarName(String pattern) {
             return withParam("localVariableName", pattern);
         }
 
+        public Google memberName(String pattern) {
+            return withParam("memberName", pattern);
+        }
+
+        public Google methodName(String pattern) {
+            return withParam("methodName", pattern);
+        }
+
         public Google emptyLineSeparatorTokens(int... tokens) {
             final List<Integer> ts = new ArrayList<>();
             for (final int token : tokens) {

code-assert/src/main/java/guru/nidi/codeassert/junit/PredefConfig.java

@@ -25,6 +25,8 @@
 import static guru.nidi.codeassert.pmd.PmdRulesets.*;
 
 public final class PredefConfig {
+    private static final String VARIABLE_PATTERN = "^[a-z][a-zA-Z0-9]*$";
+
     private PredefConfig() {
     }
 
@@ -94,17 +96,19 @@ public static CollectorTemplate<Ignore> minimalCheckstyleIgnore() {
                                 "design.forExtension", "hidden.field", "inline.conditional.avoid", "magic.number"));
     }
 
-    public static StyleChecks adjustedGoogleStyleChecks() {
+    public static StyleChecks.Google adjustedGoogleStyleChecks() {
         return StyleChecks.google()
                 .maxLineLen(120).indentBasic(4).indentCase(4)
-                .paramName("^[a-z][a-zA-Z0-9]*$")
-                .catchParamName("^[a-z][a-zA-Z0-9]*$")
-                .localVarName("^[a-z][a-zA-Z0-9]*$")
+                .paramName(VARIABLE_PATTERN)
+                .catchParamName(VARIABLE_PATTERN)
+                .localVarName(VARIABLE_PATTERN)
+                .memberName(VARIABLE_PATTERN)
+                .methodName(VARIABLE_PATTERN)
                 .emptyLineSeparatorTokens(IMPORT, CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
                         STATIC_INIT, INSTANCE_INIT, METHOD_DEF, CTOR_DEF, VARIABLE_DEF);
     }
 
-    public static StyleChecks adjustedSunStyleChecks() {
+    public static StyleChecks.Sun adjustedSunStyleChecks() {
         return StyleChecks.sun().maxLineLen(120).allowDefaultAccessMembers(true);
     }
 }

code-assert/src/main/resources/guru/nidi/codeassert/checkstyle/google_checks.xml

@@ -98,7 +98,7 @@
              value="Type name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="MemberName">
-            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
+            <property name="format" value="${memberName}"/>
             <message key="name.invalidPattern"
              value="Member name ''{0}'' must match pattern ''{1}''."/>
         </module>
@@ -196,7 +196,7 @@
             <property name="allowThrowsTagsForSubclasses" value="true"/>
         </module>
         <module name="MethodName">
-            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
+            <property name="format" value="${methodName}"/>
             <message key="name.invalidPattern"
              value="Method name ''{0}'' must match pattern ''{1}''."/>
         </module>