diff --git a/hudi-cli/src/main/resources/META-INF/spring/spring-shell-plugin.xml b/hudi-cli/src/main/resources/META-INF/spring/spring-shell-plugin.xml
index e28b4f9e8..8a954f3d2 100644
--- a/hudi-cli/src/main/resources/META-INF/spring/spring-shell-plugin.xml
+++ b/hudi-cli/src/main/resources/META-INF/spring/spring-shell-plugin.xml
@@ -21,7 +21,7 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:context="http://www.springframework.org/schema/context"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+              http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
   <context:component-scan base-package="org.apache.hudi.cli"/>
 
diff --git a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/HoodieTestSuiteWriter.java b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/HoodieTestSuiteWriter.java
index b8229b474..9ac917acb 100644
--- a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/HoodieTestSuiteWriter.java
+++ b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/HoodieTestSuiteWriter.java
@@ -171,7 +171,7 @@ public class HoodieTestSuiteWriter implements Serializable {
   }
 
   public JavaRDD<WriteStatus> insertOverwrite(Option<String> instantTime) throws Exception {
-    if(cfg.useDeltaStreamer){
+    if (cfg.useDeltaStreamer) {
       return deltaStreamerWrapper.insertOverwrite();
     } else {
       Pair<SchemaProvider, Pair<String, JavaRDD<HoodieRecord>>> nextBatch = fetchSource();
@@ -181,7 +181,7 @@ public class HoodieTestSuiteWriter implements Serializable {
   }
 
   public JavaRDD<WriteStatus> insertOverwriteTable(Option<String> instantTime) throws Exception {
-    if(cfg.useDeltaStreamer){
+    if (cfg.useDeltaStreamer) {
       return deltaStreamerWrapper.insertOverwriteTable();
     } else {
       Pair<SchemaProvider, Pair<String, JavaRDD<HoodieRecord>>> nextBatch = fetchSource();
diff --git a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/DagUtils.java b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/DagUtils.java
index 82c5a2f34..708a76001 100644
--- a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/DagUtils.java
+++ b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/DagUtils.java
@@ -102,7 +102,7 @@ public class DagUtils {
         case DAG_CONTENT:
           JsonNode dagContent = dagNode.getValue();
           Iterator<Entry<String, JsonNode>> contentItr = dagContent.fields();
-          while(contentItr.hasNext()) {
+          while (contentItr.hasNext()) {
             Entry<String, JsonNode> dagContentNode = contentItr.next();
             allNodes.put(dagContentNode.getKey(), convertJsonToDagNode(allNodes, dagContentNode.getKey(), dagContentNode.getValue()));
           }
diff --git a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/nodes/DagNode.java b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/nodes/DagNode.java
index 863024335..b5b8f8070 100644
--- a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/nodes/DagNode.java
+++ b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/nodes/DagNode.java
@@ -43,7 +43,7 @@ public abstract class DagNode<O> implements Comparable<DagNode<O>> {
 
   public DagNode clone() {
     List<DagNode<O>> tempChildNodes = new ArrayList<>();
-    for(DagNode dagNode: childNodes) {
+    for (DagNode dagNode: childNodes) {
       tempChildNodes.add(dagNode.clone());
     }
     this.childNodes = tempChildNodes;
diff --git a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/nodes/DelayNode.java b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/nodes/DelayNode.java
index 01b8d4c38..369501c25 100644
--- a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/nodes/DelayNode.java
+++ b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/nodes/DelayNode.java
@@ -37,7 +37,7 @@ public class DelayNode extends DagNode<Boolean> {
 
   @Override
   public void execute(ExecutionContext context, int curItrCount) throws Exception {
-    log.warn("Waiting for "+ delayMins+" mins before going for next test run");
+    log.warn("Waiting for " + delayMins + " mins before going for next test run");
     Thread.sleep(delayMins * 60 * 1000);
   }
 }
diff --git a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/nodes/ValidateAsyncOperations.java b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/nodes/ValidateAsyncOperations.java
index de8855f0a..c94b5deb9 100644
--- a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/nodes/ValidateAsyncOperations.java
+++ b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/nodes/ValidateAsyncOperations.java
@@ -77,9 +77,9 @@ public class ValidateAsyncOperations extends DagNode<Option<String>> {
         }
 
         if (config.validateArchival() || config.validateClean()) {
-          Pattern ARCHIVE_FILE_PATTERN =
+          final Pattern ARCHIVE_FILE_PATTERN =
               Pattern.compile("\\.commits_\\.archive\\..*");
-          Pattern CLEAN_FILE_PATTERN =
+          final Pattern CLEAN_FILE_PATTERN =
               Pattern.compile(".*\\.clean\\..*");
 
           String metadataPath = executionContext.getHoodieTestSuiteWriter().getCfg().targetBasePath + "/.hoodie";
diff --git a/hudi-integ-test/src/test/java/org/apache/hudi/integ/HoodieTestHiveBase.java b/hudi-integ-test/src/test/java/org/apache/hudi/integ/HoodieTestHiveBase.java
index 808ce5f9a..f6c7e9913 100644
--- a/hudi-integ-test/src/test/java/org/apache/hudi/integ/HoodieTestHiveBase.java
+++ b/hudi-integ-test/src/test/java/org/apache/hudi/integ/HoodieTestHiveBase.java
@@ -72,8 +72,8 @@ public class HoodieTestHiveBase extends ITTestBase {
     }
 
     // Run Hoodie Java App
-    String cmd = String.format("%s --hive-sync --table-path %s  --hive-url %s  --table-type %s  --hive-table %s" +
-        " --commit-type %s  --table-name %s", HOODIE_GENERATE_APP, hdfsUrl, HIVE_SERVER_JDBC_URL,
+    String cmd = String.format("%s --hive-sync --table-path %s  --hive-url %s  --table-type %s  --hive-table %s"
+             + " --commit-type %s  --table-name %s", HOODIE_GENERATE_APP, hdfsUrl, HIVE_SERVER_JDBC_URL,
         tableType, hiveTableName, commitType, hoodieTableName);
     if (partitionType == PartitionType.MULTI_KEYS_PARTITIONED) {
       cmd = cmd + " --use-multi-partition-keys";
diff --git a/hudi-integ-test/src/test/java/org/apache/hudi/integ/ITTestHoodieDemo.java b/hudi-integ-test/src/test/java/org/apache/hudi/integ/ITTestHoodieDemo.java
index 655048c8a..b68d06a64 100644
--- a/hudi-integ-test/src/test/java/org/apache/hudi/integ/ITTestHoodieDemo.java
+++ b/hudi-integ-test/src/test/java/org/apache/hudi/integ/ITTestHoodieDemo.java
@@ -90,7 +90,6 @@ public class ITTestHoodieDemo extends ITTestBase {
           + " --hoodie-conf hoodie.datasource.hive_sync.database=default "
           + " --hoodie-conf hoodie.datasource.hive_sync.table=%s";
 
-
   @AfterEach
   public void clean() throws Exception {
     String hdfsCmd = "hdfs dfs -rm -R ";
diff --git a/hudi-integ-test/src/test/java/org/apache/hudi/integ/testsuite/generator/TestGenericRecordPayloadGenerator.java b/hudi-integ-test/src/test/java/org/apache/hudi/integ/testsuite/generator/TestGenericRecordPayloadGenerator.java
index 53340ac98..cc3711dc8 100644
--- a/hudi-integ-test/src/test/java/org/apache/hudi/integ/testsuite/generator/TestGenericRecordPayloadGenerator.java
+++ b/hudi-integ-test/src/test/java/org/apache/hudi/integ/testsuite/generator/TestGenericRecordPayloadGenerator.java
@@ -57,8 +57,8 @@ public class TestGenericRecordPayloadGenerator {
   @Test
   public void testComplexPayload() throws IOException {
     Schema schema = new Schema.Parser().parse(UtilitiesTestBase.Helpers
-        .readFileFromAbsolutePath(System.getProperty("user.dir") + "/.." +
-            COMPLEX_SOURCE_SCHEMA_DOCKER_DEMO_RELATIVE_PATH));
+        .readFileFromAbsolutePath(System.getProperty("user.dir") + "/.."
+            + COMPLEX_SOURCE_SCHEMA_DOCKER_DEMO_RELATIVE_PATH));
     GenericRecordFullPayloadGenerator payloadGenerator = new GenericRecordFullPayloadGenerator(schema);
     GenericRecord record = payloadGenerator.getNewPayload();
     // The generated payload should validate with the provided schema
@@ -68,8 +68,8 @@ public class TestGenericRecordPayloadGenerator {
   @Test
   public void testComplexPartialPayload() throws IOException {
     Schema schema = new Schema.Parser().parse(UtilitiesTestBase.Helpers
-        .readFileFromAbsolutePath(System.getProperty("user.dir") + "/.." +
-            COMPLEX_SOURCE_SCHEMA_DOCKER_DEMO_RELATIVE_PATH));
+        .readFileFromAbsolutePath(System.getProperty("user.dir") + "/.."
+            + COMPLEX_SOURCE_SCHEMA_DOCKER_DEMO_RELATIVE_PATH));
     GenericRecordPartialPayloadGenerator payloadGenerator = new GenericRecordPartialPayloadGenerator(schema);
     IntStream.range(0, 10).forEach(a -> {
       GenericRecord record = payloadGenerator.getNewPayload();
@@ -124,8 +124,8 @@ public class TestGenericRecordPayloadGenerator {
   @Test
   public void testComplexPayloadWithLargeMinSize() throws Exception {
     Schema schema = new Schema.Parser().parse(UtilitiesTestBase.Helpers
-        .readFileFromAbsolutePath(System.getProperty("user.dir") + "/.." +
-            COMPLEX_SOURCE_SCHEMA_DOCKER_DEMO_RELATIVE_PATH));
+        .readFileFromAbsolutePath(System.getProperty("user.dir") + "/.."
+            + COMPLEX_SOURCE_SCHEMA_DOCKER_DEMO_RELATIVE_PATH));
     int minPayloadSize = 10000;
     GenericRecordFullPayloadGenerator payloadGenerator = new GenericRecordFullPayloadGenerator(
         schema, minPayloadSize);
diff --git a/hudi-utilities/src/test/java/org/apache/hudi/utilities/schema/TestSchemaRegistryProvider.java b/hudi-utilities/src/test/java/org/apache/hudi/utilities/schema/TestSchemaRegistryProvider.java
index 79769ad03..5613680fd 100644
--- a/hudi-utilities/src/test/java/org/apache/hudi/utilities/schema/TestSchemaRegistryProvider.java
+++ b/hudi-utilities/src/test/java/org/apache/hudi/utilities/schema/TestSchemaRegistryProvider.java
@@ -51,7 +51,8 @@ class TestSchemaRegistryProvider {
         put("hoodie.deltastreamer.schemaprovider.registry.urlSuffix", "-value");
         put("hoodie.deltastreamer.schemaprovider.registry.url", "http://foo:bar@localhost");
         put("hoodie.deltastreamer.source.kafka.topic", "foo");
-      }};
+      }
+    };
   }
 
   private Schema getExpectedSchema(String response) throws IOException {
diff --git a/packaging/hudi-hive-sync-bundle/pom.xml b/packaging/hudi-hive-sync-bundle/pom.xml
index 7c6c11c02..75d225ab1 100644
--- a/packaging/hudi-hive-sync-bundle/pom.xml
+++ b/packaging/hudi-hive-sync-bundle/pom.xml
@@ -67,7 +67,7 @@
                   <include>org.apache.hudi:hudi-common</include>
                   <include>org.apache.hudi:hudi-hadoop-mr</include>
                   <include>org.apache.hudi:hudi-sync-common</include>
-		          <include>org.apache.hudi:hudi-hive-sync</include>
+                  <include>org.apache.hudi:hudi-hive-sync</include>
 
                   <include>com.beust:jcommander</include>
                   <include>org.apache.avro:avro</include>