format with spotless

apache · Apr 23, 2024 · d33916f · d33916f
1 parent aa39b03
commit d33916f
Show file tree

Hide file tree

Showing 18 changed files with 73 additions and 54 deletions.
diff --git a/...er-client-examples/src/test/java/org/apache/inlong/manager/client/File2PaimonExample.java b/...er-client-examples/src/test/java/org/apache/inlong/manager/client/File2PaimonExample.java
@@ -17,8 +17,6 @@
 
 package org.apache.inlong.manager.client;
 
-import com.google.common.collect.Lists;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.inlong.manager.client.api.ClientConfiguration;
 import org.apache.inlong.manager.client.api.InlongClient;
 import org.apache.inlong.manager.client.api.InlongGroup;
@@ -33,6 +31,9 @@
 import org.apache.inlong.manager.pojo.sink.paimon.PaimonSink;
 import org.apache.inlong.manager.pojo.source.file.FileSource;
 import org.apache.inlong.manager.pojo.stream.StreamField;
+
+import com.google.common.collect.Lists;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.util.Assert;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;

diff --git a/...ager-pojo/src/main/java/org/apache/inlong/manager/pojo/node/paimon/PaimonDataNodeDTO.java b/...ager-pojo/src/main/java/org/apache/inlong/manager/pojo/node/paimon/PaimonDataNodeDTO.java
@@ -17,17 +17,18 @@
 
 package org.apache.inlong.manager.pojo.node.paimon;
 
+import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
+import org.apache.inlong.manager.common.exceptions.BusinessException;
+import org.apache.inlong.manager.common.util.CommonBeanUtils;
+import org.apache.inlong.manager.common.util.JsonUtils;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
-import org.apache.inlong.manager.common.exceptions.BusinessException;
-import org.apache.inlong.manager.common.util.CommonBeanUtils;
-import org.apache.inlong.manager.common.util.JsonUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...ger-pojo/src/main/java/org/apache/inlong/manager/pojo/node/paimon/PaimonDataNodeInfo.java b/...ger-pojo/src/main/java/org/apache/inlong/manager/pojo/node/paimon/PaimonDataNodeInfo.java
@@ -17,15 +17,16 @@
 
 package org.apache.inlong.manager.pojo.node.paimon;
 
+import org.apache.inlong.manager.common.consts.DataNodeType;
+import org.apache.inlong.manager.common.util.CommonBeanUtils;
+import org.apache.inlong.manager.common.util.JsonTypeDefine;
+import org.apache.inlong.manager.pojo.node.DataNodeInfo;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
-import org.apache.inlong.manager.common.consts.DataNodeType;
-import org.apache.inlong.manager.common.util.CommonBeanUtils;
-import org.apache.inlong.manager.common.util.JsonTypeDefine;
-import org.apache.inlong.manager.pojo.node.DataNodeInfo;
 
 /**
  * Paimon data node info

diff --git a/...-pojo/src/main/java/org/apache/inlong/manager/pojo/node/paimon/PaimonDataNodeRequest.java b/...-pojo/src/main/java/org/apache/inlong/manager/pojo/node/paimon/PaimonDataNodeRequest.java
@@ -17,14 +17,15 @@
 
 package org.apache.inlong.manager.pojo.node.paimon;
 
+import org.apache.inlong.manager.common.consts.DataNodeType;
+import org.apache.inlong.manager.common.util.JsonTypeDefine;
+import org.apache.inlong.manager.pojo.node.DataNodeRequest;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
-import org.apache.inlong.manager.common.consts.DataNodeType;
-import org.apache.inlong.manager.common.util.JsonTypeDefine;
-import org.apache.inlong.manager.pojo.node.DataNodeRequest;
 
 /**
  * Paimon data node request

diff --git a/...nager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/paimon/PaimonColumnInfo.java b/...nager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/paimon/PaimonColumnInfo.java
@@ -17,15 +17,16 @@
 
 package org.apache.inlong.manager.pojo.sink.paimon;
 
+import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
+import org.apache.inlong.manager.common.exceptions.BusinessException;
+import org.apache.inlong.manager.common.util.JsonUtils;
+
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
-import org.apache.inlong.manager.common.exceptions.BusinessException;
-import org.apache.inlong.manager.common.util.JsonUtils;
 
 /**
  * Paimon column info

diff --git a/...ger/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/paimon/PaimonSink.java b/...ger/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/paimon/PaimonSink.java
@@ -17,16 +17,16 @@
 
 package org.apache.inlong.manager.pojo.sink.paimon;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.*;
-import lombok.experimental.SuperBuilder;
 import org.apache.inlong.manager.common.consts.SinkType;
 import org.apache.inlong.manager.common.util.CommonBeanUtils;
 import org.apache.inlong.manager.common.util.JsonTypeDefine;
 import org.apache.inlong.manager.pojo.sink.SinkRequest;
 import org.apache.inlong.manager.pojo.sink.StreamSink;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.experimental.SuperBuilder;
+
 import java.util.HashMap;
 import java.util.List;
 

diff --git a/.../manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/paimon/PaimonSinkDTO.java b/.../manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/paimon/PaimonSinkDTO.java
@@ -17,18 +17,20 @@
 
 package org.apache.inlong.manager.pojo.sink.paimon;
 
+import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
+import org.apache.inlong.manager.common.exceptions.BusinessException;
+import org.apache.inlong.manager.common.util.CommonBeanUtils;
+import org.apache.inlong.manager.common.util.JsonUtils;
+
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
-import org.apache.inlong.manager.common.exceptions.BusinessException;
-import org.apache.inlong.manager.common.util.CommonBeanUtils;
-import org.apache.inlong.manager.common.util.JsonUtils;
 
 import javax.validation.constraints.NotNull;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -83,7 +85,8 @@ public class PaimonSinkDTO {
      * Get the dto instance from the request
      */
     public static PaimonSinkDTO getFromRequest(PaimonSinkRequest request, String extParams) {
-        PaimonSinkDTO dto = StringUtils.isNotBlank(extParams) ? PaimonSinkDTO.getFromJson(extParams) : new PaimonSinkDTO();
+        PaimonSinkDTO dto =
+                StringUtils.isNotBlank(extParams) ? PaimonSinkDTO.getFromJson(extParams) : new PaimonSinkDTO();
         return CommonBeanUtils.copyProperties(request, dto, true);
     }
 

