diff --git a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/storage/HoodieBucketLayout.java b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/storage/HoodieBucketLayout.java index 6247b870f..deefcfe6a 100644 --- a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/storage/HoodieBucketLayout.java +++ b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/storage/HoodieBucketLayout.java @@ -40,7 +40,8 @@ public class HoodieBucketLayout extends HoodieStorageLayout { add(WriteOperationType.DELETE); add(WriteOperationType.COMPACT); add(WriteOperationType.DELETE_PARTITION); - }}; + } + }; public HoodieBucketLayout(HoodieWriteConfig config) { super(config); diff --git a/hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/table/action/bootstrap/MetadataBootstrapHandlerFactory.java b/hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/table/action/bootstrap/MetadataBootstrapHandlerFactory.java index 533e7ad27..285467f9f 100644 --- a/hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/table/action/bootstrap/MetadataBootstrapHandlerFactory.java +++ b/hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/table/action/bootstrap/MetadataBootstrapHandlerFactory.java @@ -25,6 +25,7 @@ import org.apache.hudi.config.HoodieWriteConfig; import org.apache.hudi.exception.HoodieIOException; import org.apache.hudi.table.HoodieTable; import org.apache.hudi.avro.model.HoodieFileStatus; + import static org.apache.hudi.common.model.HoodieFileFormat.ORC; import static org.apache.hudi.common.model.HoodieFileFormat.PARQUET; diff --git a/hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/util/DataTypeUtils.java b/hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/util/DataTypeUtils.java index bf800536e..1f4e8cc1d 100644 --- a/hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/util/DataTypeUtils.java +++ b/hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/util/DataTypeUtils.java @@ -63,7 +63,8 @@ public class DataTypeUtils { // String types put(StringType$.class, newHashSet(VarcharType$.class, StringType$.class)); - }}; + } + }; /** * Validates whether one {@link StructType} is compatible w/ the other one. diff --git a/hudi-common/src/main/java/org/apache/hudi/common/util/AvroOrcUtils.java b/hudi-common/src/main/java/org/apache/hudi/common/util/AvroOrcUtils.java index de2e345a8..ca59c301c 100644 --- a/hudi-common/src/main/java/org/apache/hudi/common/util/AvroOrcUtils.java +++ b/hudi-common/src/main/java/org/apache/hudi/common/util/AvroOrcUtils.java @@ -52,6 +52,7 @@ import org.apache.orc.storage.ql.exec.vector.UnionColumnVector; import org.apache.orc.storage.serde2.io.DateWritable; import org.apache.hudi.exception.HoodieIOException; import org.apache.orc.TypeDescription; + import static org.apache.avro.JsonProperties.NULL_VALUE; /** diff --git a/hudi-common/src/test/java/org/apache/hudi/common/util/TestRatelimiter.java b/hudi-common/src/test/java/org/apache/hudi/common/util/TestRatelimiter.java index c2e939c3b..c712543c7 100644 --- a/hudi-common/src/test/java/org/apache/hudi/common/util/TestRatelimiter.java +++ b/hudi-common/src/test/java/org/apache/hudi/common/util/TestRatelimiter.java @@ -20,6 +20,7 @@ package org.apache.hudi.common.util; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/hudi-examples/src/main/java/org/apache/hudi/examples/spark/HoodieSparkBootstrapExample.java b/hudi-examples/src/main/java/org/apache/hudi/examples/spark/HoodieSparkBootstrapExample.java index d11d2eddf..518f09599 100644 --- a/hudi-examples/src/main/java/org/apache/hudi/examples/spark/HoodieSparkBootstrapExample.java +++ b/hudi-examples/src/main/java/org/apache/hudi/examples/spark/HoodieSparkBootstrapExample.java @@ -31,13 +31,10 @@ import org.apache.spark.sql.SaveMode; import org.apache.spark.sql.SparkSession; import org.apache.spark.sql.Dataset; - - public class HoodieSparkBootstrapExample { private static String tableType = HoodieTableType.MERGE_ON_READ.name(); - public static void main(String[] args) throws Exception { if (args.length < 5) { System.err.println("Usage: HoodieSparkBootstrapExample "); @@ -68,7 +65,7 @@ public class HoodieSparkBootstrapExample { .option(HoodieTableConfig.BASE_FILE_FORMAT.key(), HoodieFileFormat.ORC.name()) .option(HoodieBootstrapConfig.BASE_PATH.key(), basePath) .option(HoodieBootstrapConfig.KEYGEN_CLASS_NAME.key(), NonpartitionedKeyGenerator.class.getCanonicalName()) - .mode(SaveMode.Overwrite).save("/hudi/"+tableName); + .mode(SaveMode.Overwrite).save("/hudi/" + tableName); df.count(); } 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 708a76001..999bc4366 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 @@ -106,6 +106,7 @@ public class DagUtils { Entry dagContentNode = contentItr.next(); allNodes.put(dagContentNode.getKey(), convertJsonToDagNode(allNodes, dagContentNode.getKey(), dagContentNode.getValue())); } + break; default: break; } diff --git a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/nodes/BaseValidateDatasetNode.java b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/nodes/BaseValidateDatasetNode.java index 9a369bcbd..1ae6d948f 100644 --- a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/nodes/BaseValidateDatasetNode.java +++ b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/dag/nodes/BaseValidateDatasetNode.java @@ -161,7 +161,6 @@ public abstract class BaseValidateDatasetNode extends DagNode { .filter("_hoodie_is_deleted != true"); } - private ExpressionEncoder getEncoder(StructType schema) { List attributes = JavaConversions.asJavaCollection(schema.toAttributes()).stream() .map(Attribute::toAttribute).collect(Collectors.toList()); diff --git a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/helpers/DFSTestSuitePathSelector.java b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/helpers/DFSTestSuitePathSelector.java index 94ff3a3ea..e35033f4f 100644 --- a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/helpers/DFSTestSuitePathSelector.java +++ b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/helpers/DFSTestSuitePathSelector.java @@ -38,7 +38,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Optional; import java.util.stream.Collectors; /** @@ -74,10 +73,10 @@ public class DFSTestSuitePathSelector extends DFSPathSelector { // Say input data is as follow input/1, input/2, input/5 since 3,4 was rolled back and 5 is new generated data // checkpoint from the latest commit metadata will be 2 since 3,4 has been rolled back. We need to set the // next batch id correctly as 5 instead of 3 - Optional correctBatchIdDueToRollback = Arrays.stream(fileStatuses) + Option correctBatchIdDueToRollback = Option.fromJavaOptional(Arrays.stream(fileStatuses) .map(f -> f.getPath().toString().split("/")[f.getPath().toString().split("/").length - 1]) .filter(bid1 -> Integer.parseInt(bid1) > lastBatchId) - .min((bid1, bid2) -> Integer.min(Integer.parseInt(bid1), Integer.parseInt(bid2))); + .min((bid1, bid2) -> Integer.min(Integer.parseInt(bid1), Integer.parseInt(bid2)))); if (correctBatchIdDueToRollback.isPresent() && Integer.parseInt(correctBatchIdDueToRollback.get()) > nextBatchId) { nextBatchId = Integer.parseInt(correctBatchIdDueToRollback.get()); } diff --git a/hudi-integ-test/src/test/java/org/apache/hudi/integ/testsuite/job/TestHoodieTestSuiteJob.java b/hudi-integ-test/src/test/java/org/apache/hudi/integ/testsuite/job/TestHoodieTestSuiteJob.java index c32f44d1c..1b0cef58c 100644 --- a/hudi-integ-test/src/test/java/org/apache/hudi/integ/testsuite/job/TestHoodieTestSuiteJob.java +++ b/hudi-integ-test/src/test/java/org/apache/hudi/integ/testsuite/job/TestHoodieTestSuiteJob.java @@ -35,7 +35,6 @@ import org.apache.hudi.integ.testsuite.schema.SchemaUtils; import org.apache.hudi.integ.testsuite.schema.TestSuiteFileBasedSchemaProvider; import org.apache.hudi.integ.testsuite.writer.DeltaOutputMode; import org.apache.hudi.keygen.TimestampBasedKeyGenerator; -import org.apache.hudi.utilities.schema.FilebasedSchemaProvider; import org.apache.hudi.utilities.sources.AvroDFSSource; import org.apache.hudi.utilities.testutils.UtilitiesTestBase; diff --git a/hudi-sync/hudi-hive-sync/src/test/java/org/apache/hudi/hive/TestMultiPartKeysValueExtractor.java b/hudi-sync/hudi-hive-sync/src/test/java/org/apache/hudi/hive/TestMultiPartKeysValueExtractor.java index 47d4d2759..5cfc654cd 100644 --- a/hudi-sync/hudi-hive-sync/src/test/java/org/apache/hudi/hive/TestMultiPartKeysValueExtractor.java +++ b/hudi-sync/hudi-hive-sync/src/test/java/org/apache/hudi/hive/TestMultiPartKeysValueExtractor.java @@ -21,6 +21,7 @@ package org.apache.hudi.hive; import java.util.ArrayList; import java.util.List; import org.junit.jupiter.api.Test; + import static org.junit.jupiter.api.Assertions.assertEquals; public class TestMultiPartKeysValueExtractor {