[hotfix] Modify the shade module code format. (apache#971)

Author: zhuangchong

.scalafmt.conf

@@ -48,7 +48,7 @@ rewrite.rules = [AvoidInfix, Imports, RedundantBraces, SortModifiers]
 rewrite.imports.sort = scalastyle
 rewrite.imports.groups = [
     ["org.apache.paimon\\..*"],
-    ["org.apache.paimon.shaded\\..*"],
+    ["org.apache.paimon.shade\\..*"],
     [".*"],
     ["javax\\..*"],
     ["java\\..*"],

paimon-benchmark/paimon-cluster-benchmark/src/main/java/org/apache/paimon/benchmark/metric/FlinkRestClient.java

@@ -19,6 +19,7 @@
 package org.apache.paimon.benchmark.metric;
 
 import org.apache.paimon.benchmark.utils.BenchmarkUtils;
+
 import org.apache.paimon.shade.jackson2.com.fasterxml.jackson.databind.JsonNode;
 import org.apache.paimon.shade.jackson2.com.fasterxml.jackson.databind.node.ArrayNode;
 

paimon-benchmark/paimon-cluster-benchmark/src/main/java/org/apache/paimon/benchmark/metric/cpu/CpuMetric.java

@@ -19,6 +19,7 @@
 package org.apache.paimon.benchmark.metric.cpu;
 
 import org.apache.paimon.benchmark.utils.BenchmarkUtils;
+
 import org.apache.paimon.shade.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
 import org.apache.paimon.shade.jackson2.com.fasterxml.jackson.annotation.JsonIgnore;
 import org.apache.paimon.shade.jackson2.com.fasterxml.jackson.annotation.JsonInclude;

paimon-common/pom.xml

@@ -265,15 +265,15 @@ under the License.
                             <relocations>
                                 <relocation>
                                     <pattern>org.antlr.v4.runtime</pattern>
-                                    <shadedPattern>org.apache.paimon.shaded.org.antlr.v4.runtime</shadedPattern>
+                                    <shadedPattern>org.apache.paimon.shade.org.antlr.v4.runtime</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>org.codehaus.janino</pattern>
-                                    <shadedPattern>org.apache.paimon.shaded.org.codehaus.janino</shadedPattern>
+                                    <shadedPattern>org.apache.paimon.shade.org.codehaus.janino</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>org.codehaus.commons</pattern>
-                                    <shadedPattern>org.apache.paimon.shaded.org.codehaus.commons</shadedPattern>
+                                    <shadedPattern>org.apache.paimon.shade.org.codehaus.commons</shadedPattern>
                                 </relocation>
                             </relocations>
                         </configuration>

paimon-common/src/main/java/org/apache/paimon/io/cache/CacheManager.java

@@ -21,6 +21,7 @@
 import org.apache.paimon.annotation.VisibleForTesting;
 import org.apache.paimon.memory.MemorySegment;
 import org.apache.paimon.options.MemorySize;
+
 import org.apache.paimon.shade.caffeine2.com.github.benmanes.caffeine.cache.Cache;
 import org.apache.paimon.shade.caffeine2.com.github.benmanes.caffeine.cache.Caffeine;
 import org.apache.paimon.shade.caffeine2.com.github.benmanes.caffeine.cache.RemovalCause;

paimon-common/src/main/java/org/apache/paimon/plugin/ComponentClassLoader.java

@@ -18,9 +18,10 @@
 package org.apache.paimon.plugin;
 
 import org.apache.paimon.annotation.VisibleForTesting;
-import org.apache.paimon.shade.guava30.com.google.common.collect.Iterators;
 import org.apache.paimon.utils.FunctionWithException;
 
+import org.apache.paimon.shade.guava30.com.google.common.collect.Iterators;
+
 import java.io.IOException;
 import java.net.URL;
 import java.net.URLClassLoader;

paimon-common/src/main/java/org/apache/paimon/types/ArrayType.java

@@ -19,9 +19,10 @@
 package org.apache.paimon.types;
 
 import org.apache.paimon.annotation.Public;
-import org.apache.paimon.shade.jackson2.com.fasterxml.jackson.core.JsonGenerator;
 import org.apache.paimon.utils.Preconditions;
 
+import org.apache.paimon.shade.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+
 import java.io.IOException;
 import java.util.Objects;
 import java.util.Set;

paimon-common/src/main/java/org/apache/paimon/types/DataField.java

@@ -19,6 +19,7 @@
 package org.apache.paimon.types;
 
 import org.apache.paimon.annotation.Public;
+
 import org.apache.paimon.shade.jackson2.com.fasterxml.jackson.core.JsonGenerator;
 
 import javax.annotation.Nullable;

paimon-common/src/main/java/org/apache/paimon/types/DataType.java

@@ -19,9 +19,10 @@
 package org.apache.paimon.types;
 
 import org.apache.paimon.annotation.Public;
-import org.apache.paimon.shade.jackson2.com.fasterxml.jackson.core.JsonGenerator;
 import org.apache.paimon.utils.Preconditions;
 
+import org.apache.paimon.shade.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+
 import javax.annotation.Nonnull;
 
 import java.io.IOException;

paimon-common/src/main/java/org/apache/paimon/types/MapType.java

@@ -19,9 +19,10 @@
 package org.apache.paimon.types;
 
 import org.apache.paimon.annotation.Public;
-import org.apache.paimon.shade.jackson2.com.fasterxml.jackson.core.JsonGenerator;
 import org.apache.paimon.utils.Preconditions;
 
+import org.apache.paimon.shade.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+
 import java.io.IOException;
 import java.util.Objects;
 import java.util.Set;

paimon-common/src/main/java/org/apache/paimon/types/MultisetType.java

@@ -19,9 +19,10 @@
 package org.apache.paimon.types;
 
 import org.apache.paimon.annotation.Public;
-import org.apache.paimon.shade.jackson2.com.fasterxml.jackson.core.JsonGenerator;
 import org.apache.paimon.utils.Preconditions;
 
+import org.apache.paimon.shade.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+
 import java.io.IOException;
 import java.util.Objects;
 import java.util.Set;

paimon-common/src/main/java/org/apache/paimon/types/RowType.java

@@ -19,10 +19,11 @@
 package org.apache.paimon.types;
 
 import org.apache.paimon.annotation.Public;
-import org.apache.paimon.shade.jackson2.com.fasterxml.jackson.core.JsonGenerator;
 import org.apache.paimon.utils.Preconditions;
 import org.apache.paimon.utils.StringUtils;
 
+import org.apache.paimon.shade.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;

paimon-core/src/main/java/org/apache/paimon/Snapshot.java

@@ -24,10 +24,11 @@
 import org.apache.paimon.manifest.ManifestFileMeta;
 import org.apache.paimon.manifest.ManifestList;
 import org.apache.paimon.operation.FileStoreScan;
+import org.apache.paimon.utils.JsonSerdeUtil;
+
 import org.apache.paimon.shade.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
 import org.apache.paimon.shade.jackson2.com.fasterxml.jackson.annotation.JsonGetter;
 import org.apache.paimon.shade.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.paimon.utils.JsonSerdeUtil;
 
 import javax.annotation.Nullable;
 

paimon-core/src/main/java/org/apache/paimon/mergetree/LookupLevels.java

@@ -30,14 +30,15 @@
 import org.apache.paimon.memory.MemorySegment;
 import org.apache.paimon.options.MemorySize;
 import org.apache.paimon.reader.RecordReader;
-import org.apache.paimon.shade.guava30.com.google.common.cache.Cache;
-import org.apache.paimon.shade.guava30.com.google.common.cache.CacheBuilder;
-import org.apache.paimon.shade.guava30.com.google.common.cache.RemovalNotification;
 import org.apache.paimon.types.RowKind;
 import org.apache.paimon.types.RowType;
 import org.apache.paimon.utils.FileIOUtils;
 import org.apache.paimon.utils.IOFunction;
 
+import org.apache.paimon.shade.guava30.com.google.common.cache.Cache;
+import org.apache.paimon.shade.guava30.com.google.common.cache.CacheBuilder;
+import org.apache.paimon.shade.guava30.com.google.common.cache.RemovalNotification;
+
 import javax.annotation.Nullable;
 
 import java.io.Closeable;

paimon-core/src/main/java/org/apache/paimon/operation/FileStoreExpireImpl.java

@@ -27,11 +27,12 @@
 import org.apache.paimon.manifest.ManifestFile;
 import org.apache.paimon.manifest.ManifestFileMeta;
 import org.apache.paimon.manifest.ManifestList;
-import org.apache.paimon.shade.guava30.com.google.common.collect.Iterables;
 import org.apache.paimon.utils.FileStorePathFactory;
 import org.apache.paimon.utils.SnapshotManager;
 import org.apache.paimon.utils.Triple;
 
+import org.apache.paimon.shade.guava30.com.google.common.collect.Iterables;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

paimon-core/src/main/java/org/apache/paimon/operation/MemoryFileStoreWrite.java

@@ -23,10 +23,11 @@
 import org.apache.paimon.memory.HeapMemorySegmentPool;
 import org.apache.paimon.memory.MemoryOwner;
 import org.apache.paimon.memory.MemoryPoolFactory;
-import org.apache.paimon.shade.guava30.com.google.common.collect.Iterators;
 import org.apache.paimon.utils.RecordWriter;
 import org.apache.paimon.utils.SnapshotManager;
 
+import org.apache.paimon.shade.guava30.com.google.common.collect.Iterators;
+
 import java.util.Iterator;
 import java.util.Map;
 

paimon-core/src/main/java/org/apache/paimon/predicate/BucketSelector.java

@@ -22,10 +22,11 @@
 import org.apache.paimon.data.BinaryRow;
 import org.apache.paimon.data.GenericRow;
 import org.apache.paimon.data.serializer.InternalRowSerializer;
-import org.apache.paimon.shade.guava30.com.google.common.collect.ImmutableSet;
 import org.apache.paimon.table.sink.KeyAndBucketExtractor;
 import org.apache.paimon.types.RowType;
 
+import org.apache.paimon.shade.guava30.com.google.common.collect.ImmutableSet;
+
 import javax.annotation.concurrent.ThreadSafe;
 
 import java.io.Serializable;

paimon-core/src/main/java/org/apache/paimon/schema/SchemaSerializer.java

@@ -18,14 +18,15 @@
 
 package org.apache.paimon.schema;
 
-import org.apache.paimon.shade.jackson2.com.fasterxml.jackson.core.JsonGenerator;
-import org.apache.paimon.shade.jackson2.com.fasterxml.jackson.databind.JsonNode;
 import org.apache.paimon.types.DataField;
 import org.apache.paimon.types.DataTypeJsonParser;
 import org.apache.paimon.utils.JsonDeserializer;
 import org.apache.paimon.utils.JsonSerializer;
 import org.apache.paimon.utils.StringUtils;
 
+import org.apache.paimon.shade.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.paimon.shade.jackson2.com.fasterxml.jackson.databind.JsonNode;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;

paimon-core/src/main/java/org/apache/paimon/table/system/AuditLogTable.java

@@ -29,7 +29,6 @@
 import org.apache.paimon.predicate.PredicateBuilder;
 import org.apache.paimon.predicate.PredicateReplaceVisitor;
 import org.apache.paimon.reader.RecordReader;
-import org.apache.paimon.shade.guava30.com.google.common.primitives.Ints;
 import org.apache.paimon.table.DataTable;
 import org.apache.paimon.table.FileStoreTable;
 import org.apache.paimon.table.ReadonlyTable;
@@ -48,6 +47,8 @@
 import org.apache.paimon.utils.ProjectedRow;
 import org.apache.paimon.utils.SnapshotManager;
 
+import org.apache.paimon.shade.guava30.com.google.common.primitives.Ints;
+
 import javax.annotation.Nullable;
 
 import java.io.IOException;

paimon-core/src/main/java/org/apache/paimon/table/system/FilesTable.java

@@ -28,7 +28,6 @@
 import org.apache.paimon.reader.RecordReader;
 import org.apache.paimon.schema.SchemaManager;
 import org.apache.paimon.schema.TableSchema;
-import org.apache.paimon.shade.guava30.com.google.common.collect.Iterators;
 import org.apache.paimon.stats.BinaryTableStats;
 import org.apache.paimon.stats.FieldStatsArraySerializer;
 import org.apache.paimon.stats.FieldStatsConverters;
@@ -51,6 +50,8 @@
 import org.apache.paimon.utils.RowDataToObjectArrayConverter;
 import org.apache.paimon.utils.SerializationUtils;
 
+import org.apache.paimon.shade.guava30.com.google.common.collect.Iterators;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;

paimon-core/src/main/java/org/apache/paimon/table/system/OptionsTable.java

@@ -26,7 +26,6 @@
 import org.apache.paimon.predicate.Predicate;
 import org.apache.paimon.reader.RecordReader;
 import org.apache.paimon.schema.SchemaManager;
-import org.apache.paimon.shade.guava30.com.google.common.collect.Iterators;
 import org.apache.paimon.table.ReadonlyTable;
 import org.apache.paimon.table.Table;
 import org.apache.paimon.table.source.InnerTableRead;
@@ -38,6 +37,8 @@
 import org.apache.paimon.utils.IteratorRecordReader;
 import org.apache.paimon.utils.ProjectedRow;
 
+import org.apache.paimon.shade.guava30.com.google.common.collect.Iterators;
+
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collections;

paimon-core/src/main/java/org/apache/paimon/table/system/SchemasTable.java

@@ -27,7 +27,6 @@
 import org.apache.paimon.reader.RecordReader;
 import org.apache.paimon.schema.SchemaManager;
 import org.apache.paimon.schema.TableSchema;
-import org.apache.paimon.shade.guava30.com.google.common.collect.Iterators;
 import org.apache.paimon.table.ReadonlyTable;
 import org.apache.paimon.table.Table;
 import org.apache.paimon.table.source.InnerTableRead;
@@ -43,6 +42,8 @@
 import org.apache.paimon.utils.ProjectedRow;
 import org.apache.paimon.utils.SerializationUtils;
 
+import org.apache.paimon.shade.guava30.com.google.common.collect.Iterators;
+
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collections;

paimon-core/src/main/java/org/apache/paimon/table/system/SnapshotsTable.java

@@ -27,7 +27,6 @@
 import org.apache.paimon.fs.Path;
 import org.apache.paimon.predicate.Predicate;
 import org.apache.paimon.reader.RecordReader;
-import org.apache.paimon.shade.guava30.com.google.common.collect.Iterators;
 import org.apache.paimon.table.ReadonlyTable;
 import org.apache.paimon.table.Table;
 import org.apache.paimon.table.source.InnerTableRead;
@@ -43,6 +42,8 @@
 import org.apache.paimon.utils.SerializationUtils;
 import org.apache.paimon.utils.SnapshotManager;
 
+import org.apache.paimon.shade.guava30.com.google.common.collect.Iterators;
+
 import java.io.IOException;
 import java.time.Instant;
 import java.time.LocalDateTime;

paimon-core/src/main/java/org/apache/paimon/utils/JsonSerdeUtil.java

@@ -20,6 +20,10 @@
 
 import org.apache.paimon.schema.SchemaSerializer;
 import org.apache.paimon.schema.TableSchema;
+import org.apache.paimon.types.DataField;
+import org.apache.paimon.types.DataType;
+import org.apache.paimon.types.DataTypeJsonParser;
+
 import org.apache.paimon.shade.jackson2.com.fasterxml.jackson.core.JsonGenerator;
 import org.apache.paimon.shade.jackson2.com.fasterxml.jackson.core.JsonParser;
 import org.apache.paimon.shade.jackson2.com.fasterxml.jackson.core.JsonProcessingException;
@@ -30,9 +34,6 @@
 import org.apache.paimon.shade.jackson2.com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 import org.apache.paimon.shade.jackson2.com.fasterxml.jackson.databind.module.SimpleModule;
 import org.apache.paimon.shade.jackson2.com.fasterxml.jackson.databind.ser.std.StdSerializer;
-import org.apache.paimon.types.DataField;
-import org.apache.paimon.types.DataType;
-import org.apache.paimon.types.DataTypeJsonParser;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;

paimon-core/src/main/java/org/apache/paimon/utils/SegmentsCache.java

@@ -20,6 +20,7 @@
 
 import org.apache.paimon.data.Segments;
 import org.apache.paimon.options.MemorySize;
+
 import org.apache.paimon.shade.caffeine2.com.github.benmanes.caffeine.cache.Cache;
 import org.apache.paimon.shade.caffeine2.com.github.benmanes.caffeine.cache.Caffeine;
 import org.apache.paimon.shade.guava30.com.google.common.util.concurrent.MoreExecutors;

paimon-core/src/test/java/org/apache/paimon/catalog/CatalogTestBase.java

@@ -24,12 +24,13 @@
 import org.apache.paimon.options.Options;
 import org.apache.paimon.schema.Schema;
 import org.apache.paimon.schema.SchemaChange;
-import org.apache.paimon.shade.guava30.com.google.common.collect.Lists;
-import org.apache.paimon.shade.guava30.com.google.common.collect.Maps;
 import org.apache.paimon.table.Table;
 import org.apache.paimon.types.DataField;
 import org.apache.paimon.types.DataTypes;
 
+import org.apache.paimon.shade.guava30.com.google.common.collect.Lists;
+import org.apache.paimon.shade.guava30.com.google.common.collect.Maps;
+
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

paimon-filesystems/paimon-hadoop-shaded/pom.xml

@@ -229,23 +229,23 @@
                                 <!-- we shade only the parts that are internal to Hadoop and not used / exposed downstream -->
                                 <relocation>
                                     <pattern>com.google.re2j</pattern>
-                                    <shadedPattern>org.apache.paimon.fs.shaded.hadoop3.com.google.re2j</shadedPattern>
+                                    <shadedPattern>org.apache.paimon.fs.shade.hadoop3.com.google.re2j</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>org.apache.htrace</pattern>
-                                    <shadedPattern>org.apache.paimon.fs.shaded.hadoop3.org.apache.htrace</shadedPattern>
+                                    <shadedPattern>org.apache.paimon.fs.shade.hadoop3.org.apache.htrace</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>com.fasterxml</pattern>
-                                    <shadedPattern>org.apache.paimon.fs.shaded.hadoop3.com.fasterxml</shadedPattern>
+                                    <shadedPattern>org.apache.paimon.fs.shade.hadoop3.com.fasterxml</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>org.codehaus</pattern>
-                                    <shadedPattern>org.apache.paimon.fs.shaded.hadoop3.org.codehaus</shadedPattern>
+                                    <shadedPattern>org.apache.paimon.fs.shade.hadoop3.org.codehaus</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>com.ctc</pattern>
-                                    <shadedPattern>org.apache.paimon.fs.shaded.hadoop3.com.ctc</shadedPattern>
+                                    <shadedPattern>org.apache.paimon.fs.shade.hadoop3.com.ctc</shadedPattern>
                                 </relocation>
                             </relocations>
                             <filters>