Skip to content

Commit 7f891b5

Browse files
committed
Fix checkstyle rules for new release
- LineLength is no longer a child of tree walker - Some of the JavadocMethod properties no longer exist - Turn on alone_or_singleline for RightCurly
1 parent a0ef411 commit 7f891b5

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

checkstyle-override.xml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<!--
33
4-
Copyright 2016-2018 the original author or authors.
4+
Copyright 2016-2020 the original author or authors.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -44,6 +44,11 @@
4444
<property name="eachLine" value="true"/>
4545
</module>
4646

47+
<module name="LineLength">
48+
<property name="max" value="120"/>
49+
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
50+
</module>
51+
4752
<module name="TreeWalker">
4853
<module name="OuterTypeFilename"/>
4954
<module name="IllegalTokenText">
@@ -56,10 +61,6 @@
5661
<property name="allowByTailComment" value="true"/>
5762
<property name="allowNonPrintableEscapes" value="true"/>
5863
</module>
59-
<module name="LineLength">
60-
<property name="max" value="120"/>
61-
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
62-
</module>
6364
<module name="AvoidStarImport"/>
6465
<module name="OneTopLevelClass"/>
6566
<module name="NoLineWrap"/>
@@ -75,7 +76,7 @@
7576
</module>
7677
<module name="RightCurly">
7778
<property name="id" value="RightCurlyAlone"/>
78-
<property name="option" value="alone"/>
79+
<property name="option" value="alone_or_singleline"/>
7980
<property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, INSTANCE_INIT"/>
8081
</module>
8182
<module name="WhitespaceAround">
@@ -217,12 +218,8 @@
217218
<module name="JavadocMethod">
218219
<property name="scope" value="public"/>
219220
<property name="allowMissingParamTags" value="true"/>
220-
<property name="allowMissingThrowsTags" value="true"/>
221221
<property name="allowMissingReturnTag" value="true"/>
222-
<property name="allowMissingJavadoc" value="true"/>
223-
<property name="minLineCount" value="2"/>
224222
<property name="allowedAnnotations" value="Override, Test"/>
225-
<property name="allowThrowsTagsForSubclasses" value="true"/>
226223
</module>
227224
<module name="MethodName">
228225
<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>

0 commit comments

Comments
 (0)