diff --git a/...ager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/paimon/PaimonSinkRequest.java b/...ager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/paimon/PaimonSinkRequest.java
@@ -17,16 +17,18 @@
 
 package org.apache.inlong.manager.pojo.sink.paimon;
 
+import org.apache.inlong.manager.common.consts.SinkType;
+import org.apache.inlong.manager.common.util.JsonTypeDefine;
+import org.apache.inlong.manager.pojo.sink.SinkRequest;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
-import org.apache.inlong.manager.common.consts.SinkType;
-import org.apache.inlong.manager.common.util.JsonTypeDefine;
-import org.apache.inlong.manager.pojo.sink.SinkRequest;
 
 import javax.validation.constraints.Pattern;
+
 import java.util.HashMap;
 import java.util.List;
 

diff --git a/...jo/src/main/java/org/apache/inlong/manager/pojo/sort/node/ExtractNodeProviderFactory.java b/...jo/src/main/java/org/apache/inlong/manager/pojo/sort/node/ExtractNodeProviderFactory.java
@@ -21,12 +21,12 @@
 import org.apache.inlong.manager.common.exceptions.BusinessException;
 import org.apache.inlong.manager.pojo.sort.node.base.ExtractNodeProvider;
 import org.apache.inlong.manager.pojo.sort.node.provider.HudiProvider;
-import org.apache.inlong.manager.pojo.sort.node.provider.PaimonProvider;
 import org.apache.inlong.manager.pojo.sort.node.provider.IcebergProvider;
 import org.apache.inlong.manager.pojo.sort.node.provider.KafkaProvider;
 import org.apache.inlong.manager.pojo.sort.node.provider.MongoDBProvider;
 import org.apache.inlong.manager.pojo.sort.node.provider.MySQLBinlogProvider;
 import org.apache.inlong.manager.pojo.sort.node.provider.OracleProvider;
+import org.apache.inlong.manager.pojo.sort.node.provider.PaimonProvider;
 import org.apache.inlong.manager.pojo.sort.node.provider.PostgreSQLProvider;
 import org.apache.inlong.manager.pojo.sort.node.provider.PulsarProvider;
 import org.apache.inlong.manager.pojo.sort.node.provider.RedisProvider;

