From e13a5f47574cf2f725611cfe21d5cfce141a2fcb Mon Sep 17 00:00:00 2001
From: lamber-ken <lamberken@163.com>
Date: Fri, 22 Nov 2019 21:49:35 +0800
Subject: [PATCH 1/3] [HUDI-358] Add Java-doc and importOrder checkstyle rule

---
 style/checkstyle.xml | 37 ++++++++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/style/checkstyle.xml b/style/checkstyle.xml
index 7eab7b439cfce..fccce7e6fd00e 100644
--- a/style/checkstyle.xml
+++ b/style/checkstyle.xml
@@ -206,11 +206,6 @@
             <property name="allowedDistance" value="5"/>
         </module>
         -->
-        <module name="CustomImportOrder">
-            <property name="sortImportsInGroupAlphabetically" value="true"/>
-            <property name="separateLineBetweenGroups" value="true"/>
-            <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
-        </module>
         <module name="UnusedImports"/>
         <module name="RedundantImport"/>
 
@@ -274,5 +269,37 @@
         </module>
 
         <module name="EmptyStatement" />
+
+        <!-- Checks for Java Docs. -->
+        <module name="JavadocStyle">
+            <property name="severity" value="info"/>
+        </module>
+        <module name="JavadocType">
+            <property name="severity" value="info"/>
+            <property name="scope" value="protected"/>
+            <property name="allowMissingParamTags" value="true"/>
+        </module>
+
+        <!-- Checks for out of order import statements. -->
+        <module name="ImportOrder">
+            <property name="severity" value="info"/>
+            <property name="groups" value="org.apache.hudi,*,javax,java,scala"/>
+            <property name="separated" value="true"/>
+            <property name="sortStaticImportsAlphabetically" value="true"/>
+            <property name="option" value="bottom"/>
+            <property name="tokens" value="STATIC_IMPORT, IMPORT"/>
+            <message key="import.ordering"
+                     value="Import {0} appears after other imports that it should precede"/>
+        </module>
+
+        <!-- Checks for redundant imports. -->
+        <module name="RedundantImport">
+            <message key="import.redundancy"
+                     value="Redundant import {0}."/>
+        </module>
+
+        <!-- Checks for star import. -->
+        <module name="AvoidStarImport" />
+
     </module>
 </module>

From 0e412002e7a5bcf2ac98bb4136d42383cb754505 Mon Sep 17 00:00:00 2001
From: lamber-ken <lamberken@163.com>
Date: Sat, 23 Nov 2019 02:10:46 +0800
Subject: [PATCH 2/3] update checkstyle.xml

---
 style/checkstyle.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/style/checkstyle.xml b/style/checkstyle.xml
index fccce7e6fd00e..10558f2aef3ed 100644
--- a/style/checkstyle.xml
+++ b/style/checkstyle.xml
@@ -294,8 +294,7 @@
 
         <!-- Checks for redundant imports. -->
         <module name="RedundantImport">
-            <message key="import.redundancy"
-                     value="Redundant import {0}."/>
+            <message key="import.redundancy" value="Redundant import {0}."/>
         </module>
 
         <!-- Checks for star import. -->

From 114a52579544187b087787bfb8e5e379ce22463f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E7=A3=8A?= <lamberken@163.com>
Date: Sat, 23 Nov 2019 17:39:36 +0800
Subject: [PATCH 3/3] update checkstyle.xml

---
 style/checkstyle.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/style/checkstyle.xml b/style/checkstyle.xml
index 10558f2aef3ed..91f51c373567c 100644
--- a/style/checkstyle.xml
+++ b/style/checkstyle.xml
@@ -292,11 +292,6 @@
                      value="Import {0} appears after other imports that it should precede"/>
         </module>
 
-        <!-- Checks for redundant imports. -->
-        <module name="RedundantImport">
-            <message key="import.redundancy" value="Redundant import {0}."/>
-        </module>
-
         <!-- Checks for star import. -->
         <module name="AvoidStarImport" />