From d5615b4edd84881f7c9982ae444200e68c0e1e34 Mon Sep 17 00:00:00 2001
From: morrySnow <morrysnow@126.com>
Date: Sat, 7 May 2022 12:32:37 +0800
Subject: [PATCH 1/3] add suppressions to checkstyle

---
 fe/check/checkstyle/checkstyle.xml   | 12 +++++++++++
 fe/check/checkstyle/suppressions.xml | 31 ++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 fe/check/checkstyle/suppressions.xml

diff --git a/fe/check/checkstyle/checkstyle.xml b/fe/check/checkstyle/checkstyle.xml
index 0477368ce8341e..b1e6a0712982f8 100644
--- a/fe/check/checkstyle/checkstyle.xml
+++ b/fe/check/checkstyle/checkstyle.xml
@@ -32,6 +32,16 @@ under the License.
         <property name="fileNamePattern" value="module\-info\.java$"/>
     </module>
 
+    <module name="Header">
+        <property name="headerFile" value="check/checkstyle/checkstyle-apache-header.txt"/>
+        <property name="fileExtensions" value="java"/>
+    </module>
+
+    <module name="SuppressionFilter">
+        <property name="file" value="check/checkstyle/suppressions.xml"/>
+        <property name="optional" value="false"/>
+    </module>
+
     <module name="FileTabCharacter">
         <property name="eachLine" value="true"/>
     </module>
@@ -171,6 +181,7 @@ under the License.
         </module>
         <module name="InvalidJavadocPosition"/>
         <module name="JavadocMethod">
+            <property name="id" value="ProductionScope"/>
             <property name="accessModifiers" value="public"/>
             <property name="allowMissingParamTags" value="true"/>
             <property name="allowMissingReturnTag" value="true"/>
@@ -179,6 +190,7 @@ under the License.
         </module>
 
         <module name="JavadocParagraph"/>
+        <module name="JavadocStyle"/>
         <module name="JavadocTagContinuationIndentation"/>
         <module name="MissingJavadocMethod">
             <property name="scope" value="public"/>
diff --git a/fe/check/checkstyle/suppressions.xml b/fe/check/checkstyle/suppressions.xml
new file mode 100644
index 00000000000000..5fdf9fff70f76b
--- /dev/null
+++ b/fe/check/checkstyle/suppressions.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<!DOCTYPE suppressions PUBLIC
+    "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+    "https://checkstyle.org/dtds/suppressions_1_2.dtd">
+
+<suppressions>
+    <!-- Excludes test files from having Javadocs for classes and methods -->
+    <suppress files="[\\/]*[\\/]test[\\/].*" checks="MissingJavadocMethod" />
+    <suppress files="[\\/]*[\\/]test[\\/].*" checks="MissingJavadocType" />
+    <suppress files="[\\/]src[\\/]test[\\/].*|[\\/]generated-test-sources[\\/].*" checks="MissingJavadocMethod" />
+    <suppress files="[\\/]src[\\/]test[\\/].*|[\\/]generated-test-sources[\\/].*" checks="MissingJavadocType" />
+</suppressions>

From 76709bf7efe06d65feddcac423b5941be6c47b31 Mon Sep 17 00:00:00 2001
From: morrySnow <morrysnow@126.com>
Date: Sat, 7 May 2022 14:23:50 +0800
Subject: [PATCH 2/3] update relative path

---
 fe/check/checkstyle/checkstyle.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/fe/check/checkstyle/checkstyle.xml b/fe/check/checkstyle/checkstyle.xml
index b1e6a0712982f8..736980867eed57 100644
--- a/fe/check/checkstyle/checkstyle.xml
+++ b/fe/check/checkstyle/checkstyle.xml
@@ -32,13 +32,8 @@ under the License.
         <property name="fileNamePattern" value="module\-info\.java$"/>
     </module>
 
-    <module name="Header">
-        <property name="headerFile" value="check/checkstyle/checkstyle-apache-header.txt"/>
-        <property name="fileExtensions" value="java"/>
-    </module>
-
     <module name="SuppressionFilter">
-        <property name="file" value="check/checkstyle/suppressions.xml"/>
+        <property name="file" value="fe/check/checkstyle/suppressions.xml"/>
         <property name="optional" value="false"/>
     </module>
 

From 906793b34d031c49c8324bbb3f06c2198d5adeeb Mon Sep 17 00:00:00 2001
From: morrySnow <morrysnow@126.com>
Date: Sat, 7 May 2022 15:54:12 +0800
Subject: [PATCH 3/3] add suppress to mvn checkstyle:check

---
 fe/check/checkstyle/checkstyle.xml   | 2 +-
 fe/check/checkstyle/suppressions.xml | 7 +++----
 fe/pom.xml                           | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/fe/check/checkstyle/checkstyle.xml b/fe/check/checkstyle/checkstyle.xml
index 736980867eed57..e576ac69388243 100644
--- a/fe/check/checkstyle/checkstyle.xml
+++ b/fe/check/checkstyle/checkstyle.xml
@@ -34,7 +34,7 @@ under the License.
 
     <module name="SuppressionFilter">
         <property name="file" value="fe/check/checkstyle/suppressions.xml"/>
-        <property name="optional" value="false"/>
+        <property name="optional" value="true"/>
     </module>
 
     <module name="FileTabCharacter">
diff --git a/fe/check/checkstyle/suppressions.xml b/fe/check/checkstyle/suppressions.xml
index 5fdf9fff70f76b..4f7909fd1f9866 100644
--- a/fe/check/checkstyle/suppressions.xml
+++ b/fe/check/checkstyle/suppressions.xml
@@ -24,8 +24,7 @@ under the License.
 
 <suppressions>
     <!-- Excludes test files from having Javadocs for classes and methods -->
-    <suppress files="[\\/]*[\\/]test[\\/].*" checks="MissingJavadocMethod" />
-    <suppress files="[\\/]*[\\/]test[\\/].*" checks="MissingJavadocType" />
-    <suppress files="[\\/]src[\\/]test[\\/].*|[\\/]generated-test-sources[\\/].*" checks="MissingJavadocMethod" />
-    <suppress files="[\\/]src[\\/]test[\\/].*|[\\/]generated-test-sources[\\/].*" checks="MissingJavadocType" />
+    <suppress files="[\\/]jmockit[\\/]" checks=".*" />
+    <suppress files="[\\/]test[\\/]" checks="MissingJavadocMethod" />
+    <suppress files="[\\/]test[\\/]" checks="MissingJavadocType" />
 </suppressions>
diff --git a/fe/pom.xml b/fe/pom.xml
index ae593bbcf9796f..4d621b2e215491 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -151,11 +151,11 @@ under the License.
                     </dependencies>
                     <configuration>
                         <configLocation>check/checkstyle/checkstyle.xml</configLocation>
+                        <suppressionsLocation>check/checkstyle/suppressions.xml</suppressionsLocation>
                         <encoding>UTF-8</encoding>
                         <consoleOutput>true</consoleOutput>
                         <failsOnError>true</failsOnError>
                         <linkXRef>false</linkXRef>
-                        <excludes>**/jmockit/**/*</excludes>
                     </configuration>
                     <executions>
                         <execution>