Skip to content

Commit cacfe64

Browse files
stephengoldstephengold
committed
checkstyle.xml: stricter properties for 14 modules
1 parent 523b2fa commit cacfe64

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

‎config/checkstyle/checkstyle.xml‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,7 @@
7171
<property name="option" value="TEXT"/>
7272
<property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH, ARRAY_INIT, INSTANCE_INIT, LITERAL_CASE, LITERAL_CATCH, LITERAL_DEFAULT, LITERAL_DO, LITERAL_FOR, LITERAL_SYNCHRONIZED, LITERAL_WHILE, STATIC_INIT"/>
7373
</module>
74-
<module name="EmptyCatchBlock">
75-
<property name="exceptionVariableName" value="expected"/>
76-
</module>
74+
<module name="EmptyCatchBlock"/>
7775
<module name="LeftCurly">
7876
<property name="tokens" value="ANNOTATION_DEF, CLASS_DEF, CTOR_DEF, ENUM_CONSTANT_DEF, ENUM_DEF, INTERFACE_DEF, LAMBDA, LITERAL_CASE, LITERAL_CATCH, LITERAL_DEFAULT, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, METHOD_DEF, OBJBLOCK, STATIC_INIT, RECORD_DEF, COMPACT_CTOR_DEF"/>
7977
</module>
@@ -83,7 +81,7 @@
8381
<module name="RightCurly">
8482
<property name="id" value="RightCurlyAlone"/>
8583
<property name="option" value="alone"/>
86-
<property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, INSTANCE_INIT, ANNOTATION_DEF, ENUM_DEF, INTERFACE_DEF, RECORD_DEF, COMPACT_CTOR_DEF"/>
84+
<property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, INSTANCE_INIT, ANNOTATION_DEF, ENUM_DEF, INTERFACE_DEF, RECORD_DEF, COMPACT_CTOR_DEF, LITERAL_SWITCH, LITERAL_CASE"/>
8785
</module>
8886
<module name="SuppressionXpathSingleFilter">
8987
<!-- suppression is required till https://github.com/checkstyle/checkstyle/issues/7541 -->
@@ -174,7 +172,7 @@
174172
<module name="MissingJavadocMethod">
175173
<property name="allowedAnnotations" value=""/>
176174
<property name="minLineCount" value="-1"/>
177-
<property name="scope" value="public"/>
175+
<property name="scope" value="protected"/>
178176
<property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF, COMPACT_CTOR_DEF"/>
179177
</module>
180178
<module name="MissingJavadocType">
@@ -222,6 +220,7 @@
222220
<module name="AbbreviationAsWordInName">
223221
<property name="allowedAbbreviationLength" value="1"/>
224222
<property name="ignoreFinal" value="false"/>
223+
<property name="ignoreStatic" value="false"/>
225224
<property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, ANNOTATION_DEF, ANNOTATION_FIELD_DEF, PARAMETER_DEF, VARIABLE_DEF, METHOD_DEF, PATTERN_VARIABLE_DEF, RECORD_DEF, RECORD_COMPONENT_DEF"/>
226225
</module>
227226
<module name="CatchParameterName">
@@ -233,7 +232,7 @@
233232
<message key="name.invalidPattern" value="Class type name ''{0}'' must match pattern ''{1}''."/>
234233
</module>
235234
<module name="InterfaceTypeParameterName">
236-
<property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
235+
<property name="format" value="^$"/>
237236
<message key="name.invalidPattern" value="Interface type name ''{0}'' must match pattern ''{1}''."/>
238237
</module>
239238
<module name="LambdaParameterName">
@@ -254,27 +253,27 @@
254253
<message key="name.invalidPattern" value="Method name ''{0}'' must match pattern ''{1}''."/>
255254
</module>
256255
<module name="MethodTypeParameterName">
257-
<property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
256+
<property name="format" value="^$"/>
258257
<message key="name.invalidPattern" value="Method type name ''{0}'' must match pattern ''{1}''."/>
259258
</module>
260259
<module name="PackageName">
261-
<property name="format" value="^[a-z][.a-z]*[a-z]$"/>
260+
<property name="format" value="^com[.]github[.]stephengold[.]garrett([.]examples)?$"/>
262261
<message key="name.invalidPattern" value="Package name ''{0}'' must match pattern ''{1}''."/>
263262
</module>
264263
<module name="ParameterName">
265264
<property name="format" value="^[a-z][0-9A-Za-z]{0,19}$"/>
266265
<message key="name.invalidPattern" value="Parameter name ''{0}'' must match pattern ''{1}''."/>
267266
</module>
268267
<module name="PatternVariableName">
269-
<property name="format" value="^[a-z][a-zA-Z0-9]{0,19}$"/>
268+
<property name="format" value="^$"/>
270269
<message key="name.invalidPattern" value="Pattern variable name ''{0}'' must match pattern ''{1}''."/>
271270
</module>
272271
<module name="RecordComponentName">
273-
<property name="format" value="^[a-z][a-zA-Z0-9]{0,19}$"/>
272+
<property name="format" value="^$"/>
274273
<message key="name.invalidPattern" value="Record component name ''{0}'' must match pattern ''{1}''."/>
275274
</module>
276275
<module name="RecordTypeParameterName">
277-
<property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
276+
<property name="format" value="^$"/>
278277
<message key="name.invalidPattern" value="Record type name ''{0}'' must match pattern ''{1}''."/>
279278
</module>
280279
<module name="StaticVariableName"/>
@@ -318,7 +317,7 @@
318317
<message key="ws.preceded" value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
319318
</module>
320319
<module name="MethodParamPad">
321-
<property name="tokens" value="CTOR_DEF, LITERAL_NEW, METHOD_CALL, METHOD_DEF, SUPER_CTOR_CALL, ENUM_CONSTANT_DEF, RECORD_DEF"/>
320+
<property name="tokens" value="CTOR_DEF, LITERAL_NEW, METHOD_CALL, METHOD_DEF, CTOR_CALL, SUPER_CTOR_CALL, ENUM_CONSTANT_DEF, RECORD_DEF, RECORD_PATTERN_DEF"/>
322321
</module>
323322
<module name="NoLineWrap">
324323
<property name="tokens" value="PACKAGE_DEF, IMPORT, STATIC_IMPORT"/>
@@ -334,7 +333,7 @@
334333
<property name="tokens" value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR, METHOD_REF, TYPE_EXTENSION_AND"/>
335334
</module>
336335
<module name="ParenPad">
337-
<property name="tokens" value="ANNOTATION, ANNOTATION_FIELD_DEF, CTOR_CALL, CTOR_DEF, DOT, ENUM_CONSTANT_DEF, EXPR, LITERAL_CATCH, LITERAL_DO, LITERAL_FOR, LITERAL_IF, LITERAL_NEW, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_WHILE, METHOD_CALL, METHOD_DEF, QUESTION, RESOURCE_SPECIFICATION, SUPER_CTOR_CALL, LAMBDA, RECORD_DEF"/>
336+
<property name="tokens" value="ANNOTATION, ANNOTATION_FIELD_DEF, CTOR_CALL, CTOR_DEF, DOT, ENUM_CONSTANT_DEF, EXPR, LITERAL_CATCH, LITERAL_DO, LITERAL_FOR, LITERAL_IF, LITERAL_NEW, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_WHILE, METHOD_CALL, METHOD_DEF, QUESTION, RESOURCE_SPECIFICATION, SUPER_CTOR_CALL, LAMBDA, RECORD_DEF, RECORD_PATTERN_DEF"/>
338337
</module>
339338
<module name="SeparatorWrap">
340339
<!-- ARRAY_DECLARATOR is EOL until https://github.com/google/styleguide/issues/258 -->
@@ -365,7 +364,7 @@
365364
</module>
366365
<module name="TypecastParenPad"/>
367366
<module name="WhitespaceAfter">
368-
<property name="tokens" value="COMMA, SEMI, TYPECAST, LITERAL_IF, LITERAL_ELSE, LITERAL_WHILE, LITERAL_DO, LITERAL_FOR, DO_WHILE"/>
367+
<property name="tokens" value="COMMA, SEMI, TYPECAST, LITERAL_IF, LITERAL_ELSE, LITERAL_RETURN, LITERAL_WHILE, LITERAL_DO, LITERAL_FOR, LITERAL_FINALLY, DO_WHILE, ELLIPSIS, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_CATCH, LAMBDA, LITERAL_YIELD, LITERAL_CASE, LITERAL_WHEN"/>
369368
</module>
370369
<module name="WhitespaceAround">
371370
<property name="allowEmptyConstructors" value="true"/>
@@ -374,7 +373,7 @@
374373
<property name="allowEmptyMethods" value="true"/>
375374
<property name="allowEmptyTypes" value="true"/>
376375
<property name="ignoreEnhancedForColon" value="false"/>
377-
<property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, DO_WHILE, EQUAL, GE, GT, LAMBDA, LAND, LCURLY, LE, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, LITERAL_ASSERT, TYPE_EXTENSION_AND"/>
376+
<property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, DO_WHILE, EQUAL, GE, GT, LAMBDA, LAND, LCURLY, LE, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, LITERAL_ASSERT, TYPE_EXTENSION_AND, LITERAL_WHEN"/>
378377
<message key="ws.notFollowed" value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
379378
<message key="ws.notPreceded" value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
380379
</module>

0 commit comments

Comments
 (0)