diff --git a/...-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/LoadNodeProviderFactory.java b/...-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/LoadNodeProviderFactory.java
@@ -28,12 +28,12 @@
 import org.apache.inlong.manager.pojo.sort.node.provider.HDFSProvider;
 import org.apache.inlong.manager.pojo.sort.node.provider.HiveProvider;
 import org.apache.inlong.manager.pojo.sort.node.provider.HudiProvider;
-import org.apache.inlong.manager.pojo.sort.node.provider.PaimonProvider;
 import org.apache.inlong.manager.pojo.sort.node.provider.IcebergProvider;
 import org.apache.inlong.manager.pojo.sort.node.provider.KafkaProvider;
 import org.apache.inlong.manager.pojo.sort.node.provider.KuduProvider;
 import org.apache.inlong.manager.pojo.sort.node.provider.MySQLProvider;
 import org.apache.inlong.manager.pojo.sort.node.provider.OracleProvider;
+import org.apache.inlong.manager.pojo.sort.node.provider.PaimonProvider;
 import org.apache.inlong.manager.pojo.sort.node.provider.PostgreSQLProvider;
 import org.apache.inlong.manager.pojo.sort.node.provider.RedisProvider;
 import org.apache.inlong.manager.pojo.sort.node.provider.SQLServerProvider;

diff --git a/...manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/paimon/PaimonSource.java b/...manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/paimon/PaimonSource.java
@@ -17,18 +17,19 @@
 
 package org.apache.inlong.manager.pojo.source.paimon;
 
+import org.apache.inlong.manager.common.consts.SourceType;
+import org.apache.inlong.manager.common.util.CommonBeanUtils;
+import org.apache.inlong.manager.common.util.JsonTypeDefine;
+import org.apache.inlong.manager.pojo.source.SourceRequest;
+import org.apache.inlong.manager.pojo.source.StreamSource;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.SuperBuilder;
-import org.apache.inlong.manager.common.consts.SourceType;
-import org.apache.inlong.manager.common.util.CommonBeanUtils;
-import org.apache.inlong.manager.common.util.JsonTypeDefine;
-import org.apache.inlong.manager.pojo.source.SourceRequest;
-import org.apache.inlong.manager.pojo.source.StreamSource;
 
 import java.util.HashMap;
 import java.util.List;

diff --git a/...ager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/paimon/PaimonSourceDTO.java b/...ager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/paimon/PaimonSourceDTO.java
@@ -17,18 +17,20 @@
 
 package org.apache.inlong.manager.pojo.source.paimon;
 
+import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
+import org.apache.inlong.manager.common.exceptions.BusinessException;
+import org.apache.inlong.manager.common.util.CommonBeanUtils;
+import org.apache.inlong.manager.common.util.JsonUtils;
+
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
-import org.apache.inlong.manager.common.exceptions.BusinessException;
-import org.apache.inlong.manager.common.util.CommonBeanUtils;
-import org.apache.inlong.manager.common.util.JsonUtils;
 
 import javax.validation.constraints.NotNull;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

diff --git a/...-pojo/src/main/java/org/apache/inlong/manager/pojo/source/paimon/PaimonSourceRequest.java b/...-pojo/src/main/java/org/apache/inlong/manager/pojo/source/paimon/PaimonSourceRequest.java
@@ -17,14 +17,15 @@
 
 package org.apache.inlong.manager.pojo.source.paimon;
 
+import org.apache.inlong.manager.common.consts.SourceType;
+import org.apache.inlong.manager.common.util.JsonTypeDefine;
+import org.apache.inlong.manager.pojo.source.SourceRequest;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
-import org.apache.inlong.manager.common.consts.SourceType;
-import org.apache.inlong.manager.common.util.JsonTypeDefine;
-import org.apache.inlong.manager.pojo.source.SourceRequest;
 
 import java.util.HashMap;
 import java.util.List;

diff --git a/...e/src/main/java/org/apache/inlong/manager/service/node/paimon/PaimonDataNodeOperator.java b/...e/src/main/java/org/apache/inlong/manager/service/node/paimon/PaimonDataNodeOperator.java
@@ -17,8 +17,6 @@
 
 package org.apache.inlong.manager.service.node.paimon;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.inlong.manager.common.consts.DataNodeType;
 import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
 import org.apache.inlong.manager.common.exceptions.BusinessException;
