fix

vernedeng · Apr 18, 2024 · 029541e · 029541e
1 parent c90a326
commit 029541e
Show file tree

Hide file tree

Showing 23 changed files with 39 additions and 21 deletions.
diff --git a/inlong-common/src/main/java/org/apache/inlong/common/constant/CompressionType.java b/inlong-common/src/main/java/org/apache/inlong/common/constant/CompressionType.java
@@ -18,6 +18,7 @@
 package org.apache.inlong.common.constant;
 
 public class CompressionType {
+
     public static final String GZIP = "GZIP";
     public static final String SNAPPY = "SNAPPY";
     public static final String LZO = "LZO";

diff --git a/inlong-common/src/main/java/org/apache/inlong/common/constant/DataNodeType.java b/inlong-common/src/main/java/org/apache/inlong/common/constant/DataNodeType.java
@@ -18,6 +18,7 @@
 package org.apache.inlong.common.constant;
 
 public class DataNodeType {
+
     public static final String KAFKA = "KAFKA";
     public static final String PULSAR = "PULSAR";
     public static final String CLS = "CLS";

diff --git a/inlong-common/src/main/java/org/apache/inlong/common/constant/DeserializationType.java b/inlong-common/src/main/java/org/apache/inlong/common/constant/DeserializationType.java
@@ -18,6 +18,7 @@
 package org.apache.inlong.common.constant;
 
 public class DeserializationType {
+
     public static final String INLONG_MSG = "INLONG_MSG";
     public static final String INLONG_MSG_PB = "INLONG_MSG_PB";
     public static final String CSV = "CSV";

diff --git a/inlong-common/src/main/java/org/apache/inlong/common/constant/SinkType.java b/inlong-common/src/main/java/org/apache/inlong/common/constant/SinkType.java
@@ -18,6 +18,7 @@
 package org.apache.inlong.common.constant;
 
 public class SinkType {
+
     public static final String KAFKA = "KAFKA";
     public static final String PULSAR = "PULSAR";
     public static final String CLS = "CLS";

diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/SortClusterConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/SortClusterConfig.java
@@ -17,15 +17,17 @@
 
 package org.apache.inlong.common.pojo.sort;
 
-import lombok.Data;
 import org.apache.inlong.common.pojo.sort.dataflow.DataflowConfig;
 import org.apache.inlong.common.pojo.sort.mq.MqClusterConfig;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.List;
 
 @Data
 public class SortClusterConfig implements Serializable {
+
     private String clusterTag;
     private List<MqClusterConfig> mqClusterConfigs;
     private List<DataflowConfig> dataflowConfigs;

diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/SortConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/SortConfig.java
@@ -24,6 +24,7 @@
 
 @Data
 public class SortConfig implements Serializable {
+
     private String sortClusterName;
     private List<SortTaskConfig> clusters;
 }
diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/SortTaskConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/SortTaskConfig.java
@@ -17,14 +17,16 @@
 
 package org.apache.inlong.common.pojo.sort;
 
-import lombok.Data;
 import org.apache.inlong.common.pojo.sort.dataflow.node.NodeConfig;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.List;
 
 @Data
 public class SortTaskConfig implements Serializable {
+
     private String sortTaskName;
     private List<SortClusterConfig> clusters;
     private NodeConfig nodeConfig;

diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/DataflowConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/DataflowConfig.java
@@ -17,14 +17,16 @@
 
 package org.apache.inlong.common.pojo.sort.dataflow;
 
-import lombok.Data;
 import org.apache.inlong.common.pojo.sort.dataflow.sink.SinkConfig;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Map;
 
 @Data
 public class DataflowConfig implements Serializable {
+
     private String dataflowId;
     private Integer version;
     private SourceConfig sourceConfig;

diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/SourceConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/SourceConfig.java
@@ -17,13 +17,15 @@
 
 package org.apache.inlong.common.pojo.sort.dataflow;
 
-import lombok.Data;
 import org.apache.inlong.common.pojo.sort.dataflow.deserialization.DeserializationConfig;
 
+import lombok.Data;
+
 import java.io.Serializable;
 
 @Data
 public class SourceConfig implements Serializable {
+
     private String topic;
     private String subscription;
     private DeserializationConfig deserializationConfig;

diff --git a/...org/apache/inlong/common/pojo/sort/dataflow/deserialization/CsvDeserializationConfig.java b/...org/apache/inlong/common/pojo/sort/dataflow/deserialization/CsvDeserializationConfig.java
@@ -21,6 +21,7 @@
 
 @Data
 public class CsvDeserializationConfig implements DeserializationConfig {
+
     private char delimiter;
     private Character escapeChar;
 }
diff --git a/...va/org/apache/inlong/common/pojo/sort/dataflow/deserialization/DeserializationConfig.java b/...va/org/apache/inlong/common/pojo/sort/dataflow/deserialization/DeserializationConfig.java
@@ -17,15 +17,14 @@
 
 package org.apache.inlong.common.pojo.sort.dataflow.deserialization;
 
+import org.apache.inlong.common.constant.DeserializationType;
+
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import org.apache.inlong.common.constant.DeserializationType;
 
 import java.io.Serializable;
 
-@JsonTypeInfo(
-        use = JsonTypeInfo.Id.NAME,
-        property = "type")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type")
 @JsonSubTypes({
         @JsonSubTypes.Type(value = InlongMsgDeserializationConfig.class, name = DeserializationType.INLONG_MSG),
         @JsonSubTypes.Type(value = InlongMsgPbDeserialiationConfig.class, name = DeserializationType.INLONG_MSG_PB),

diff --git a/...ache/inlong/common/pojo/sort/dataflow/deserialization/InlongMsgDeserializationConfig.java b/...ache/inlong/common/pojo/sort/dataflow/deserialization/InlongMsgDeserializationConfig.java
@@ -21,6 +21,7 @@
 
 @Data
 public class InlongMsgDeserializationConfig implements DeserializationConfig {
+
     private String streamId;
     private DeserializationConfig innerDeserializationConfig;
 }
diff --git a/...che/inlong/common/pojo/sort/dataflow/deserialization/InlongMsgPbDeserialiationConfig.java b/...che/inlong/common/pojo/sort/dataflow/deserialization/InlongMsgPbDeserialiationConfig.java
@@ -21,6 +21,7 @@
 
 @Data
 public class InlongMsgPbDeserialiationConfig implements DeserializationConfig {
+
     private final String compressionType;
     private DeserializationConfig innerDeserializationConfig;
 }
diff --git a/.../org/apache/inlong/common/pojo/sort/dataflow/deserialization/KvDeserializationConfig.java b/.../org/apache/inlong/common/pojo/sort/dataflow/deserialization/KvDeserializationConfig.java
@@ -21,6 +21,7 @@
 
 @Data
 public class KvDeserializationConfig implements DeserializationConfig {
+
     private char entrySplitter;
     private char kvSplitter;
     private String streamId;

diff --git a/...g-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/node/EsNodeConfig.java b/...g-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/node/EsNodeConfig.java
@@ -21,6 +21,7 @@
 
 @Data
 public class EsNodeConfig extends NodeConfig {
+
     private Integer bulkAction;
     private Integer bulkSizeMb;
     private Integer flushInterval;

diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/node/NodeConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/node/NodeConfig.java
@@ -17,23 +17,23 @@
 
 package org.apache.inlong.common.pojo.sort.dataflow.node;
 
+import org.apache.inlong.common.constant.DataNodeType;
+
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import lombok.Data;
-import org.apache.inlong.common.constant.DataNodeType;
 
 import java.io.Serializable;
 
 @Data
-@JsonTypeInfo(
-        use = JsonTypeInfo.Id.NAME,
-        property = "type")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type")
 @JsonSubTypes({
         @JsonSubTypes.Type(value = ClsNodeConfig.class, name = DataNodeType.CLS),
         @JsonSubTypes.Type(value = EsNodeConfig.class, name = DataNodeType.ELASTICSEARCH),
         @JsonSubTypes.Type(value = PulsarNodeConfig.class, name = DataNodeType.PULSAR),
 })
 public abstract class NodeConfig implements Serializable {
+
     private Integer version;
     private String nodeName;
 }
diff --git a/...mmon/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/node/PulsarNodeConfig.java b/...mmon/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/node/PulsarNodeConfig.java
@@ -21,6 +21,7 @@
 
 @Data
 public class PulsarNodeConfig extends NodeConfig {
+
     private String serviceUrl;
     private String adminUrl;
     private String token;

diff --git a/...g-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/sink/EsSinkConfig.java b/...g-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/sink/EsSinkConfig.java
@@ -21,6 +21,7 @@
 
 @Data
 public class EsSinkConfig extends SinkConfig {
+
     private String indexNamePattern;
     private Integer contentOffset;
     private Integer fieldOffset;

diff --git a/...mmon/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/sink/PulsarSinkConfig.java b/...mmon/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/sink/PulsarSinkConfig.java
@@ -23,6 +23,7 @@
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class PulsarSinkConfig extends SinkConfig {
+
     private String pulsarTenant;
     private String namespace;
     private String topic;

diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/sink/SinkConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/sink/SinkConfig.java
@@ -17,17 +17,16 @@
 
 package org.apache.inlong.common.pojo.sort.dataflow.sink;
 
+import org.apache.inlong.common.constant.SinkType;
+
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import lombok.Data;
-import org.apache.inlong.common.constant.SinkType;
 
 import java.io.Serializable;
 
 @Data
-@JsonTypeInfo(
-        use = JsonTypeInfo.Id.NAME,
-        property = "type")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type")
 @JsonSubTypes({
         @JsonSubTypes.Type(value = ClsSinkConfig.class, name = SinkType.CLS),
         @JsonSubTypes.Type(value = EsSinkConfig.class, name = SinkType.ELASTICSEARCH),

diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/mq/MqClusterConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/mq/MqClusterConfig.java
@@ -17,17 +17,16 @@
 
 package org.apache.inlong.common.pojo.sort.mq;
 
+import org.apache.inlong.common.constant.MQType;
+
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import lombok.Data;
-import org.apache.inlong.common.constant.MQType;
 
 import java.io.Serializable;
 
 @Data
-@JsonTypeInfo(
-        use = JsonTypeInfo.Id.NAME,
-        property = "type")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type")
 @JsonSubTypes({
         @JsonSubTypes.Type(value = PulsarClusterConfig.class, name = MQType.PULSAR),
         @JsonSubTypes.Type(value = TubeClusterConfig.class, name = MQType.TUBEMQ)

diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/mq/PulsarClusterConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/mq/PulsarClusterConfig.java
@@ -21,7 +21,6 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class PulsarClusterConfig extends MqClusterConfig {

diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/mq/TubeClusterConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/mq/TubeClusterConfig.java
@@ -23,5 +23,6 @@
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class TubeClusterConfig extends MqClusterConfig {
+
     private String masterAddress;
 }