diff --git a/client/pom.xml b/client/pom.xml
index da8ae33e0..1d12fea24 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -73,7 +73,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.1.0</version>
                 <configuration>
                     <configLocation>
                         ${project.parent.basedir}/nebula_java_style_checks.xml
@@ -104,7 +104,7 @@
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
                         <artifactId>checkstyle</artifactId>
-                        <version>8.18</version>
+                        <version>8.29</version>
                     </dependency>
                 </dependencies>
             </plugin>
diff --git a/client/src/main/java/com/vesoft/nebula/AbstractClient.java b/client/src/main/java/com/vesoft/nebula/AbstractClient.java
index 904519723..871708c9f 100644
--- a/client/src/main/java/com/vesoft/nebula/AbstractClient.java
+++ b/client/src/main/java/com/vesoft/nebula/AbstractClient.java
@@ -11,12 +11,10 @@
 import com.facebook.thrift.TException;
 import com.facebook.thrift.protocol.TProtocol;
 import com.facebook.thrift.transport.TTransport;
-
 import com.google.common.collect.Lists;
 import com.google.common.net.HostAndPort;
 import com.google.common.net.InetAddresses;
 import com.vesoft.nebula.graph.ErrorCode;
-
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/client/src/main/java/com/vesoft/nebula/Cluster.java b/client/src/main/java/com/vesoft/nebula/Cluster.java
index f16829431..e3b2c583f 100644
--- a/client/src/main/java/com/vesoft/nebula/Cluster.java
+++ b/client/src/main/java/com/vesoft/nebula/Cluster.java
@@ -11,7 +11,6 @@
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.google.common.net.HostAndPort;
-
 import com.vesoft.nebula.session.Session;
 import java.util.List;
 
diff --git a/client/src/main/java/com/vesoft/nebula/client/graph/ResultSet.java b/client/src/main/java/com/vesoft/nebula/client/graph/ResultSet.java
index 18ebf25f8..72b30d5c4 100644
--- a/client/src/main/java/com/vesoft/nebula/client/graph/ResultSet.java
+++ b/client/src/main/java/com/vesoft/nebula/client/graph/ResultSet.java
@@ -8,7 +8,6 @@
 
 import com.google.common.collect.Lists;
 import com.vesoft.nebula.graph.RowValue;
-
 import java.util.Iterator;
 import java.util.List;
 
diff --git a/client/src/main/java/com/vesoft/nebula/client/meta/MetaClientImpl.java b/client/src/main/java/com/vesoft/nebula/client/meta/MetaClientImpl.java
index e9470e3b8..86e0316dc 100644
--- a/client/src/main/java/com/vesoft/nebula/client/meta/MetaClientImpl.java
+++ b/client/src/main/java/com/vesoft/nebula/client/meta/MetaClientImpl.java
@@ -35,7 +35,7 @@
 import com.vesoft.nebula.meta.TagItem;
 import com.vesoft.nebula.utils.AddressUtil;
 import com.vesoft.nebula.utils.NebulaTypeUtil;
-
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
diff --git a/client/src/main/java/com/vesoft/nebula/client/meta/async/AsyncMetaClientImpl.java b/client/src/main/java/com/vesoft/nebula/client/meta/async/AsyncMetaClientImpl.java
index 87c603323..2bdb13c6a 100644
--- a/client/src/main/java/com/vesoft/nebula/client/meta/async/AsyncMetaClientImpl.java
+++ b/client/src/main/java/com/vesoft/nebula/client/meta/async/AsyncMetaClientImpl.java
@@ -22,7 +22,6 @@
 import com.vesoft.nebula.meta.ListTagsReq;
 import com.vesoft.nebula.meta.ListTagsResp;
 import com.vesoft.nebula.meta.MetaService;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/client/src/main/java/com/vesoft/nebula/client/meta/entry/ListEdgesResult.java b/client/src/main/java/com/vesoft/nebula/client/meta/entry/ListEdgesResult.java
