Skip to content

Commit 96b02b3

Browse files
committed
fixup: apply changes
Signed-off-by: Simon Schrottner <[email protected]>
1 parent a658e68 commit 96b02b3

File tree

113 files changed

+2946
-2184
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+2946
-2184
lines changed

checkstyle.xml

+24-8
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,15 @@
2020

2121
<property name="charset" value="UTF-8"/>
2222

23-
<property name="severity" value="${org.checkstyle.google.severity}" default="warning"/>
23+
<property name="severity" value="error"/>
2424

2525
<property name="fileExtensions" value="java, properties, xml"/>
2626
<!-- Excludes all 'module-info.java' files -->
2727
<!-- See https://checkstyle.org/filefilters/index.html -->
2828
<module name="BeforeExecutionExclusionFileFilter">
2929
<property name="fileNamePattern" value="module\-info\.java$"/>
3030
</module>
31-
32-
<module name="SuppressWarningsFilter"/>
33-
34-
<!-- https://checkstyle.org/filters/suppressionfilter.html -->
31+
<!-- https://checkstyle.org/config_filters.html#SuppressionFilter -->
3532
<module name="SuppressionFilter">
3633
<property name="file" value="${org.checkstyle.google.suppressionfilter.config}"
3734
default="checkstyle-suppressions.xml" />
@@ -58,7 +55,24 @@
5855
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
5956
</module>
6057

58+
<module name="SuppressWarningsFilter" />
59+
6160
<module name="TreeWalker">
61+
<!-- needed for SuppressWarningsFilter -->
62+
<module name="SuppressWarningsHolder" />
63+
64+
<module name="SuppressWarnings">
65+
<property name="id" value="checkstyle:suppresswarnings"/>
66+
</module>
67+
68+
<!-- https://checkstyle.org/config_filters.html#SuppressionXpathFilter -->
69+
<module name="SuppressionXpathFilter">
70+
<property name="file" value="${org.checkstyle.google.suppressionxpathfilter.config}"
71+
default="checkstyle-xpath-suppressions.xml" />
72+
<property name="optional" value="true"/>
73+
</module>
74+
75+
<module name="UnusedImports"/>
6276
<module name="OuterTypeFilename"/>
6377
<module name="IllegalTokenText">
6478
<property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
@@ -296,8 +310,9 @@
296310
| //SLIST[not(parent::CASE_GROUP)]/SLIST/RCURLY"/>
297311
</module>
298312
<module name="AbbreviationAsWordInName">
299-
<property name="ignoreFinal" value="false"/>
300-
<property name="allowedAbbreviationLength" value="0"/>
313+
<property name="ignoreFinal" value="true"/>
314+
<property name="allowedAbbreviations" value="API" />
315+
<property name="allowedAbbreviationLength" value="1"/>
301316
<property name="tokens"
302317
value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, ANNOTATION_DEF, ANNOTATION_FIELD_DEF,
303318
PARAMETER_DEF, VARIABLE_DEF, METHOD_DEF, PATTERN_VARIABLE_DEF, RECORD_DEF,
@@ -373,7 +388,8 @@
373388
<property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF, COMPACT_CTOR_DEF"/>
374389
</module>
375390
<module name="MissingJavadocMethod">
376-
<property name="scope" value="protected"/>
391+
<property name="scope" value="public"/>
392+
<property name="minLineCount" value="2"/>
377393
<property name="allowMissingPropertyJavadoc" value="true"/>
378394
<property name="allowedAnnotations" value="Override, Test"/>
379395
<property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF,

0 commit comments

Comments
 (0)