checkstyle fixed

sadwitdastreetz · sadwitdastreetz · commit b9124a3347cc · 2025-10-07T19:48:00.000+08:00
diff --git a/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/HugeGraphLoader.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/HugeGraphLoader.java
@@ -29,7 +29,6 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.ThreadPoolExecutor;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -76,10 +75,7 @@
 import org.apache.hugegraph.loader.source.SourceType;
 import org.apache.hugegraph.loader.source.graph.GraphSource;
 import org.apache.hugegraph.structure.constant.HugeType;
-import org.apache.hugegraph.structure.schema.EdgeLabel;
-import org.apache.hugegraph.structure.schema.IndexLabel;
 import org.apache.hugegraph.structure.schema.PropertyKey;
-import org.apache.hugegraph.structure.schema.VertexLabel;
 import org.apache.hugegraph.util.Log;
 import org.apache.hugegraph.util.JsonUtil;
 
@@ -412,7 +408,7 @@ private void createGraphSourceVertexLabel(HugeClient sourceClient,
 
                 if (des.getProperties() != null) {
                     des.getProperties()
-                       .forEach((p) -> vertexLabel.properties().remove(p));
+                        .forEach((p) -> vertexLabel.properties().remove(p));
                 }
             }
 
@@ -489,7 +485,7 @@ private void createGraphSourceEdgeLabel(HugeClient sourceClient,
 
                 if (des.getProperties() != null) {
                     des.getProperties()
-                       .forEach((p) -> edgeLabel.properties().remove(p));
+                        .forEach((p) -> edgeLabel.properties().remove(p));
                 }
             }
 
diff --git a/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/MappingConverter.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/MappingConverter.java
@@ -21,7 +21,6 @@
 import java.nio.file.Paths;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.hugegraph.loader.util.JsonUtil;
 import org.apache.hugegraph.loader.util.MappingUtil;
 import org.slf4j.Logger;
 
diff --git a/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/builder/EdgeBuilder.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/builder/EdgeBuilder.java
@@ -63,7 +63,7 @@ public EdgeBuilder(LoadContext context, InputStruct struct,
             this.targetLabel = new VertexLabel("~general");
             this.sourceLabel.idStrategy(IdStrategy.CUSTOMIZE_STRING);
             this.targetLabel.idStrategy(IdStrategy.CUSTOMIZE_STRING);
-        }else {
+        } else {
             this.sourceLabel = this.getVertexLabel(this.edgeLabel.sourceLabel());
             this.targetLabel = this.getVertexLabel(this.edgeLabel.targetLabel());
         }
diff --git a/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/builder/NopEdgeBuilder.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/builder/NopEdgeBuilder.java
@@ -28,7 +28,7 @@
 import org.apache.hugegraph.structure.graph.Edge;
 import org.apache.hugegraph.structure.schema.SchemaLabel;
 