index 36c973896..267798176 100644
--- a/client/src/main/java/com/vesoft/nebula/client/meta/entry/ListEdgesResult.java
+++ b/client/src/main/java/com/vesoft/nebula/client/meta/entry/ListEdgesResult.java
@@ -8,7 +8,6 @@
 
 import com.google.common.collect.Maps;
 import com.vesoft.nebula.meta.EdgeItem;
-
 import java.util.Map;
 
 public class ListEdgesResult {
diff --git a/client/src/main/java/com/vesoft/nebula/client/meta/entry/ListSpaceResult.java b/client/src/main/java/com/vesoft/nebula/client/meta/entry/ListSpaceResult.java
index d507eb932..0d6998ed7 100644
--- a/client/src/main/java/com/vesoft/nebula/client/meta/entry/ListSpaceResult.java
+++ b/client/src/main/java/com/vesoft/nebula/client/meta/entry/ListSpaceResult.java
@@ -8,7 +8,6 @@
 
 import com.google.common.collect.Maps;
 import com.vesoft.nebula.meta.ID;
-
 import java.util.Map;
 
 public class ListSpaceResult {
diff --git a/client/src/main/java/com/vesoft/nebula/client/meta/entry/ListTagsResult.java b/client/src/main/java/com/vesoft/nebula/client/meta/entry/ListTagsResult.java
index 55e37d5fd..58fc04be6 100644
--- a/client/src/main/java/com/vesoft/nebula/client/meta/entry/ListTagsResult.java
+++ b/client/src/main/java/com/vesoft/nebula/client/meta/entry/ListTagsResult.java
@@ -8,7 +8,6 @@
 
 import com.google.common.collect.Maps;
 import com.vesoft.nebula.meta.TagItem;
-
 import java.util.Map;
 
 public class ListTagsResult {
diff --git a/client/src/main/java/com/vesoft/nebula/client/storage/processor/Processor.java b/client/src/main/java/com/vesoft/nebula/client/storage/processor/Processor.java
index be53bfb70..66051c19e 100644
--- a/client/src/main/java/com/vesoft/nebula/client/storage/processor/Processor.java
+++ b/client/src/main/java/com/vesoft/nebula/client/storage/processor/Processor.java
@@ -9,7 +9,6 @@
 import com.vesoft.nebula.data.Result;
 import com.vesoft.nebula.data.Row;
 import com.vesoft.nebula.storage.ScanEdgeResponse;
-
 import java.util.List;
 import java.util.Map;
 
diff --git a/client/src/main/java/com/vesoft/nebula/client/storage/processor/ScanEdgeProcessor.java b/client/src/main/java/com/vesoft/nebula/client/storage/processor/ScanEdgeProcessor.java
index 599a4293f..67c4b8ae9 100644
--- a/client/src/main/java/com/vesoft/nebula/client/storage/processor/ScanEdgeProcessor.java
+++ b/client/src/main/java/com/vesoft/nebula/client/storage/processor/ScanEdgeProcessor.java
@@ -15,12 +15,10 @@
 import com.vesoft.nebula.meta.EdgeItem;
 import com.vesoft.nebula.storage.ScanEdge;
 import com.vesoft.nebula.storage.ScanEdgeResponse;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/client/src/main/java/com/vesoft/nebula/client/storage/processor/ScanVertexProcessor.java b/client/src/main/java/com/vesoft/nebula/client/storage/processor/ScanVertexProcessor.java
index 736fd35d8..5f7dc515e 100644
--- a/client/src/main/java/com/vesoft/nebula/client/storage/processor/ScanVertexProcessor.java
+++ b/client/src/main/java/com/vesoft/nebula/client/storage/processor/ScanVertexProcessor.java
@@ -15,12 +15,10 @@
 import com.vesoft.nebula.meta.TagItem;
 import com.vesoft.nebula.storage.ScanVertex;
 import com.vesoft.nebula.storage.ScanVertexResponse;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/client/src/main/java/com/vesoft/nebula/data/RowReader.java b/client/src/main/java/com/vesoft/nebula/data/RowReader.java
index b33f48b7f..cb80a077c 100644
--- a/client/src/main/java/com/vesoft/nebula/data/RowReader.java
+++ b/client/src/main/java/com/vesoft/nebula/data/RowReader.java
@@ -12,7 +12,6 @@
 import com.vesoft.nebula.Schema;
 import com.vesoft.nebula.data.PropertyDef.PropertyType;
 import com.vesoft.nebula.utils.NativeUtils;
-
 import java.io.IOException;
 import java.nio.BufferUnderflowException;
 import java.nio.ByteBuffer;
@@ -21,7 +20,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/client/src/main/java/com/vesoft/nebula/entry/AbstractNebulaCallback.java b/client/src/main/java/com/vesoft/nebula/entry/AbstractNebulaCallback.java
index f9f2f6eed..0dab22ddb 100644
--- a/client/src/main/java/com/vesoft/nebula/entry/AbstractNebulaCallback.java
+++ b/client/src/main/java/com/vesoft/nebula/entry/AbstractNebulaCallback.java
@@ -11,9 +11,7 @@
 import com.facebook.thrift.async.AsyncMethodCallback;
 import com.facebook.thrift.async.TAsyncMethodCall;
 import com.google.common.base.Optional;
-
 import java.util.concurrent.atomic.AtomicBoolean;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/client/src/main/java/com/vesoft/nebula/utils/NativeUtils.java b/client/src/main/java/com/vesoft/nebula/utils/NativeUtils.java
index 6cf0022e3..525908b9b 100644
--- a/client/src/main/java/com/vesoft/nebula/utils/NativeUtils.java
+++ b/client/src/main/java/com/vesoft/nebula/utils/NativeUtils.java
@@ -6,7 +6,6 @@
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/examples/pom.xml b/examples/pom.xml
index 8e21e305d..0d041c169 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -47,7 +47,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.1.0</version>
                 <configuration>
                     <configLocation>
                         ${project.parent.basedir}/nebula_java_style_checks.xml
@@ -75,7 +75,7 @@
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
                         <artifactId>checkstyle</artifactId>
-                        <version>8.18</version>
+                        <version>8.29</version>
                     </dependency>
                 </dependencies>
             </plugin>
diff --git a/examples/src/main/java/com/vesoft/nebula/examples/ScanEdgeInSpaceExample.java b/examples/src/main/java/com/vesoft/nebula/examples/ScanEdgeInSpaceExample.java
index d63051eab..f99ce350e 100644
--- a/examples/src/main/java/com/vesoft/nebula/examples/ScanEdgeInSpaceExample.java
+++ b/examples/src/main/java/com/vesoft/nebula/examples/ScanEdgeInSpaceExample.java
@@ -14,7 +14,6 @@
 import com.vesoft.nebula.data.Result;
 import com.vesoft.nebula.data.Row;
 import com.vesoft.nebula.storage.ScanEdgeResponse;
-
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -22,7 +21,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVPrinter;
 import org.slf4j.Logger;
diff --git a/examples/src/main/java/com/vesoft/nebula/examples/ScanVertexInPartExample.java b/examples/src/main/java/com/vesoft/nebula/examples/ScanVertexInPartExample.java
index e818c794f..50d4e64c7 100644
--- a/examples/src/main/java/com/vesoft/nebula/examples/ScanVertexInPartExample.java
+++ b/examples/src/main/java/com/vesoft/nebula/examples/ScanVertexInPartExample.java
@@ -14,13 +14,11 @@
 import com.vesoft.nebula.client.storage.processor.ScanVertexProcessor;
 import com.vesoft.nebula.data.Result;
 import com.vesoft.nebula.storage.ScanVertexResponse;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/examples/src/main/java/com/vesoft/nebula/examples/SparkExample.java b/examples/src/main/java/com/vesoft/nebula/examples/SparkExample.java
index bab5a16a7..e8b9e644c 100644
--- a/examples/src/main/java/com/vesoft/nebula/examples/SparkExample.java
+++ b/examples/src/main/java/com/vesoft/nebula/examples/SparkExample.java
@@ -6,7 +6,6 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
-
 import org.apache.spark.api.java.JavaPairRDD;
 import org.apache.spark.api.java.JavaRDD;
 import org.apache.spark.api.java.JavaSparkContext;
diff --git a/nebula_java_style_checks.xml b/nebula_java_style_checks.xml
index 0834f7982..94e0865cd 100644
--- a/nebula_java_style_checks.xml
+++ b/nebula_java_style_checks.xml
@@ -5,13 +5,11 @@
 
 <!--
     Checkstyle configuration that checks the Google coding conventions from Google Java Style
-    that can be found at https://google.github.io/styleguide/javaguide.html.
-
+    that can be found at https://google.github.io/styleguide/javaguide.html
     Checkstyle is very configurable. Be sure to read the documentation at
-    http://checkstyle.sf.net (or in your downloaded distribution).
-
+    http://checkstyle.org (or in your downloaded distribution).
     To completely disable a check, just comment it out or delete it from the file.
-
+    To suppress certain violations please review suppression filters.
     Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov.
  -->
 
@@ -21,12 +19,30 @@
     <property name="severity" value="warning"/>
 
     <property name="fileExtensions" value="java, properties, xml"/>
+    <!-- Excludes all 'module-info.java' files              -->
+    <!-- See https://checkstyle.org/config_filefilters.html -->
+    <module name="BeforeExecutionExclusionFileFilter">
+        <property name="fileNamePattern" value="module\-info\.java$"/>
+    </module>
+    <!-- https://checkstyle.org/config_filters.html#SuppressionFilter -->
+    <module name="SuppressionFilter">
+        <property name="file" value="${org.checkstyle.google.suppressionfilter.config}"
+                  default="checkstyle-suppressions.xml" />
+        <property name="optional" value="true"/>
+    </module>
+
     <!-- Checks for whitespace                               -->
-    <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+    <!-- See http://checkstyle.org/config_whitespace.html -->
     <module name="FileTabCharacter">
         <property name="eachLine" value="true"/>
     </module>
 
+    <module name="LineLength">
+        <property name="fileExtensions" value="java"/>
+        <property name="max" value="100"/>
+        <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+    </module>
+
     <module name="TreeWalker">
         <module name="OuterTypeFilename"/>
         <module name="IllegalTokenText">
@@ -41,20 +57,28 @@
             <property name="allowByTailComment" value="true"/>
             <property name="allowNonPrintableEscapes" value="true"/>
         </module>
-        <module name="LineLength">
-            <property name="max" value="100"/>
-            <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
-        </module>
         <module name="AvoidStarImport"/>
         <module name="OneTopLevelClass"/>
-        <module name="NoLineWrap"/>
+        <module name="NoLineWrap">
+            <property name="tokens" value="PACKAGE_DEF, IMPORT, STATIC_IMPORT"/>
+        </module>
         <module name="EmptyBlock">
             <property name="option" value="TEXT"/>
             <property name="tokens"
              value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
         </module>
-        <module name="NeedBraces"/>
-        <module name="LeftCurly"/>
+        <module name="NeedBraces">
+            <property name="tokens"
+             value="LITERAL_DO, LITERAL_ELSE, LITERAL_FOR, LITERAL_IF, LITERAL_WHILE"/>
+        </module>
+        <module name="LeftCurly">
+            <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"/>
+        </module>
         <module name="RightCurly">
             <property name="id" value="RightCurlySame"/>
             <property name="tokens"
@@ -66,13 +90,22 @@
             <property name="option" value="alone"/>
             <property name="tokens"
              value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT,
-                    INSTANCE_INIT"/>
+                    INSTANCE_INIT, ANNOTATION_DEF, ENUM_DEF"/>
         </module>
         <module name="WhitespaceAround">
             <property name="allowEmptyConstructors" value="true"/>
+            <property name="allowEmptyLambdas" value="true"/>
             <property name="allowEmptyMethods" value="true"/>
             <property name="allowEmptyTypes" value="true"/>
             <property name="allowEmptyLoops" value="true"/>
+            <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"/>
             <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)"/>
             <message key="ws.notPreceded"
@@ -86,6 +119,9 @@
         <module name="UpperEll"/>
         <module name="ModifierOrder"/>
         <module name="EmptyLineSeparator">
+            <property name="tokens"
+             value="PACKAGE_DEF, IMPORT, STATIC_IMPORT, CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
+                    STATIC_INIT, INSTANCE_INIT, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
             <property name="allowNoEmptyLineBetweenFields" value="true"/>
         </module>
         <module name="SeparatorWrap">
@@ -121,11 +157,12 @@
              value="Package name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="TypeName">
+            <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, ANNOTATION_DEF"/>
             <message key="name.invalidPattern"
              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="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
             <message key="name.invalidPattern"
              value="Member name ''{0}'' must match pattern ''{1}''."/>
         </module>
@@ -145,7 +182,6 @@
              value="Catch parameter name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="LocalVariableName">
-            <property name="tokens" value="VARIABLE_DEF"/>
             <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
             <message key="name.invalidPattern"
              value="Local variable name ''{0}'' must match pattern ''{1}''."/>
@@ -187,6 +223,9 @@
         <module name="AbbreviationAsWordInName">
             <property name="ignoreFinal" value="false"/>
             <property name="allowedAbbreviationLength" value="4"/>
+            <property name="tokens"
+             value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, ANNOTATION_DEF, ANNOTATION_FIELD_DEF,
+                    PARAMETER_DEF, VARIABLE_DEF, METHOD_DEF"/>
         </module>
         <module name="OverloadMethodsDeclarationOrder"/>
         <module name="VariableDeclarationUsageDistance"/>
@@ -194,14 +233,25 @@
             <property name="sortImportsInGroupAlphabetically" value="true"/>
             <property name="separateLineBetweenGroups" value="true"/>
             <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
+            <property name="tokens" value="IMPORT, STATIC_IMPORT, PACKAGE_DEF"/>
+        </module>
+        <module name="MethodParamPad">
+            <property name="tokens"
+             value="CTOR_DEF, LITERAL_NEW, METHOD_CALL, METHOD_DEF,
+                    SUPER_CTOR_CALL, ENUM_CONSTANT_DEF"/>
         </module>
-        <module name="MethodParamPad"/>
         <module name="NoWhitespaceBefore">
             <property name="tokens"
              value="COMMA, SEMI, POST_INC, POST_DEC, DOT, ELLIPSIS, METHOD_REF"/>
             <property name="allowLineBreaks" value="true"/>
         </module>
-        <module name="ParenPad"/>
+        <module name="ParenPad">
+            <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"/>
+        </module>
         <module name="OperatorWrap">
             <property name="option" value="NL"/>
             <property name="tokens"
@@ -219,7 +269,21 @@
             <property name="allowSamelineMultipleAnnotations" value="true"/>
         </module>
         <module name="NonEmptyAtclauseDescription"/>
+        <module name="InvalidJavadocPosition"/>
         <module name="JavadocTagContinuationIndentation"/>
+        <module name="JavadocParagraph"/>
+        <module name="AtclauseOrder">
+            <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
+            <property name="target"
+             value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
+        </module>
+        <module name="JavadocMethod">
+            <property name="scope" value="public"/>
+            <property name="allowMissingParamTags" value="true"/>
+            <property name="allowMissingReturnTag" value="true"/>
+            <property name="allowedAnnotations" value="Override, Test"/>
+            <property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF"/>
+        </module>
         <module name="MethodName">
             <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
             <message key="name.invalidPattern"
@@ -231,6 +295,14 @@
         <module name="EmptyCatchBlock">
             <property name="exceptionVariableName" value="expected"/>
         </module>
-        <module name="CommentsIndentation"/>
+        <module name="CommentsIndentation">
+            <property name="tokens" value="SINGLE_LINE_COMMENT, BLOCK_COMMENT_BEGIN"/>
+        </module>
+        <!-- https://checkstyle.org/config_filters.html#SuppressionXpathFilter -->
+        <module name="SuppressionXpathFilter">
+            <property name="file" value="${org.checkstyle.google.suppressionxpathfilter.config}"
+                      default="checkstyle-xpath-suppressions.xml" />
+            <property name="optional" value="true"/>
+        </module>
     </module>
 </module>