From d39c3e415374653f65ba974bacc9a3be97118755 Mon Sep 17 00:00:00 2001
From: Lee Dongjin <dongjin@apache.org>
Date: Sat, 27 Mar 2021 22:23:49 +0900
Subject: [PATCH 1/7] Define an Java import order and configure automatic code
 formatting

1. Define an Java import order: kafka, org.apache.kafka, com, net, org, java, javax, (static imports).

2. Add eclipse formatter and configure automatic code formatting.

3. Suppress import order check for all modules.

4. Separate raft module configurations in suppression.xml.

5. Add storage module configurations in suppression.xml.

Define an Java import order and configure automatic code formatting (2)

Make server-common's import ordering off
---
 README.md                   | 16 ++++++++-
 build.gradle                | 24 +++++++++++++
 checkstyle/checkstyle.xml   |  7 ++++
 checkstyle/suppressions.xml | 69 +++++++++++++++++++++++++++++--------
 eclipse-formatter.xml       | 52 ++++++++++++++++++++++++++++
 5 files changed, 153 insertions(+), 15 deletions(-)
 create mode 100644 eclipse-formatter.xml

diff --git a/README.md b/README.md
index a4fd037ce8824..71e553c50621a 100644
--- a/README.md
+++ b/README.md
@@ -159,7 +159,7 @@ Please note for this to work you should create/update user maven settings (typic
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
                            https://maven.apache.org/xsd/settings-1.0.0.xsd">
-    ...                           
+    ...
     <servers>
        ...
        <server>
@@ -207,6 +207,20 @@ You can run checkstyle using:
 The checkstyle warnings will be found in `reports/checkstyle/reports/main.html` and `reports/checkstyle/reports/test.html` files in the
 subproject build directories. They are also printed to the console. The build will fail if Checkstyle fails.
 
+As of present, the auto-formatting configuration is working in progress. Auto-formatting is automatically invoked for the modules listed below when the 'checkstyleMain' or 'checkstyleTest' task is run.
+
+- (No modules specified yet)
+
+You can also run auto-formatting independently for a single module listed above, like:
+
+    ./gradlew :core:spotlessApply   # auto-format *.java files in core module, without running checkstyleMain or checkstyleTest.
+
+If you are using an IDE, you can use a plugin that provides real-time automatic formatting. For detailed information, refer to the following links:
+
+- [Eclipse](https://checkstyle.org/eclipse-cs)
+- [Intellij](https://plugins.jetbrains.com/plugin/1065-checkstyle-idea)
+- [Vscode](https://marketplace.visualstudio.com/items?itemName=shengchen.vscode-checkstyle)
+
 #### Spotbugs ####
 Spotbugs uses static analysis to look for bugs in the code.
 You can run spotbugs using:
diff --git a/build.gradle b/build.gradle
index b589525dff501..290f3d1498346 100644
--- a/build.gradle
+++ b/build.gradle
@@ -187,6 +187,7 @@ subprojects {
   apply plugin: 'checkstyle'
   apply plugin: "com.github.spotbugs"
   apply plugin: 'org.gradle.test-retry'
+  apply plugin: 'com.diffplug.spotless'
 
   // We use the shadow plugin for the jmh-benchmarks module and the `-all` jar can get pretty large, so
   // don't publish it
@@ -611,6 +612,26 @@ subprojects {
     }
   }
 
+  spotless {
+    java {
+      importOrder('kafka', 'org.apache.kafka', 'com', 'net', 'org', 'java', 'javax', '', '\\#')
+
+      // auto-format specified modules only; the list of auto-format modules will be updated incrementally.
+      if ([].contains(project.name)) {
+        target 'src/**/*.java'
+      } else {
+        target = project.files([])
+      }
+
+      eclipse('4.13.0').configFile("$rootDir/eclipse-formatter.xml")
+      indentWithSpaces()
+      trimTrailingWhitespace()
+      removeUnusedImports()
+
+      licenseHeaderFile file("$rootDir/checkstyle/java.header")
+    }
+  }
+
   checkstyle {
     configFile = new File(rootDir, "checkstyle/checkstyle.xml")
     configProperties = checkstyleConfigProperties("import-control.xml")
@@ -622,6 +643,9 @@ subprojects {
     description = 'Run checkstyle on all main Java sources'
   }
 
+  checkstyleMain.dependsOn('spotlessApply')
+  checkstyleTest.dependsOn('spotlessApply')
+
   configure(checkstyleTest) {
     group = 'Verification'
     description = 'Run checkstyle on all test Java sources'
diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml
index 7f912dc428a15..fe6cde0e2ba4a 100644
--- a/checkstyle/checkstyle.xml
+++ b/checkstyle/checkstyle.xml
@@ -34,6 +34,13 @@
     <module name="UnusedImports">
       <property name="processJavadoc" value="true" />
     </module>
+    <module name="ImportOrder">
+      <property name="groups" value="kafka,org.apache.kafka,com,net,org,java,javax"/>
+      <property name="ordered" value="true"/>
+      <property name="separated" value="true"/>
+      <property name="option" value="bottom"/>
+      <property name="sortStaticImportsAlphabetically" value="true"/>
+    </module>
     <module name="RedundantImport"/>
     <module name="IllegalImport" />
     <module name="EqualsHashCode"/>
diff --git a/checkstyle/suppressions.xml b/checkstyle/suppressions.xml
index 538feca238cb0..dc0af38b724b7 100644
--- a/checkstyle/suppressions.xml
+++ b/checkstyle/suppressions.xml
@@ -19,9 +19,15 @@
               files="(FieldSpec|MessageDataGenerator).java"/>
     <suppress id="dontUseSystemExit"
               files="MessageGenerator.java"/>
-
-    <!-- core -->
-    <suppress checks="(NPathComplexity|ClassFanOutComplexity|CyclomaticComplexity|ClassDataAbstractionCoupling|FinalLocalVariable|LocalVariableName|MemberName|ParameterName|MethodLength|JavaNCSS|AvoidStarImport)"
+    <suppress checks="(ImportOrder|AvoidStarImport)"
+              files="generator[\\/]src[\\/](main|test)[\\/].+.java$"/>
+    <suppress checks="(ImportOrder|AvoidStarImport)"
+              files="generator[\\/]src[\\/](generated|generated-test)[\\/].+.java$"/>
+
+    <!-- Core -->
+    <suppress checks="(ImportOrder|AvoidStarImport)"
+              files="core[\\/]src[\\/](main|test)[\\/].+.java$"/>
+    <suppress checks="(NPathComplexity|ClassFanOutComplexity|CyclomaticComplexity|ClassDataAbstractionCoupling|FinalLocalVariable|LocalVariableName|MemberName|ParameterName|MethodLength|JavaNCSS|ImportOrder|AvoidStarImport)"
               files="core[\\/]src[\\/](generated|generated-test)[\\/].+.java$"/>
     <suppress checks="NPathComplexity" files="ClusterTestExtensions.java"/>
 
@@ -81,8 +87,10 @@
     <suppress checks="(UnnecessaryParentheses|BooleanExpressionComplexity|CyclomaticComplexity|WhitespaceAfter|LocalVariableName)"
               files="Murmur3.java"/>
 
-    <suppress checks="(NPathComplexity|ClassFanOutComplexity|CyclomaticComplexity|ClassDataAbstractionCoupling|LocalVariableName|MemberName|ParameterName|MethodLength|JavaNCSS|AvoidStarImport)"
-            files="clients[\\/]src[\\/](generated|generated-test)[\\/].+.java$"/>
+    <suppress checks="(ImportOrder|AvoidStarImport)"
+              files="clients[\\/]src[\\/](main|test)[\\/].+.java$"/>
+    <suppress checks="(NPathComplexity|ClassFanOutComplexity|CyclomaticComplexity|ClassDataAbstractionCoupling|LocalVariableName|MemberName|ParameterName|MethodLength|JavaNCSS|ImportOrder|AvoidStarImport)"
+              files="clients[\\/]src[\\/](generated|generated-test)[\\/].+.java$"/>
 
     <suppress checks="NPathComplexity"
             files="MessageTest.java|OffsetFetchRequest.java"/>
@@ -135,7 +143,12 @@
     <suppress checks="NPathComplexity"
               files="(DistributedHerder|RestClient|RestServer|JsonConverter|KafkaConfigBackingStore|FileStreamSourceTask|TopicAdmin).java"/>
 
-    <!-- connect tests-->
+    <suppress checks="(ImportOrder|AvoidStarImport)"
+              files="connect.+[\\/]src[\\/](main|test)[\\/].+.java$"/>
+    <suppress checks="(ImportOrder|AvoidStarImport)"
+              files="connect.+[\\/]src[\\/](generated|generated-test)[\\/].+.java$"/>
+
+    <!-- Connect tests-->
     <suppress checks="ClassDataAbstractionCoupling"
               files="(DistributedHerder|KafkaBasedLog|WorkerSourceTaskWithTopicCreation|WorkerSourceTask)Test.java"/>
 
@@ -150,6 +163,10 @@
     <suppress checks="JavaNCSS"
               files="DistributedHerderTest.java"/>
 
+    <!-- Server-common -->
+    <suppress checks="(ImportOrder|AvoidStarImport)"
+              files="server-common[\\/]src[\\/](main|test)[\\/].+.java$"/>
+
     <!-- Streams -->
     <suppress checks="ClassFanOutComplexity"
               files="(KafkaStreams|KStreamImpl|KTableImpl|StreamsPartitionAssignor).java"/>
@@ -182,13 +199,12 @@
     <suppress checks="FinalLocalVariable"
               files="^(?!.*[\\/]org[\\/]apache[\\/]kafka[\\/]streams[\\/].*$)"/>
 
+    <suppress checks="(ImportOrder|AvoidStarImport)"
+              files="streams[\\/]src[\\/](main|test)[\\/].+.java$"/>
+
     <!-- Generated code -->
-    <suppress checks="(NPathComplexity|ClassFanOutComplexity|CyclomaticComplexity|ClassDataAbstractionCoupling|FinalLocalVariable|LocalVariableName|MemberName|ParameterName|MethodLength|JavaNCSS|AvoidStarImport)"
+    <suppress checks="(NPathComplexity|ClassFanOutComplexity|CyclomaticComplexity|ClassDataAbstractionCoupling|FinalLocalVariable|LocalVariableName|MemberName|ParameterName|MethodLength|JavaNCSS|ImportOrder|AvoidStarImport)"
               files="streams[\\/]src[\\/](generated|generated-test)[\\/].+.java$"/>
-    <suppress checks="(NPathComplexity|ClassFanOutComplexity|CyclomaticComplexity|ClassDataAbstractionCoupling|FinalLocalVariable|LocalVariableName|MemberName|ParameterName|MethodLength|JavaNCSS|AvoidStarImport)"
-              files="raft[\\/]src[\\/](generated|generated-test)[\\/].+.java$"/>
-    <suppress checks="(NPathComplexity|ClassFanOutComplexity|CyclomaticComplexity|ClassDataAbstractionCoupling|FinalLocalVariable|LocalVariableName|MemberName|ParameterName|MethodLength|JavaNCSS|AvoidStarImport)"
-              files="storage[\\/]src[\\/](generated|generated-test)[\\/].+.java$"/>
 
     <suppress checks="ImportControl" files="FetchResponseData.java"/>
     <suppress checks="ImportControl" files="RecordsSerdeTest.java"/>
@@ -226,10 +242,18 @@
               files="TopologyTestDriver.java"/>
     <suppress checks="ClassDataAbstractionCoupling"
               files="TopologyTestDriver.java"/>
+    <suppress checks="(ImportOrder|AvoidStarImport)"
+              files="streams[\\/]test-utils[\\/]src[\\/](main|test)[\\/].+.java$"/>
 
     <!-- Streams examples -->
     <suppress id="dontUseSystemExit"
               files="PageViewTypedDemo.java|PipeDemo.java|TemperatureDemo.java|WordCountDemo.java|WordCountProcessorDemo.java|WordCountTransformerDemo.java"/>
+    <suppress checks="(ImportOrder|AvoidStarImport)"
+              files="examples[\\/]src[\\/](main|test)[\\/].+.java$"/>
+
+    <!-- Jmh-benchmarks -->
+    <suppress checks="(ImportOrder|AvoidStarImport)"
+              files="jmh-benchmarks[\\/]src[\\/](main|test)[\\/].+.java$"/>
 
     <!-- Tools -->
     <suppress checks="ClassDataAbstractionCoupling"
@@ -254,10 +278,14 @@
               files="VerifiableConsumer.java"/>
     <suppress id="dontUseSystemExit"
               files="VerifiableProducer.java"/>
+    <suppress checks="(ImportOrder|AvoidStarImport)"
+              files="tools[\\/]src[\\/](main|test)[\\/].+.java$"/>
 
     <!-- Shell -->
     <suppress checks="CyclomaticComplexity"
               files="(GlobComponent).java"/>
+    <suppress checks="(ImportOrder|AvoidStarImport)"
+              files="shell[\\/]src[\\/](main|test)[\\/].+.java$"/>
 
     <!-- Log4J-Appender -->
     <suppress checks="CyclomaticComplexity"
@@ -267,8 +295,10 @@
               files="KafkaLog4jAppender.java"/>
     <suppress checks="JavaNCSS"
               files="RequestResponseTest.java"/>
+    <suppress checks="(ImportOrder|AvoidStarImport)"
+              files="log4j-appender[\\/]src[\\/](main|test)[\\/].+.java$"/>
 
-    <!-- metadata -->
+    <!-- Metadata -->
     <suppress checks="ClassDataAbstractionCoupling"
               files="(QuorumControllerTest|ReplicationControlManager|ReplicationControlManagerTest).java"/>
     <suppress checks="ClassFanOutComplexity"
@@ -279,15 +309,26 @@
               files="(ClientQuotasImage|ReplicationControlManager).java"/>
     <suppress checks="NPathComplexity"
               files="(ClientQuotasImage|KafkaEventQueue|ReplicationControlManager).java"/>
-    <suppress checks="(NPathComplexity|ClassFanOutComplexity|CyclomaticComplexity|ClassDataAbstractionCoupling|LocalVariableName|MemberName|ParameterName|MethodLength|JavaNCSS|AvoidStarImport)"
+    <suppress checks="(ImportOrder|AvoidStarImport)"
+              files="metadata[\\/]src[\\/](main|test)[\\/].+.java$"/>
+    <suppress checks="(NPathComplexity|ClassFanOutComplexity|CyclomaticComplexity|ClassDataAbstractionCoupling|LocalVariableName|MemberName|ParameterName|MethodLength|JavaNCSS|ImportOrder|AvoidStarImport)"
             files="metadata[\\/]src[\\/](generated|generated-test)[\\/].+.java$"/>
 
+    <!-- Raft -->
+    <suppress checks="(ImportOrder|AvoidStarImport)"
+              files="raft[\\/]src[\\/](main|test)[\\/].+.java$"/>
+    <suppress checks="(NPathComplexity|ClassFanOutComplexity|CyclomaticComplexity|ClassDataAbstractionCoupling|FinalLocalVariable|LocalVariableName|MemberName|ParameterName|MethodLength|JavaNCSS|ImportOrder|AvoidStarImport)"
+              files="raft[\\/]src[\\/](generated|generated-test)[\\/].+.java$"/>
+
     <!-- Storage -->
+    <suppress checks="(ImportOrder|AvoidStarImport)"
+              files="storage[\\/]src[\\/](main|test)[\\/].+.java$"/>
+    <suppress checks="(NPathComplexity|ClassFanOutComplexity|CyclomaticComplexity|ClassDataAbstractionCoupling|FinalLocalVariable|LocalVariableName|MemberName|ParameterName|MethodLength|JavaNCSS|ImportOrder|AvoidStarImport)"
+              files="storage[\\/]src[\\/](generated|generated-test)[\\/].+.java$"/>
     <suppress checks="(CyclomaticComplexity|ParameterNumber)"
               files="(RemoteLogManagerConfig).java"/>
 
     <!-- benchmarks -->
     <suppress checks="ClassDataAbstractionCoupling"
               files="(ReplicaFetcherThreadBenchmark).java"/>
-
 </suppressions>
diff --git a/eclipse-formatter.xml b/eclipse-formatter.xml
new file mode 100644
index 0000000000000..6f8b3f2ebc711
--- /dev/null
+++ b/eclipse-formatter.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<profiles version="1">
+<profile kind="CodeFormatterProfile" name="ApacheKafka" version="1">
+    <!-- Import ordering -->
+    <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
+    <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+    <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+
+    <!-- Line -->
+    <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
+    <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
+
+    <!-- Brace -->
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+
+    <!-- Indentation -->
+    <setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
+    <setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="1"/>
+    <setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="1"/>
+    <setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+
+    <!-- Tabs -->
+    <setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
+    <setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
+
+    <!-- Alignment -->
+    <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="18"/>
+    <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="18"/>
+    <setting id="org.eclipse.jdt.core.formatter.alignment_for_cascading_method_invocation_with_arguments" value="82"/>
+
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+
+    <!-- Wrapping -->
+    <setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="false"/>
+    <setting id="org.eclipse.jdt.core.formatter.wrap_prefer_two_fragments" value="false"/>
+
+    <!-- No trailing spaces -->
+    <setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+
+    <!-- Add a blank line at the end of the class -->
+    <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration" value="1"/>
+</profile>
+</profiles>

From 2ef5af78ada2496997c8d5e25790a50f2ac3ebec Mon Sep 17 00:00:00 2001
From: Lee Dongjin <dongjin@apache.org>
Date: Wed, 14 Apr 2021 23:39:59 +0900
Subject: [PATCH 2/7] =?UTF-8?q?1.=20Fix=20typo:=20working=20in=20progress?=
 =?UTF-8?q?=20=E2=86=92=20work=20in=20progress.=202.=20Remove=20Line,=20Br?=
 =?UTF-8?q?acing=20related=20formatting=20rules.=203.=20Comment=20is=20not?=
 =?UTF-8?q?=20a=20target=20of=20the=20formatting=20anymore.=204.=20Wrap=20?=
 =?UTF-8?q?after=20assignment=20operator.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md             |  2 +-
 eclipse-formatter.xml | 22 +++++-----------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 71e553c50621a..75a1607c08fb0 100644
--- a/README.md
+++ b/README.md
@@ -207,7 +207,7 @@ You can run checkstyle using:
 The checkstyle warnings will be found in `reports/checkstyle/reports/main.html` and `reports/checkstyle/reports/test.html` files in the
 subproject build directories. They are also printed to the console. The build will fail if Checkstyle fails.
 
-As of present, the auto-formatting configuration is working in progress. Auto-formatting is automatically invoked for the modules listed below when the 'checkstyleMain' or 'checkstyleTest' task is run.
+As of present, the auto-formatting configuration is work in progress. Auto-formatting is automatically invoked for the modules listed below when the 'checkstyleMain' or 'checkstyleTest' task is run.
 
 - (No modules specified yet)
 
diff --git a/eclipse-formatter.xml b/eclipse-formatter.xml
index 6f8b3f2ebc711..76dd39e76b2af 100644
--- a/eclipse-formatter.xml
+++ b/eclipse-formatter.xml
@@ -6,21 +6,10 @@
     <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
     <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
 
-    <!-- Line -->
-    <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
-    <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
-
-    <!-- Brace -->
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
-    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+    <!-- Disable comment formatting -->
+    <setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="false"/>
+    <setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="false"/>
+    <setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="false"/>
 
     <!-- Indentation -->
     <setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
@@ -33,10 +22,9 @@
     <setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
 
     <!-- Alignment -->
+    <setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="16"/>
     <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="18"/>
     <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="18"/>
-    <setting id="org.eclipse.jdt.core.formatter.alignment_for_cascading_method_invocation_with_arguments" value="82"/>
-
     <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
 
     <!-- Wrapping -->

From 8de2a0f8e097e5645c0a47c858d39d2046b6dfb1 Mon Sep 17 00:00:00 2001
From: Lee Dongjin <dongjin@apache.org>
Date: Tue, 20 Apr 2021 17:16:20 +0900
Subject: [PATCH 3/7] 1. Add license header to eclipse-formatter.xml 2. Re-add
 line break formatting with 200 characters. 3. Add trogdor to suppressions.xml
 (Trogdor is separated from tools in fc405d792d)

---
 checkstyle/suppressions.xml |  4 ++++
 eclipse-formatter.xml       | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/checkstyle/suppressions.xml b/checkstyle/suppressions.xml
index dc0af38b724b7..de9005cdfd2da 100644
--- a/checkstyle/suppressions.xml
+++ b/checkstyle/suppressions.xml
@@ -281,6 +281,10 @@
     <suppress checks="(ImportOrder|AvoidStarImport)"
               files="tools[\\/]src[\\/](main|test)[\\/].+.java$"/>
 
+    <!-- Trogdor -->
+    <suppress checks="(ImportOrder|AvoidStarImport)"
+              files="trogdor[\\/]src[\\/](main|test)[\\/].+.java$"/>
+
     <!-- Shell -->
     <suppress checks="CyclomaticComplexity"
               files="(GlobComponent).java"/>
diff --git a/eclipse-formatter.xml b/eclipse-formatter.xml
index 76dd39e76b2af..2468394619200 100644
--- a/eclipse-formatter.xml
+++ b/eclipse-formatter.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+// 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.
+-->
 <profiles version="1">
 <profile kind="CodeFormatterProfile" name="ApacheKafka" version="1">
     <!-- Import ordering -->
@@ -6,6 +22,10 @@
     <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
     <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
 
+    <!-- Line -->
+    <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="200"/>
+    <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="200"/>
+
     <!-- Disable comment formatting -->
     <setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="false"/>
     <setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="false"/>

From 6a86b163ef2f60a263dceadba3c660d702574541 Mon Sep 17 00:00:00 2001
From: Lee Dongjin <dongjin@apache.org>
Date: Thu, 27 May 2021 13:16:07 +0900
Subject: [PATCH 4/7] Update Formatter configuration: 1. remove duplicated
 entry 'org.eclipse.jdt.core.formatter.indent_empty_lines'. 2. Add
 'org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default' entry.
 (i.e., No space between switch statement's default case and colon.) 3. Remove
 'org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration'
 entry. (i.e., No blank line at the end of the class.)

---
 eclipse-formatter.xml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/eclipse-formatter.xml b/eclipse-formatter.xml
index 2468394619200..8f046e08250c7 100644
--- a/eclipse-formatter.xml
+++ b/eclipse-formatter.xml
@@ -35,7 +35,6 @@
     <setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
     <setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="1"/>
     <setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="1"/>
-    <setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
 
     <!-- Tabs -->
     <setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
@@ -46,6 +45,7 @@
     <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="18"/>
     <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="18"/>
     <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
 
     <!-- Wrapping -->
     <setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="false"/>
@@ -53,8 +53,5 @@
 
     <!-- No trailing spaces -->
     <setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
-
-    <!-- Add a blank line at the end of the class -->
-    <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration" value="1"/>
 </profile>
-</profiles>
+</profiles>
\ No newline at end of file

From a7a2a7ab8c0143a62721580f1b338e862330bba7 Mon Sep 17 00:00:00 2001
From: Lee Dongjin <dongjin@apache.org>
Date: Thu, 3 Jun 2021 20:52:17 +0900
Subject: [PATCH 5/7] Make no blank line at the end of the class (note: it does
 not remove existing blank lines but just not adding ones.)

---
 eclipse-formatter.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclipse-formatter.xml b/eclipse-formatter.xml
index 8f046e08250c7..df5fd356b9247 100644
--- a/eclipse-formatter.xml
+++ b/eclipse-formatter.xml
@@ -53,5 +53,8 @@
 
     <!-- No trailing spaces -->
     <setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+
+    <!-- No blank line at the end of the class -->
+    <setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
 </profile>
 </profiles>
\ No newline at end of file

From f7865fbf7e49a4f932a272ba19f7d1ef4def22b4 Mon Sep 17 00:00:00 2001
From: Lee Dongjin <dongjin@apache.org>
Date: Thu, 10 Jun 2021 21:41:15 +0900
Subject: [PATCH 6/7] Remove the formatting section from README.md

---
 README.md | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/README.md b/README.md
index 75a1607c08fb0..73221b5fd90ff 100644
--- a/README.md
+++ b/README.md
@@ -207,20 +207,6 @@ You can run checkstyle using:
 The checkstyle warnings will be found in `reports/checkstyle/reports/main.html` and `reports/checkstyle/reports/test.html` files in the
 subproject build directories. They are also printed to the console. The build will fail if Checkstyle fails.
 
-As of present, the auto-formatting configuration is work in progress. Auto-formatting is automatically invoked for the modules listed below when the 'checkstyleMain' or 'checkstyleTest' task is run.
-
-- (No modules specified yet)
-
-You can also run auto-formatting independently for a single module listed above, like:
-
-    ./gradlew :core:spotlessApply   # auto-format *.java files in core module, without running checkstyleMain or checkstyleTest.
-
-If you are using an IDE, you can use a plugin that provides real-time automatic formatting. For detailed information, refer to the following links:
-
-- [Eclipse](https://checkstyle.org/eclipse-cs)
-- [Intellij](https://plugins.jetbrains.com/plugin/1065-checkstyle-idea)
-- [Vscode](https://marketplace.visualstudio.com/items?itemName=shengchen.vscode-checkstyle)
-
 #### Spotbugs ####
 Spotbugs uses static analysis to look for bugs in the code.
 You can run spotbugs using:

From 5d26cf1af11d40c9b349c58b9050c1a620513993 Mon Sep 17 00:00:00 2001
From: Lee Dongjin <dongjin@apache.org>
Date: Thu, 8 Jul 2021 21:06:49 +0900
Subject: [PATCH 7/7] Suppress storage/api module

---
 checkstyle/suppressions.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/checkstyle/suppressions.xml b/checkstyle/suppressions.xml
index de9005cdfd2da..40e2e8419b549 100644
--- a/checkstyle/suppressions.xml
+++ b/checkstyle/suppressions.xml
@@ -326,9 +326,9 @@
 
     <!-- Storage -->
     <suppress checks="(ImportOrder|AvoidStarImport)"
-              files="storage[\\/]src[\\/](main|test)[\\/].+.java$"/>
+              files="storage[\\/]api[\\/]src[\\/](main|test)[\\/].+.java$"/>
     <suppress checks="(NPathComplexity|ClassFanOutComplexity|CyclomaticComplexity|ClassDataAbstractionCoupling|FinalLocalVariable|LocalVariableName|MemberName|ParameterName|MethodLength|JavaNCSS|ImportOrder|AvoidStarImport)"
-              files="storage[\\/]src[\\/](generated|generated-test)[\\/].+.java$"/>
+              files="storage[\\/]api[\\/]src[\\/](generated|generated-test)[\\/].+.java$"/>
     <suppress checks="(CyclomaticComplexity|ParameterNumber)"
               files="(RemoteLogManagerConfig).java"/>