Merge pull request #23 from jobarr-amzn/master

Upgrade Checkstyle 8.{18=>37}
amazon-ion · Nov 20, 2020 · d498bae · d498bae
2 parents b1dd858 + 91c550c
commit d498bae
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -90,7 +90,7 @@ jmh {
 }
 
 checkstyle {
-    toolVersion = "8.18"
+    toolVersion = "8.37"
     ignoreFailures = false
     maxWarnings = 0
     maxErrors = 0

diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
@@ -36,6 +36,10 @@
     <property name="fileExtensions" value="java,kt" />
   </module>
 
+  <module name="LineLength">
+    <property name="max" value="120"/>
+    <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+  </module>
   <module name="TreeWalker">
     <module name="SuppressionCommentFilter" /> <!-- allows for CHECKSTYLE:OFF comments -->
     <module name="OuterTypeFilename"/>
@@ -51,10 +55,6 @@
       <property name="allowByTailComment" value="true"/>
       <property name="allowNonPrintableEscapes" value="true"/>
     </module>
-    <module name="LineLength">
-      <property name="max" value="120"/>
-      <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
-    </module>
     <module name="AvoidStarImport"/>
     <module name="OneTopLevelClass"/>
     <module name="NoLineWrap"/>
@@ -238,15 +238,17 @@
       <property name="target"
         value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
     </module>
+    <module name="MissingJavadocMethodCheck">
+      <property name="minLineCount" value="2"/>
+      <property name="ignoreMethodNamesRegex" value="(g|s)et[a-z0-9][a-zA-Z0-9_]*"/> <!-- getters and setters -->
+      <property name="allowedAnnotations" value="Override, Test"/>
+    </module>
     <module name="JavadocMethod">
       <property name="scope" value="public"/>
       <property name="allowMissingParamTags" value="true"/>
-      <property name="allowMissingThrowsTags" value="true"/>
+      <property name="validateThrows" value="false"/>
       <property name="allowMissingReturnTag" value="true"/>
-      <property name="minLineCount" value="2"/>
       <property name="allowedAnnotations" value="Override, Test"/>
-      <property name="allowThrowsTagsForSubclasses" value="true"/>
-      <property name="ignoreMethodNamesRegex" value="(g|s)et[a-z0-9][a-zA-Z0-9_]*"/> <!-- getters and setters -->
     </module>
     <module name="MethodName">
       <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
@@ -261,4 +263,4 @@
     </module>
     <module name="CommentsIndentation"/>
   </module>
-</module>
+</module>