-public class NopEdgeBuilder extends ElementBuilder<Edge>{
+public class NopEdgeBuilder extends ElementBuilder<Edge> {
 
     public NopEdgeBuilder(LoadContext context, InputStruct struct) {
         super(context, struct);
diff --git a/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/builder/NopVertexBuilder.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/builder/NopVertexBuilder.java
@@ -29,7 +29,7 @@
 import org.apache.hugegraph.structure.schema.SchemaLabel;
 import org.apache.hugegraph.structure.schema.VertexLabel;
 
-public class NopVertexBuilder extends ElementBuilder<Vertex>{
+public class NopVertexBuilder extends ElementBuilder<Vertex> {
 
     public NopVertexBuilder(LoadContext context, InputStruct struct) {
         super(context, struct);
diff --git a/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/executor/LoadContext.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/executor/LoadContext.java
@@ -18,7 +18,6 @@
 package org.apache.hugegraph.loader.executor;
 
 import java.io.IOException;
-import java.io.Serializable;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
diff --git a/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/executor/LoadOptions.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/executor/LoadOptions.java
@@ -89,7 +89,8 @@ public final class LoadOptions implements Cloneable {
 
     @Parameter(names = {"-g", "--graph"}, 
                arity = 1,
-               description = "The name of the graph to load into, if not specified, hugegraph will be used")
+               description = "The name of the graph to load into, " +
+                    "if not specified, hugegraph will be used")
     public String graph = "hugegraph";
 
     @Parameter(names = {"--create-graph"}, required = false, arity = 1,
@@ -176,7 +177,7 @@ public final class LoadOptions implements Cloneable {
                description = "The number of lines in each submit")
     public int batchSize = 500;
 
-        @Parameter(names = {"--parallel-count"}, arity = 1,
+    @Parameter(names = {"--parallel-count"}, arity = 1,
             description = "The number of parallel read pipelines")
     public int parallelCount = 1;
 
@@ -260,7 +261,8 @@ public final class LoadOptions implements Cloneable {
                description = "Whether the hugegraph-loader work in test mode")
     public boolean testMode = false;
 
-    @Parameter(names = {"-help", "--help"}, help = true, description = "Print usage of HugeGraphLoader")
+    @Parameter(names = {"-help", "--help"}, help = true, description =
+            "Print usage of HugeGraphLoader")
     public boolean help;
 
     @Parameter(names = {"--use-prefilter"}, required = false, arity = 1,
@@ -395,8 +397,8 @@ public static LoadOptions parseOptions(String[] args) {
         return options;
     }
 
-    public ShortIdConfig getShortIdConfig(String vertexLabel){
-        for(ShortIdConfig config: shorterIDConfigs) {
+    public ShortIdConfig getShortIdConfig(String vertexLabel) {
+        for (ShortIdConfig config: shorterIDConfigs) {
             if (config.getVertexLabel().equals(vertexLabel)) {
                 return config;
             }
diff --git a/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/failure/FailLogger.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/failure/FailLogger.java
@@ -30,7 +30,6 @@
 import java.io.Reader;
 import java.io.Writer;
 import java.nio.charset.Charset;
-import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.HashSet;
 import java.util.Set;
@@ -152,8 +151,8 @@ private void removeDupLines() {
             Set<Integer> writedLines = new HashSet<>();
             HashFunction hashFunc = Hashing.murmur3_32();
             for (String tipsLine, dataLine;
-                 (tipsLine = reader.readLine()) != null &&
-                 (dataLine = reader.readLine()) != null;) {
+                     (tipsLine = reader.readLine()) != null &&
+                     (dataLine = reader.readLine()) != null;) {
                 /*
                  * Hash data line to remove duplicate lines
                  * Misjudgment may occur, but the probability is extremely low
diff --git a/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/filter/ElementLimitFilter.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/filter/ElementLimitFilter.java
@@ -54,8 +54,8 @@ public boolean parse(GraphElement element) {
             v.addAndGet(1);
             return v;
         });
-        return counter.addAndGet(edge.sourceId()) <= limit
-                && counter.addAndGet(edge.targetId()) <= limit;
+        return counter.addAndGet(edge.sourceId()) <= limit &&
+               counter.addAndGet(edge.targetId()) <= limit;
     }
 
     class LruCounter<K> {
diff --git a/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/filter/ShortIdParser.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/filter/ShortIdParser.java
@@ -144,14 +144,14 @@ public static byte[] stringToBytes(String str) {
 
     public static byte[] longToBytes(long x) {
         return new byte[]{
-                (byte) (x >>> 56),
-                (byte) (x >>> 48),
-                (byte) (x >>> 40),
-                (byte) (x >>> 32),
-                (byte) (x >>> 24),
-                (byte) (x >>> 16),
-                (byte) (x >>> 8),
-                (byte) x};
+            (byte) (x >>> 56),
+            (byte) (x >>> 48),
+            (byte) (x >>> 40),
+            (byte) (x >>> 32),
+            (byte) (x >>> 24),
+            (byte) (x >>> 16),
+            (byte) (x >>> 8),
+            (byte) x};
     }
 
     public static long bytesToLong(byte[] bytes) {
diff --git a/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/filter/util/SegmentIdGenerator.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/filter/util/SegmentIdGenerator.java
@@ -23,7 +23,7 @@ public class SegmentIdGenerator {
 
     private volatile int currentId = -1;
 
-    public class Context{
+    public class Context {
         public int maxId = 0;
         public int lastId = 0;
 
diff --git a/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/filter/util/VertexLabelBuilderProxy.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/filter/util/VertexLabelBuilderProxy.java
@@ -22,15 +22,15 @@
 import org.apache.hugegraph.structure.constant.IdStrategy;
 import org.apache.hugegraph.structure.schema.VertexLabel;
 
-public class VertexLabelBuilderProxy implements VertexLabel.Builder{
+public class VertexLabelBuilderProxy implements VertexLabel.Builder {
 
     private VertexLabel.BuilderImpl builder;
 
     private ShortIdConfig config;
     public VertexLabelBuilderProxy(String name, SchemaManager manager, LoadOptions options) {
         this.builder = new VertexLabel.BuilderImpl(name, manager);
         for (ShortIdConfig config : options.shorterIDConfigs) {
-            if (config.getVertexLabel().equals(name)){
+            if (config.getVertexLabel().equals(name)) {
                 this.config = config;
                 break;
             }
diff --git a/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/progress/LoadProgress.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/progress/LoadProgress.java
@@ -25,7 +25,6 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import org.apache.commons.io.FileUtils;
 
diff --git a/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/file/LocalFileReader.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/file/LocalFileReader.java
@@ -21,23 +21,18 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.hadoop.fs.Path;
-import org.apache.hugegraph.util.Log;
-import org.slf4j.Logger;
 
 import org.apache.hugegraph.loader.exception.LoadException;
 import org.apache.hugegraph.loader.progress.FileItemProgress;
 import org.apache.hugegraph.loader.progress.InputItemProgress;
 import org.apache.hugegraph.loader.reader.Readable;
 import org.apache.hugegraph.loader.source.InputSource;
 import org.apache.hugegraph.loader.source.file.Compression;
-import org.apache.hugegraph.loader.source.file.DirFilter;
 import org.apache.hugegraph.loader.source.file.FileFilter;
 import org.apache.hugegraph.loader.source.file.FileSource;
 import com.google.common.collect.ImmutableSet;
diff --git a/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/hdfs/HDFSFileReader.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/hdfs/HDFSFileReader.java
@@ -33,7 +33,6 @@
 import org.apache.hadoop.fs.FileUtil;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.fs.RemoteIterator;
 import org.apache.hadoop.security.UserGroupInformation;
 
 import org.apache.hugegraph.loader.constant.Constants;
@@ -63,7 +62,7 @@ public class HDFSFileReader extends FileReader {
     private final FileSystem hdfs;
     private final Configuration conf;
 
-        /**
+    /**
      * 只支持单集群
      */
     private static boolean hasLogin = false;
@@ -91,7 +90,7 @@ public FileSystem getFileSystem(Configuration conf) throws IOException {
 
     private void enableKerberos(HDFSSource source) throws IOException {
         KerberosConfig kerberosConfig = source.kerberosConfig();
-        if (kerberosConfig != null && kerberosConfig.enable() ) {
+        if (kerberosConfig != null && kerberosConfig.enable()) {
             System.setProperty("java.security.krb5.conf",
                                kerberosConfig.krb5Conf());
             UserGroupInformation.setConfiguration(this.conf);
diff --git a/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/jdbc/Fetcher.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/jdbc/Fetcher.java
@@ -63,7 +63,7 @@ private Connection connect() throws SQLException {
         } catch (ClassNotFoundException e) {
             throw new LoadException("Invalid driver class '%s'", e, driverName);
         }
-        return DriverManager.getConnection(url ,
+        return DriverManager.getConnection(url,
                 username,
                 password);
     }
diff --git a/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/jdbc/JDBCReader.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/jdbc/JDBCReader.java
@@ -32,7 +32,7 @@
 public class JDBCReader extends AbstractReader {
 
     private final JDBCSource source;
-    private Fetcher fetcher ;
+    private Fetcher fetcher;
 
     private List<Line> batch;
     private int offsetInBatch;
diff --git a/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/task/ParseTaskBuilder.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/task/ParseTaskBuilder.java
@@ -116,7 +116,7 @@ private ParseTask buildTask(ElementBuilder builder, List<Line> lines) {
                         records = new ArrayList<>(batchSize);
                     }
                     for (GraphElement element : elements) {
-                        if (this.context.filterGroup().filter(element)){
+                        if (this.context.filterGroup().filter(element)) {
                             records.add(new Record(line.rawLine(), element));
                             count++;
                         }
diff --git a/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/util/DataTypeUtil.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/util/DataTypeUtil.java
@@ -25,7 +25,6 @@
 import java.util.Set;
 import java.util.UUID;
 
-import org.apache.hugegraph.util.Bytes;
 import org.apache.hugegraph.util.E;
 import org.apache.hugegraph.util.InsertionOrderUtil;
 import org.apache.hugegraph.util.ReflectionUtil;

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public EdgeBuilder(LoadContext context, InputStruct struct,`
`63`	`63`	`this.targetLabel = new VertexLabel("~general");`
`64`	`64`	`this.sourceLabel.idStrategy(IdStrategy.CUSTOMIZE_STRING);`
`65`	`65`	`this.targetLabel.idStrategy(IdStrategy.CUSTOMIZE_STRING);`
`66`		`- }else {`
	`66`	`+ } else {`
`67`	`67`	`this.sourceLabel = this.getVertexLabel(this.edgeLabel.sourceLabel());`
`68`	`68`	`this.targetLabel = this.getVertexLabel(this.edgeLabel.targetLabel());`
`69`	`69`	`}`