@@ -32,6 +30,9 @@
 import org.apache.inlong.manager.pojo.node.paimon.PaimonDataNodeRequest;
 import org.apache.inlong.manager.service.node.AbstractDataNodeOperator;
 import org.apache.inlong.manager.service.resource.sink.paimon.PaimonCatalogClient;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/...main/java/org/apache/inlong/manager/service/resource/sink/paimon/PaimonCatalogClient.java b/...main/java/org/apache/inlong/manager/service/resource/sink/paimon/PaimonCatalogClient.java
@@ -17,19 +17,19 @@
 
 package org.apache.inlong.manager.service.resource.sink.paimon;
 
+import org.apache.inlong.manager.pojo.sink.paimon.PaimonColumnInfo;
+import org.apache.inlong.manager.pojo.sink.paimon.PaimonTableInfo;
+
 import com.google.common.collect.Maps;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.metastore.HiveMetaStoreClient;
 import org.apache.hadoop.hive.metastore.IMetaStoreClient;
 import org.apache.hadoop.hive.metastore.TableType;
-import org.apache.hadoop.hive.metastore.api.*;
 import org.apache.hadoop.hive.serde.serdeConstants;
 import org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe;
 import org.apache.hadoop.mapred.SequenceFileInputFormat;
 import org.apache.hadoop.security.UserGroupInformation;
-import org.apache.inlong.manager.pojo.sink.paimon.PaimonColumnInfo;
-import org.apache.inlong.manager.pojo.sink.paimon.PaimonTableInfo;
 import org.apache.thrift.TException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...n/java/org/apache/inlong/manager/service/resource/sink/paimon/PaimonResourceOperator.java b/...n/java/org/apache/inlong/manager/service/resource/sink/paimon/PaimonResourceOperator.java
@@ -17,8 +17,6 @@
 
 package org.apache.inlong.manager.service.resource.sink.paimon;
 
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.inlong.manager.common.consts.InlongConstants;
 import org.apache.inlong.manager.common.consts.SinkType;
 import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
@@ -36,6 +34,9 @@
 import org.apache.inlong.manager.service.node.DataNodeOperateHelper;
 import org.apache.inlong.manager.service.resource.sink.SinkResourceOperator;
 import org.apache.inlong.manager.service.sink.StreamSinkService;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -103,7 +104,8 @@ private PaimonSinkDTO getPaimonInfo(SinkInfo sinkInfo) {
             paimonInfo.setCatalogUri(dataNodeInfo.getUrl());
         }
 
-        paimonInfo.setDataPath(paimonInfo.getWarehouse() + "/" + paimonInfo.getDbName() + ".db/" + paimonInfo.getTableName());
+        paimonInfo.setDataPath(
+                paimonInfo.getWarehouse() + "/" + paimonInfo.getDbName() + ".db/" + paimonInfo.getTableName());
         return paimonInfo;
     }
 

diff --git a/...rvice/src/main/java/org/apache/inlong/manager/service/sink/paimon/PaimonSinkOperator.java b/...rvice/src/main/java/org/apache/inlong/manager/service/sink/paimon/PaimonSinkOperator.java
@@ -17,9 +17,6 @@
 
 package org.apache.inlong.manager.service.sink.paimon;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.inlong.manager.common.consts.InlongConstants;
 import org.apache.inlong.manager.common.consts.SinkType;
 import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
@@ -36,6 +33,10 @@
 import org.apache.inlong.manager.pojo.sink.paimon.PaimonSinkDTO;
 import org.apache.inlong.manager.pojo.sink.paimon.PaimonSinkRequest;
 import org.apache.inlong.manager.service.sink.AbstractSinkOperator;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/...e/src/main/java/org/apache/inlong/manager/service/source/paimon/PaimonSourceOperator.java b/...e/src/main/java/org/apache/inlong/manager/service/source/paimon/PaimonSourceOperator.java
@@ -17,7 +17,6 @@
 
 package org.apache.inlong.manager.service.source.paimon;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.inlong.manager.common.consts.SourceType;
 import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
 import org.apache.inlong.manager.common.exceptions.BusinessException;
@@ -30,6 +29,8 @@
 import org.apache.inlong.manager.pojo.source.paimon.PaimonSourceRequest;
 import org.apache.inlong.manager.pojo.stream.StreamField;
 import org.apache.inlong.manager.service.source.AbstractSourceOperator;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;