This is an automated email from the ASF dual-hosted git repository.
timbrown pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-xtable.git
The following commit(s) were added to refs/heads/main by this push:
new 5c25674b Remove wildcard imports and enforce with spotless (#809)
5c25674b is described below
commit 5c25674bf5e622462a27c4198f0f51ba3e09f555
Author: Tim Brown <[email protected]>
AuthorDate: Mon Feb 23 09:59:36 2026 -0800
Remove wildcard imports and enforce with spotless (#809)
* remove wildcard imports and enforce
* undo removal
* fix import
* update xtable-service module
---
pom.xml | 3 +-
.../org/apache/xtable/model/storage/FilesDiff.java | 6 ++-
.../TestThreePartHierarchicalTableIdentifier.java | 2 +-
.../apache/xtable/spi/sync/TestCatalogSync.java | 2 +-
.../delta/DeltaDataFileUpdatesExtractor.java | 5 ++-
.../hudi/PathBasedPartitionValuesExtractor.java | 6 ++-
.../xtable/iceberg/IcebergDataFileUpdatesSync.java | 15 ++++++-
.../kernel/DeltaKernelPartitionExtractor.java | 6 ++-
.../xtable/paimon/PaimonConversionSource.java | 6 ++-
.../xtable/parquet/ParquetConversionSource.java | 21 ++++++---
.../parquet/ParquetPartitionValueExtractor.java | 6 ++-
.../xtable/parquet/ParquetStatsExtractor.java | 4 +-
.../java/org/apache/xtable/TestIcebergTable.java | 2 +-
.../org/apache/xtable/ValidationTestHelper.java | 3 +-
.../conversion/TestConversionController.java | 2 +-
.../xtable/delta/ITDeltaConversionSource.java | 30 +++++++------
.../xtable/delta/TestDeltaPartitionExtractor.java | 3 +-
.../apache/xtable/hudi/ITHudiConversionSource.java | 4 +-
.../xtable/hudi/TestHudiConversionTarget.java | 4 +-
.../iceberg/TestIcebergConversionSource.java | 50 ++++++++++++++++------
.../TestIcebergPartitionValueConverter.java | 3 +-
.../xtable/iceberg/TestIcebergSchemaExtractor.java | 5 ++-
.../kernel/ITDeltaKernelConversionSource.java | 31 +++++++++++---
.../kernel/TestDeltaKernelPartitionExtractor.java | 17 ++++++--
.../kernel/TestDeltaKernelSchemaExtractor.java | 14 +++++-
.../kernel/TestDeltaKernelStatsExtractor.java | 6 ++-
.../xtable/parquet/ITParquetConversionSource.java | 14 ++++--
.../xtable/parquet/TestParquetSchemaExtractor.java | 4 +-
.../xtable/parquet/TestParquetStatsExtractor.java | 2 +-
.../xtable/service/TestConversionResource.java | 4 +-
.../xtable/utilities/TestRunCatalogSync.java | 2 +-
31 files changed, 209 insertions(+), 73 deletions(-)
diff --git a/pom.xml b/pom.xml
index c6c4a833..9d0790bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,7 @@
<delta.version>2.4.0</delta.version>
<paimon.version>1.3.1</paimon.version>
<jackson.version>2.18.2</jackson.version>
- <spotless.version>2.43.0</spotless.version>
+ <spotless.version>2.46.1</spotless.version>
<apache.rat.version>0.16.1</apache.rat.version>
<google.java.format.version>1.10.0</google.java.format.version>
<delta.standalone.version>3.3.0</delta.standalone.version>
@@ -877,6 +877,7 @@
<order>java,javax,lombok,org,org.apache.hudi,org.apache.iceberg,org.apache.spark.sql.delta,scala,com,io.delta,org.apache.xtable</order>
</importOrder>
<removeUnusedImports/>
+ <removeWildcardImports/>
<excludes>
<exclude>${target.dir.pattern}</exclude>
</excludes>
diff --git
a/xtable-api/src/main/java/org/apache/xtable/model/storage/FilesDiff.java
b/xtable-api/src/main/java/org/apache/xtable/model/storage/FilesDiff.java
index f86e64bc..a75a6469 100644
--- a/xtable-api/src/main/java/org/apache/xtable/model/storage/FilesDiff.java
+++ b/xtable-api/src/main/java/org/apache/xtable/model/storage/FilesDiff.java
@@ -18,7 +18,11 @@
package org.apache.xtable.model.storage;
-import java.util.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
diff --git
a/xtable-api/src/test/java/org/apache/xtable/model/catalog/TestThreePartHierarchicalTableIdentifier.java
b/xtable-api/src/test/java/org/apache/xtable/model/catalog/TestThreePartHierarchicalTableIdentifier.java
index 5f10be0b..1fddf10d 100644
---
a/xtable-api/src/test/java/org/apache/xtable/model/catalog/TestThreePartHierarchicalTableIdentifier.java
+++
b/xtable-api/src/test/java/org/apache/xtable/model/catalog/TestThreePartHierarchicalTableIdentifier.java
@@ -18,7 +18,7 @@
package org.apache.xtable.model.catalog;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git
a/xtable-api/src/test/java/org/apache/xtable/spi/sync/TestCatalogSync.java
b/xtable-api/src/test/java/org/apache/xtable/spi/sync/TestCatalogSync.java
index a1daaca0..aef94bb2 100644
--- a/xtable-api/src/test/java/org/apache/xtable/spi/sync/TestCatalogSync.java
+++ b/xtable-api/src/test/java/org/apache/xtable/spi/sync/TestCatalogSync.java
@@ -18,7 +18,7 @@
package org.apache.xtable.spi.sync;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.times;
diff --git
a/xtable-core/src/main/java/org/apache/xtable/delta/DeltaDataFileUpdatesExtractor.java
b/xtable-core/src/main/java/org/apache/xtable/delta/DeltaDataFileUpdatesExtractor.java
index caee22f6..71cebf9a 100644
---
a/xtable-core/src/main/java/org/apache/xtable/delta/DeltaDataFileUpdatesExtractor.java
+++
b/xtable-core/src/main/java/org/apache/xtable/delta/DeltaDataFileUpdatesExtractor.java
@@ -20,7 +20,10 @@ package org.apache.xtable.delta;
import static org.apache.xtable.delta.ScalaUtils.convertJavaMapToScala;
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
diff --git
a/xtable-core/src/main/java/org/apache/xtable/hudi/PathBasedPartitionValuesExtractor.java
b/xtable-core/src/main/java/org/apache/xtable/hudi/PathBasedPartitionValuesExtractor.java
index 09c7c824..c5ca0bdc 100644
---
a/xtable-core/src/main/java/org/apache/xtable/hudi/PathBasedPartitionValuesExtractor.java
+++
b/xtable-core/src/main/java/org/apache/xtable/hudi/PathBasedPartitionValuesExtractor.java
@@ -22,7 +22,11 @@ import java.math.BigDecimal;
import java.nio.charset.StandardCharsets;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.TimeZone;
import lombok.AllArgsConstructor;
import lombok.NonNull;
diff --git
a/xtable-core/src/main/java/org/apache/xtable/iceberg/IcebergDataFileUpdatesSync.java
b/xtable-core/src/main/java/org/apache/xtable/iceberg/IcebergDataFileUpdatesSync.java
index 77a4eeed..56948cd1 100644
---
a/xtable-core/src/main/java/org/apache/xtable/iceberg/IcebergDataFileUpdatesSync.java
+++
b/xtable-core/src/main/java/org/apache/xtable/iceberg/IcebergDataFileUpdatesSync.java
@@ -18,13 +18,24 @@
package org.apache.xtable.iceberg;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
import lombok.AllArgsConstructor;
-import org.apache.iceberg.*;
+import org.apache.iceberg.DataFile;
+import org.apache.iceberg.DataFiles;
+import org.apache.iceberg.FileFormat;
+import org.apache.iceberg.FileScanTask;
+import org.apache.iceberg.OverwriteFiles;
+import org.apache.iceberg.PartitionSpec;
+import org.apache.iceberg.Schema;
+import org.apache.iceberg.Table;
+import org.apache.iceberg.Transaction;
import org.apache.iceberg.io.CloseableIterable;
import org.apache.xtable.exception.NotSupportedException;
diff --git
a/xtable-core/src/main/java/org/apache/xtable/kernel/DeltaKernelPartitionExtractor.java
b/xtable-core/src/main/java/org/apache/xtable/kernel/DeltaKernelPartitionExtractor.java
index 6b763af0..95ffc9d4 100644
---
a/xtable-core/src/main/java/org/apache/xtable/kernel/DeltaKernelPartitionExtractor.java
+++
b/xtable-core/src/main/java/org/apache/xtable/kernel/DeltaKernelPartitionExtractor.java
@@ -42,8 +42,12 @@ import lombok.extern.log4j.Log4j2;
import com.google.common.collect.Iterators;
import com.google.common.collect.PeekingIterator;
-import io.delta.kernel.types.*;
+import io.delta.kernel.types.DataType;
+import io.delta.kernel.types.DateType;
import io.delta.kernel.types.FieldMetadata;
+import io.delta.kernel.types.IntegerType;
+import io.delta.kernel.types.StructField;
+import io.delta.kernel.types.StructType;
import org.apache.xtable.exception.PartitionSpecException;
import org.apache.xtable.model.schema.InternalPartitionField;
diff --git
a/xtable-core/src/main/java/org/apache/xtable/paimon/PaimonConversionSource.java
b/xtable-core/src/main/java/org/apache/xtable/paimon/PaimonConversionSource.java
index f57c625d..f5772530 100644
---
a/xtable-core/src/main/java/org/apache/xtable/paimon/PaimonConversionSource.java
+++
b/xtable-core/src/main/java/org/apache/xtable/paimon/PaimonConversionSource.java
@@ -34,7 +34,11 @@ import org.apache.paimon.table.FileStoreTable;
import org.apache.paimon.utils.SnapshotManager;
import org.apache.xtable.exception.ReadException;
-import org.apache.xtable.model.*;
+import org.apache.xtable.model.CommitsBacklog;
+import org.apache.xtable.model.InstantsForIncrementalSync;
+import org.apache.xtable.model.InternalSnapshot;
+import org.apache.xtable.model.InternalTable;
+import org.apache.xtable.model.TableChange;
import org.apache.xtable.model.schema.InternalPartitionField;
import org.apache.xtable.model.schema.InternalSchema;
import org.apache.xtable.model.storage.DataLayoutStrategy;
diff --git
a/xtable-core/src/main/java/org/apache/xtable/parquet/ParquetConversionSource.java
b/xtable-core/src/main/java/org/apache/xtable/parquet/ParquetConversionSource.java
index e7eff961..e5625be7 100644
---
a/xtable-core/src/main/java/org/apache/xtable/parquet/ParquetConversionSource.java
+++
b/xtable-core/src/main/java/org/apache/xtable/parquet/ParquetConversionSource.java
@@ -23,7 +23,11 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.nio.file.Paths;
import java.time.Instant;
-import java.util.*;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -31,24 +35,31 @@ import lombok.Builder;
import lombok.NonNull;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.*;
+import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.LocatedFileStatus;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.RemoteIterator;
import org.apache.hadoop.util.functional.RemoteIterators;
import org.apache.parquet.hadoop.metadata.ParquetMetadata;
import org.apache.parquet.schema.MessageType;
import org.apache.xtable.exception.ReadException;
-import org.apache.xtable.hudi.*;
import org.apache.xtable.hudi.HudiPathUtils;
-import org.apache.xtable.model.*;
+import org.apache.xtable.hudi.PathBasedPartitionSpecExtractor;
import org.apache.xtable.model.CommitsBacklog;
import org.apache.xtable.model.InstantsForIncrementalSync;
+import org.apache.xtable.model.InternalSnapshot;
+import org.apache.xtable.model.InternalTable;
import org.apache.xtable.model.TableChange;
import org.apache.xtable.model.schema.InternalPartitionField;
import org.apache.xtable.model.schema.InternalSchema;
-import org.apache.xtable.model.storage.*;
+import org.apache.xtable.model.storage.DataLayoutStrategy;
import org.apache.xtable.model.storage.FileFormat;
import org.apache.xtable.model.storage.InternalDataFile;
+import org.apache.xtable.model.storage.InternalFilesDiff;
+import org.apache.xtable.model.storage.PartitionFileGroup;
+import org.apache.xtable.model.storage.TableFormat;
import org.apache.xtable.spi.extractor.ConversionSource;
@Builder
diff --git
a/xtable-core/src/main/java/org/apache/xtable/parquet/ParquetPartitionValueExtractor.java
b/xtable-core/src/main/java/org/apache/xtable/parquet/ParquetPartitionValueExtractor.java
index ab4ceaf4..63b35846 100644
---
a/xtable-core/src/main/java/org/apache/xtable/parquet/ParquetPartitionValueExtractor.java
+++
b/xtable-core/src/main/java/org/apache/xtable/parquet/ParquetPartitionValueExtractor.java
@@ -20,7 +20,11 @@ package org.apache.xtable.parquet;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.TimeZone;
import lombok.NonNull;
diff --git
a/xtable-core/src/main/java/org/apache/xtable/parquet/ParquetStatsExtractor.java
b/xtable-core/src/main/java/org/apache/xtable/parquet/ParquetStatsExtractor.java
index a1393b98..46082353 100644
---
a/xtable-core/src/main/java/org/apache/xtable/parquet/ParquetStatsExtractor.java
+++
b/xtable-core/src/main/java/org/apache/xtable/parquet/ParquetStatsExtractor.java
@@ -30,7 +30,9 @@ import lombok.Builder;
import lombok.Value;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.*;
+import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
import org.apache.parquet.column.ColumnDescriptor;
import org.apache.parquet.hadoop.metadata.ColumnChunkMetaData;
import org.apache.parquet.hadoop.metadata.ParquetMetadata;
diff --git a/xtable-core/src/test/java/org/apache/xtable/TestIcebergTable.java
b/xtable-core/src/test/java/org/apache/xtable/TestIcebergTable.java
index fe141457..70391382 100644
--- a/xtable-core/src/test/java/org/apache/xtable/TestIcebergTable.java
+++ b/xtable-core/src/test/java/org/apache/xtable/TestIcebergTable.java
@@ -19,7 +19,7 @@
package org.apache.xtable;
import static org.apache.iceberg.SnapshotSummary.TOTAL_RECORDS_PROP;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.nio.file.Path;
import java.nio.file.Paths;
diff --git
a/xtable-core/src/test/java/org/apache/xtable/ValidationTestHelper.java
b/xtable-core/src/test/java/org/apache/xtable/ValidationTestHelper.java
index 9e95f279..8bc644dc 100644
--- a/xtable-core/src/test/java/org/apache/xtable/ValidationTestHelper.java
+++ b/xtable-core/src/test/java/org/apache/xtable/ValidationTestHelper.java
@@ -18,7 +18,8 @@
package org.apache.xtable;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.util.Collections;
import java.util.HashSet;
diff --git
a/xtable-core/src/test/java/org/apache/xtable/conversion/TestConversionController.java
b/xtable-core/src/test/java/org/apache/xtable/conversion/TestConversionController.java
index 9bf8f010..75323af8 100644
---
a/xtable-core/src/test/java/org/apache/xtable/conversion/TestConversionController.java
+++
b/xtable-core/src/test/java/org/apache/xtable/conversion/TestConversionController.java
@@ -22,7 +22,7 @@ import static
org.apache.xtable.conversion.ConversionUtils.convertToSourceTable;
import static org.apache.xtable.model.storage.TableFormat.DELTA;
import static org.apache.xtable.model.storage.TableFormat.HUDI;
import static org.apache.xtable.model.storage.TableFormat.ICEBERG;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.ArgumentMatchers.eq;
diff --git
a/xtable-core/src/test/java/org/apache/xtable/delta/ITDeltaConversionSource.java
b/xtable-core/src/test/java/org/apache/xtable/delta/ITDeltaConversionSource.java
index 3a754e27..80ba46a3 100644
---
a/xtable-core/src/test/java/org/apache/xtable/delta/ITDeltaConversionSource.java
+++
b/xtable-core/src/test/java/org/apache/xtable/delta/ITDeltaConversionSource.java
@@ -19,7 +19,9 @@
package org.apache.xtable.delta;
import static org.apache.xtable.testutil.ITTestUtils.validateTable;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.net.URI;
import java.net.URISyntaxException;
@@ -41,7 +43,6 @@ import org.apache.spark.serializer.KryoSerializer;
import org.apache.spark.sql.Row;
import org.apache.spark.sql.SparkSession;
import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
@@ -68,8 +69,11 @@ import org.apache.xtable.model.schema.PartitionTransformType;
import org.apache.xtable.model.stat.ColumnStat;
import org.apache.xtable.model.stat.PartitionValue;
import org.apache.xtable.model.stat.Range;
-import org.apache.xtable.model.storage.*;
+import org.apache.xtable.model.storage.DataLayoutStrategy;
+import org.apache.xtable.model.storage.FileFormat;
import org.apache.xtable.model.storage.InternalDataFile;
+import org.apache.xtable.model.storage.PartitionFileGroup;
+import org.apache.xtable.model.storage.TableFormat;
public class ITDeltaConversionSource {
@@ -192,7 +196,7 @@ public class ITDeltaConversionSource {
Collections.emptyList());
// Validate data files
List<ColumnStat> columnStats = Arrays.asList(COL1_COLUMN_STAT,
COL2_COLUMN_STAT);
- Assertions.assertEquals(1, snapshot.getPartitionedDataFiles().size());
+ assertEquals(1, snapshot.getPartitionedDataFiles().size());
validatePartitionDataFiles(
PartitionFileGroup.builder()
.files(
@@ -305,7 +309,7 @@ public class ITDeltaConversionSource {
.build()));
// Validate data files
List<ColumnStat> columnStats = Arrays.asList(COL1_COLUMN_STAT,
COL2_COLUMN_STAT);
- Assertions.assertEquals(1, snapshot.getPartitionedDataFiles().size());
+ assertEquals(1, snapshot.getPartitionedDataFiles().size());
List<PartitionValue> partitionValue =
Collections.singletonList(
PartitionValue.builder()
@@ -713,7 +717,7 @@ public class ITDeltaConversionSource {
private void validateDataFiles(
List<InternalDataFile> expectedFiles, List<InternalDataFile> actualFiles)
throws URISyntaxException {
- Assertions.assertEquals(expectedFiles.size(), actualFiles.size());
+ assertEquals(expectedFiles.size(), actualFiles.size());
for (int i = 0; i < expectedFiles.size(); i++) {
InternalDataFile expected = expectedFiles.get(i);
InternalDataFile actual = actualFiles.get(i);
@@ -723,17 +727,17 @@ public class ITDeltaConversionSource {
private void validatePropertiesDataFile(InternalDataFile expected,
InternalDataFile actual)
throws URISyntaxException {
- Assertions.assertTrue(
+ assertTrue(
Paths.get(new URI(actual.getPhysicalPath()).getPath()).isAbsolute(),
() -> "path == " + actual.getPhysicalPath() + " is not absolute");
- Assertions.assertEquals(expected.getFileFormat(), actual.getFileFormat());
- Assertions.assertEquals(expected.getPartitionValues(),
actual.getPartitionValues());
- Assertions.assertEquals(expected.getFileSizeBytes(),
actual.getFileSizeBytes());
- Assertions.assertEquals(expected.getRecordCount(),
actual.getRecordCount());
+ assertEquals(expected.getFileFormat(), actual.getFileFormat());
+ assertEquals(expected.getPartitionValues(), actual.getPartitionValues());
+ assertEquals(expected.getFileSizeBytes(), actual.getFileSizeBytes());
+ assertEquals(expected.getRecordCount(), actual.getRecordCount());
Instant now = Instant.now();
long minRange = now.minus(1, ChronoUnit.HOURS).toEpochMilli();
long maxRange = now.toEpochMilli();
- Assertions.assertTrue(
+ assertTrue(
actual.getLastModified() > minRange && actual.getLastModified() <=
maxRange,
() ->
"last modified == "
@@ -742,7 +746,7 @@ public class ITDeltaConversionSource {
+ minRange
+ " and "
+ maxRange);
- Assertions.assertEquals(expected.getColumnStats(),
actual.getColumnStats());
+ assertEquals(expected.getColumnStats(), actual.getColumnStats());
}
private static Stream<Arguments> testWithPartitionToggle() {
diff --git
a/xtable-core/src/test/java/org/apache/xtable/delta/TestDeltaPartitionExtractor.java
b/xtable-core/src/test/java/org/apache/xtable/delta/TestDeltaPartitionExtractor.java
index 3575dc11..5b767096 100644
---
a/xtable-core/src/test/java/org/apache/xtable/delta/TestDeltaPartitionExtractor.java
+++
b/xtable-core/src/test/java/org/apache/xtable/delta/TestDeltaPartitionExtractor.java
@@ -19,7 +19,8 @@
package org.apache.xtable.delta;
import static
org.apache.xtable.delta.DeltaPartitionExtractor.DELTA_GENERATION_EXPRESSION;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Arrays;
import java.util.Collections;
diff --git
a/xtable-core/src/test/java/org/apache/xtable/hudi/ITHudiConversionSource.java
b/xtable-core/src/test/java/org/apache/xtable/hudi/ITHudiConversionSource.java
index b1cba5c7..99d932f7 100644
---
a/xtable-core/src/test/java/org/apache/xtable/hudi/ITHudiConversionSource.java
+++
b/xtable-core/src/test/java/org/apache/xtable/hudi/ITHudiConversionSource.java
@@ -20,7 +20,9 @@ package org.apache.xtable.hudi;
import static java.util.stream.Collectors.groupingBy;
import static org.apache.xtable.testutil.ITTestUtils.validateTable;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.nio.file.Path;
import java.time.Instant;
diff --git
a/xtable-core/src/test/java/org/apache/xtable/hudi/TestHudiConversionTarget.java
b/xtable-core/src/test/java/org/apache/xtable/hudi/TestHudiConversionTarget.java
index d165053f..b28f1e03 100644
---
a/xtable-core/src/test/java/org/apache/xtable/hudi/TestHudiConversionTarget.java
+++
b/xtable-core/src/test/java/org/apache/xtable/hudi/TestHudiConversionTarget.java
@@ -18,7 +18,9 @@
package org.apache.xtable.hudi;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
diff --git
a/xtable-core/src/test/java/org/apache/xtable/iceberg/TestIcebergConversionSource.java
b/xtable-core/src/test/java/org/apache/xtable/iceberg/TestIcebergConversionSource.java
index c0b3065d..412c9445 100644
---
a/xtable-core/src/test/java/org/apache/xtable/iceberg/TestIcebergConversionSource.java
+++
b/xtable-core/src/test/java/org/apache/xtable/iceberg/TestIcebergConversionSource.java
@@ -18,8 +18,15 @@
package org.apache.xtable.iceberg;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
import java.io.IOException;
import java.nio.file.Files;
@@ -40,7 +47,20 @@ import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.api.parallel.Execution;
import org.junit.jupiter.api.parallel.ExecutionMode;
-import org.apache.iceberg.*;
+import org.apache.iceberg.AppendFiles;
+import org.apache.iceberg.BaseTable;
+import org.apache.iceberg.ContentScanTask;
+import org.apache.iceberg.DataFile;
+import org.apache.iceberg.FileScanTask;
+import org.apache.iceberg.PartitionData;
+import org.apache.iceberg.PartitionSpec;
+import org.apache.iceberg.PartitionSpecParser;
+import org.apache.iceberg.Schema;
+import org.apache.iceberg.SchemaParser;
+import org.apache.iceberg.Snapshot;
+import org.apache.iceberg.Table;
+import org.apache.iceberg.TableScan;
+import org.apache.iceberg.Transaction;
import org.apache.iceberg.data.GenericRecord;
import org.apache.iceberg.data.parquet.GenericParquetWriter;
import org.apache.iceberg.expressions.Expressions;
@@ -59,9 +79,11 @@ import org.apache.xtable.model.schema.InternalField;
import org.apache.xtable.model.schema.InternalSchema;
import org.apache.xtable.model.schema.PartitionTransformType;
import org.apache.xtable.model.stat.PartitionValue;
-import org.apache.xtable.model.storage.*;
+import org.apache.xtable.model.storage.DataLayoutStrategy;
import org.apache.xtable.model.storage.FileFormat;
import org.apache.xtable.model.storage.InternalDataFile;
+import org.apache.xtable.model.storage.PartitionFileGroup;
+import org.apache.xtable.model.storage.TableFormat;
@Execution(ExecutionMode.SAME_THREAD)
class TestIcebergConversionSource {
@@ -99,15 +121,15 @@ class TestIcebergConversionSource {
Snapshot snapshot = catalogSales.currentSnapshot();
InternalTable internalTable = conversionSource.getTable(snapshot);
- Assertions.assertNotNull(internalTable);
+ assertNotNull(internalTable);
assertEquals(TableFormat.ICEBERG, internalTable.getTableFormat());
- Assertions.assertTrue(internalTable.getName().endsWith("catalog_sales"));
+ assertTrue(internalTable.getName().endsWith("catalog_sales"));
assertEquals(catalogSales.location(), internalTable.getBasePath());
assertEquals(DataLayoutStrategy.HIVE_STYLE_PARTITION,
internalTable.getLayoutStrategy());
assertEquals(snapshot.timestampMillis(),
internalTable.getLatestCommitTime().toEpochMilli());
- Assertions.assertNotNull(internalTable.getReadSchema());
+ assertNotNull(internalTable.getReadSchema());
- Assertions.assertEquals(7,
internalTable.getReadSchema().getFields().size());
+ assertEquals(7, internalTable.getReadSchema().getFields().size());
validateSchema(internalTable.getReadSchema(), catalogSales.schema());
assertEquals(1, internalTable.getPartitioningFields().size());
@@ -171,14 +193,14 @@ class TestIcebergConversionSource {
.build());
InternalSnapshot internalSnapshot =
spyConversionSource.getCurrentSnapshot();
- Assertions.assertNotNull(internalSnapshot);
+ assertNotNull(internalSnapshot);
assertEquals(String.valueOf(iceCurrentSnapshot.snapshotId()),
internalSnapshot.getVersion());
- Assertions.assertNotNull(internalSnapshot.getTable());
+ assertNotNull(internalSnapshot.getTable());
verify(spyConversionSource, times(1)).getTable(iceCurrentSnapshot);
verify(spyPartitionConverter, times(5)).toXTable(any(), any(), any());
verify(spyDataFileExtractor, times(5)).fromIceberg(any(), any(), any());
- Assertions.assertNotNull(internalSnapshot.getPartitionedDataFiles());
+ assertNotNull(internalSnapshot.getPartitionedDataFiles());
List<PartitionFileGroup> dataFileChunks =
internalSnapshot.getPartitionedDataFiles();
assertEquals(5, dataFileChunks.size());
for (PartitionFileGroup dataFilesChunk : dataFileChunks) {
@@ -187,7 +209,7 @@ class TestIcebergConversionSource {
InternalDataFile internalDataFile = internalDataFiles.get(0);
assertEquals(FileFormat.APACHE_PARQUET,
internalDataFile.getFileFormat());
assertEquals(1, internalDataFile.getRecordCount());
-
Assertions.assertTrue(internalDataFile.getPhysicalPath().startsWith("file:" +
workingDir));
+ assertTrue(internalDataFile.getPhysicalPath().startsWith("file:" +
workingDir));
List<PartitionValue> partitionValues =
internalDataFile.getPartitionValues();
assertEquals(1, partitionValues.size());
@@ -284,7 +306,7 @@ class TestIcebergConversionSource {
assertEquals(4, catalogSales.history().size());
catalogSales.expireSnapshots().expireSnapshotId(snapshot1.snapshotId()).commit();
assertEquals(3, catalogSales.history().size());
- Assertions.assertNull(catalogSales.snapshot(snapshot1.snapshotId()));
+ assertNull(catalogSales.snapshot(snapshot1.snapshotId()));
Snapshot snapshot6 = catalogSales.currentSnapshot();
// expire does not generate a new snapshot
assertEquals(snapshot6, snapshot5);
@@ -404,7 +426,7 @@ class TestIcebergConversionSource {
for (Types.NestedField expectedField : expectedSchema.columns()) {
Types.NestedField column = columnMap.get(expectedField.name());
- Assertions.assertNotNull(column);
+ assertNotNull(column);
assertEquals(expectedField.fieldId(), column.fieldId());
assertEquals(expectedField.type(), column.type());
assertEquals(expectedField.isOptional(), column.isOptional());
diff --git
a/xtable-core/src/test/java/org/apache/xtable/iceberg/TestIcebergPartitionValueConverter.java
b/xtable-core/src/test/java/org/apache/xtable/iceberg/TestIcebergPartitionValueConverter.java
index bdbb444c..f196adf5 100644
---
a/xtable-core/src/test/java/org/apache/xtable/iceberg/TestIcebergPartitionValueConverter.java
+++
b/xtable-core/src/test/java/org/apache/xtable/iceberg/TestIcebergPartitionValueConverter.java
@@ -18,7 +18,8 @@
package org.apache.xtable.iceberg;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Collections;
import java.util.List;
diff --git
a/xtable-core/src/test/java/org/apache/xtable/iceberg/TestIcebergSchemaExtractor.java
b/xtable-core/src/test/java/org/apache/xtable/iceberg/TestIcebergSchemaExtractor.java
index f842f99c..ab4f308e 100644
---
a/xtable-core/src/test/java/org/apache/xtable/iceberg/TestIcebergSchemaExtractor.java
+++
b/xtable-core/src/test/java/org/apache/xtable/iceberg/TestIcebergSchemaExtractor.java
@@ -21,7 +21,10 @@ package org.apache.xtable.iceberg;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git
a/xtable-core/src/test/java/org/apache/xtable/kernel/ITDeltaKernelConversionSource.java
b/xtable-core/src/test/java/org/apache/xtable/kernel/ITDeltaKernelConversionSource.java
index 5d240015..0a98b571 100644
---
a/xtable-core/src/test/java/org/apache/xtable/kernel/ITDeltaKernelConversionSource.java
+++
b/xtable-core/src/test/java/org/apache/xtable/kernel/ITDeltaKernelConversionSource.java
@@ -19,7 +19,10 @@
package org.apache.xtable.kernel;
import static org.apache.xtable.testutil.ITTestUtils.validateTable;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.net.URI;
import java.net.URISyntaxException;
@@ -39,7 +42,11 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.spark.serializer.KryoSerializer;
import org.apache.spark.sql.Row;
import org.apache.spark.sql.SparkSession;
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
@@ -56,13 +63,23 @@ import org.apache.xtable.GenericTable;
import org.apache.xtable.TestSparkDeltaTable;
import org.apache.xtable.ValidationTestHelper;
import org.apache.xtable.conversion.SourceTable;
-import org.apache.xtable.model.*;
-import org.apache.xtable.model.schema.*;
+import org.apache.xtable.model.CommitsBacklog;
+import org.apache.xtable.model.InstantsForIncrementalSync;
+import org.apache.xtable.model.InternalSnapshot;
+import org.apache.xtable.model.InternalTable;
+import org.apache.xtable.model.TableChange;
+import org.apache.xtable.model.schema.InternalField;
+import org.apache.xtable.model.schema.InternalPartitionField;
+import org.apache.xtable.model.schema.InternalSchema;
+import org.apache.xtable.model.schema.InternalType;
+import org.apache.xtable.model.schema.PartitionTransformType;
import org.apache.xtable.model.stat.ColumnStat;
import org.apache.xtable.model.stat.PartitionValue;
import org.apache.xtable.model.stat.Range;
-import org.apache.xtable.model.storage.*;
import org.apache.xtable.model.storage.DataLayoutStrategy;
+import org.apache.xtable.model.storage.FileFormat;
+import org.apache.xtable.model.storage.InternalDataFile;
+import org.apache.xtable.model.storage.PartitionFileGroup;
import org.apache.xtable.model.storage.TableFormat;
public class ITDeltaKernelConversionSource {
@@ -709,7 +726,7 @@ public class ITDeltaKernelConversionSource {
private void validatePropertiesDataFile(InternalDataFile expected,
InternalDataFile actual)
throws URISyntaxException {
- Assertions.assertTrue(
+ assertTrue(
Paths.get(new URI(actual.getPhysicalPath()).getPath()).isAbsolute(),
() -> "path == " + actual.getPhysicalPath() + " is not absolute");
Assertions.assertEquals(expected.getFileFormat(), actual.getFileFormat());
@@ -719,7 +736,7 @@ public class ITDeltaKernelConversionSource {
Instant now = Instant.now();
long minRange = now.minus(1, ChronoUnit.HOURS).toEpochMilli();
long maxRange = now.toEpochMilli();
- Assertions.assertTrue(
+ assertTrue(
actual.getLastModified() > minRange && actual.getLastModified() <=
maxRange,
() ->
"last modified == "
diff --git
a/xtable-core/src/test/java/org/apache/xtable/kernel/TestDeltaKernelPartitionExtractor.java
b/xtable-core/src/test/java/org/apache/xtable/kernel/TestDeltaKernelPartitionExtractor.java
index 1b9ffb12..2326e9c9 100644
---
a/xtable-core/src/test/java/org/apache/xtable/kernel/TestDeltaKernelPartitionExtractor.java
+++
b/xtable-core/src/test/java/org/apache/xtable/kernel/TestDeltaKernelPartitionExtractor.java
@@ -22,19 +22,30 @@ import static
org.apache.xtable.kernel.DeltaKernelPartitionExtractor.DELTA_GENER
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
import org.junit.jupiter.api.Test;
import scala.collection.JavaConverters;
-import io.delta.kernel.types.*;
+import io.delta.kernel.types.DateType;
import io.delta.kernel.types.FieldMetadata;
+import io.delta.kernel.types.IntegerType;
+import io.delta.kernel.types.StringType;
import io.delta.kernel.types.StructField;
import io.delta.kernel.types.StructType;
+import io.delta.kernel.types.TimestampType;
-import org.apache.xtable.model.schema.*;
+import org.apache.xtable.model.schema.InternalField;
+import org.apache.xtable.model.schema.InternalPartitionField;
+import org.apache.xtable.model.schema.InternalSchema;
+import org.apache.xtable.model.schema.InternalType;
+import org.apache.xtable.model.schema.PartitionTransformType;
import org.apache.xtable.model.stat.PartitionValue;
import org.apache.xtable.model.stat.Range;
diff --git
a/xtable-core/src/test/java/org/apache/xtable/kernel/TestDeltaKernelSchemaExtractor.java
b/xtable-core/src/test/java/org/apache/xtable/kernel/TestDeltaKernelSchemaExtractor.java
index 184b7a64..4e242da1 100644
---
a/xtable-core/src/test/java/org/apache/xtable/kernel/TestDeltaKernelSchemaExtractor.java
+++
b/xtable-core/src/test/java/org/apache/xtable/kernel/TestDeltaKernelSchemaExtractor.java
@@ -26,9 +26,21 @@ import java.util.Map;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import io.delta.kernel.types.*;
+import io.delta.kernel.types.ArrayType;
+import io.delta.kernel.types.BinaryType;
+import io.delta.kernel.types.BooleanType;
+import io.delta.kernel.types.DateType;
+import io.delta.kernel.types.DecimalType;
+import io.delta.kernel.types.DoubleType;
import io.delta.kernel.types.FieldMetadata;
+import io.delta.kernel.types.FloatType;
+import io.delta.kernel.types.IntegerType;
+import io.delta.kernel.types.LongType;
+import io.delta.kernel.types.MapType;
+import io.delta.kernel.types.StringType;
import io.delta.kernel.types.StructType;
+import io.delta.kernel.types.TimestampNTZType;
+import io.delta.kernel.types.TimestampType;
import org.apache.xtable.model.schema.InternalField;
import org.apache.xtable.model.schema.InternalSchema;
diff --git
a/xtable-core/src/test/java/org/apache/xtable/kernel/TestDeltaKernelStatsExtractor.java
b/xtable-core/src/test/java/org/apache/xtable/kernel/TestDeltaKernelStatsExtractor.java
index c08dda8f..0a247c75 100644
---
a/xtable-core/src/test/java/org/apache/xtable/kernel/TestDeltaKernelStatsExtractor.java
+++
b/xtable-core/src/test/java/org/apache/xtable/kernel/TestDeltaKernelStatsExtractor.java
@@ -21,7 +21,11 @@ package org.apache.xtable.kernel;
import static org.apache.xtable.testutil.ColumnStatMapUtil.getColumnStats;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
import org.junit.jupiter.api.Test;
diff --git
a/xtable-core/src/test/java/org/apache/xtable/parquet/ITParquetConversionSource.java
b/xtable-core/src/test/java/org/apache/xtable/parquet/ITParquetConversionSource.java
index 6dda9db1..530429ce 100644
---
a/xtable-core/src/test/java/org/apache/xtable/parquet/ITParquetConversionSource.java
+++
b/xtable-core/src/test/java/org/apache/xtable/parquet/ITParquetConversionSource.java
@@ -19,7 +19,10 @@
package org.apache.xtable.parquet;
import static org.apache.xtable.GenericTable.getTableName;
-import static org.apache.xtable.model.storage.TableFormat.*;
+import static org.apache.xtable.model.storage.TableFormat.DELTA;
+import static org.apache.xtable.model.storage.TableFormat.HUDI;
+import static org.apache.xtable.model.storage.TableFormat.ICEBERG;
+import static org.apache.xtable.model.storage.TableFormat.PARQUET;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -28,7 +31,6 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.sql.Timestamp;
import java.time.Duration;
-import java.util.*;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
@@ -36,6 +38,7 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Properties;
+import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -45,7 +48,12 @@ import lombok.Value;
import org.apache.spark.SparkConf;
import org.apache.spark.api.java.JavaSparkContext;
-import org.apache.spark.sql.*;
+import org.apache.spark.sql.Dataset;
+import org.apache.spark.sql.Row;
+import org.apache.spark.sql.RowFactory;
+import org.apache.spark.sql.SaveMode;
+import org.apache.spark.sql.SparkSession;
+import org.apache.spark.sql.functions;
import org.apache.spark.sql.types.DataTypes;
import org.apache.spark.sql.types.MetadataBuilder;
import org.apache.spark.sql.types.StructField;
diff --git
a/xtable-core/src/test/java/org/apache/xtable/parquet/TestParquetSchemaExtractor.java
b/xtable-core/src/test/java/org/apache/xtable/parquet/TestParquetSchemaExtractor.java
index a78e07bf..c5d196fc 100644
---
a/xtable-core/src/test/java/org/apache/xtable/parquet/TestParquetSchemaExtractor.java
+++
b/xtable-core/src/test/java/org/apache/xtable/parquet/TestParquetSchemaExtractor.java
@@ -18,16 +18,14 @@
package org.apache.xtable.parquet;
-import static org.junit.jupiter.api.Assertions.*;
-
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.apache.parquet.schema.*;
import org.apache.parquet.schema.GroupType;
import org.apache.parquet.schema.LogicalTypeAnnotation;
+import org.apache.parquet.schema.MessageType;
import org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName;
import org.apache.parquet.schema.Type;
import org.apache.parquet.schema.Type.Repetition;
diff --git
a/xtable-core/src/test/java/org/apache/xtable/parquet/TestParquetStatsExtractor.java
b/xtable-core/src/test/java/org/apache/xtable/parquet/TestParquetStatsExtractor.java
index df0aba33..5047827f 100644
---
a/xtable-core/src/test/java/org/apache/xtable/parquet/TestParquetStatsExtractor.java
+++
b/xtable-core/src/test/java/org/apache/xtable/parquet/TestParquetStatsExtractor.java
@@ -39,9 +39,9 @@ import org.apache.parquet.column.statistics.IntStatistics;
import org.apache.parquet.hadoop.ParquetFileWriter;
import org.apache.parquet.hadoop.metadata.CompressionCodecName;
import org.apache.parquet.io.api.Binary;
-import org.apache.parquet.schema.*;
import org.apache.parquet.schema.MessageType;
import org.apache.parquet.schema.MessageTypeParser;
+import org.apache.parquet.schema.PrimitiveType;
import org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName;
import org.apache.parquet.schema.Type.Repetition;
import org.junit.jupiter.api.Assertions;
diff --git
a/xtable-service/src/test/java/org/apache/xtable/service/TestConversionResource.java
b/xtable-service/src/test/java/org/apache/xtable/service/TestConversionResource.java
index 5591db86..99337e9e 100644
---
a/xtable-service/src/test/java/org/apache/xtable/service/TestConversionResource.java
+++
b/xtable-service/src/test/java/org/apache/xtable/service/TestConversionResource.java
@@ -18,7 +18,9 @@
package org.apache.xtable.service;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
diff --git
a/xtable-utilities/src/test/java/org/apache/xtable/utilities/TestRunCatalogSync.java
b/xtable-utilities/src/test/java/org/apache/xtable/utilities/TestRunCatalogSync.java
index 3f504ff7..ea842846 100644
---
a/xtable-utilities/src/test/java/org/apache/xtable/utilities/TestRunCatalogSync.java
+++
b/xtable-utilities/src/test/java/org/apache/xtable/utilities/TestRunCatalogSync.java
@@ -18,7 +18,7 @@
package org.apache.xtable.utilities;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import lombok.SneakyThrows;
