Skip to content

Commit d33916f

Browse files
committed
format with spotless
1 parent aa39b03 commit d33916f

File tree

18 files changed

+73
-54
lines changed

18 files changed

+73
-54
lines changed

inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/File2PaimonExample.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717

1818
package org.apache.inlong.manager.client;
1919

20-
import com.google.common.collect.Lists;
21-
import lombok.extern.slf4j.Slf4j;
2220
import org.apache.inlong.manager.client.api.ClientConfiguration;
2321
import org.apache.inlong.manager.client.api.InlongClient;
2422
import org.apache.inlong.manager.client.api.InlongGroup;
@@ -33,6 +31,9 @@
3331
import org.apache.inlong.manager.pojo.sink.paimon.PaimonSink;
3432
import org.apache.inlong.manager.pojo.source.file.FileSource;
3533
import org.apache.inlong.manager.pojo.stream.StreamField;
34+
35+
import com.google.common.collect.Lists;
36+
import lombok.extern.slf4j.Slf4j;
3637
import org.apache.shiro.util.Assert;
3738
import org.junit.jupiter.api.Disabled;
3839
import org.junit.jupiter.api.Test;

inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/node/paimon/PaimonDataNodeDTO.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,18 @@
1717

1818
package org.apache.inlong.manager.pojo.node.paimon;
1919

20+
import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
21+
import org.apache.inlong.manager.common.exceptions.BusinessException;
22+
import org.apache.inlong.manager.common.util.CommonBeanUtils;
23+
import org.apache.inlong.manager.common.util.JsonUtils;
24+
2025
import io.swagger.annotations.ApiModel;
2126
import io.swagger.annotations.ApiModelProperty;
2227
import lombok.AllArgsConstructor;
2328
import lombok.Builder;
2429
import lombok.Data;
2530
import lombok.NoArgsConstructor;
2631
import org.apache.commons.lang3.StringUtils;
27-
import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
28-
import org.apache.inlong.manager.common.exceptions.BusinessException;
29-
import org.apache.inlong.manager.common.util.CommonBeanUtils;
30-
import org.apache.inlong.manager.common.util.JsonUtils;
3132
import org.slf4j.Logger;
3233
import org.slf4j.LoggerFactory;
3334

inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/node/paimon/PaimonDataNodeInfo.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,16 @@
1717

1818
package org.apache.inlong.manager.pojo.node.paimon;
1919

20+
import org.apache.inlong.manager.common.consts.DataNodeType;
21+
import org.apache.inlong.manager.common.util.CommonBeanUtils;
22+
import org.apache.inlong.manager.common.util.JsonTypeDefine;
23+
import org.apache.inlong.manager.pojo.node.DataNodeInfo;
24+
2025
import io.swagger.annotations.ApiModel;
2126
import io.swagger.annotations.ApiModelProperty;
2227
import lombok.Data;
2328
import lombok.EqualsAndHashCode;
2429
import lombok.ToString;
25-
import org.apache.inlong.manager.common.consts.DataNodeType;
26-
import org.apache.inlong.manager.common.util.CommonBeanUtils;
27-
import org.apache.inlong.manager.common.util.JsonTypeDefine;
28-
import org.apache.inlong.manager.pojo.node.DataNodeInfo;
2930

3031
/**
3132
* Paimon data node info

inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/node/paimon/PaimonDataNodeRequest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,15 @@
1717

1818
package org.apache.inlong.manager.pojo.node.paimon;
1919

20+
import org.apache.inlong.manager.common.consts.DataNodeType;
21+
import org.apache.inlong.manager.common.util.JsonTypeDefine;
22+
import org.apache.inlong.manager.pojo.node.DataNodeRequest;
23+
2024
import io.swagger.annotations.ApiModel;
2125
import io.swagger.annotations.ApiModelProperty;
2226
import lombok.Data;
2327
import lombok.EqualsAndHashCode;
2428
import lombok.ToString;
25-
import org.apache.inlong.manager.common.consts.DataNodeType;
26-
import org.apache.inlong.manager.common.util.JsonTypeDefine;
27-
import org.apache.inlong.manager.pojo.node.DataNodeRequest;
2829

2930
/**
3031
* Paimon data node request

inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/paimon/PaimonColumnInfo.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,16 @@
1717

1818
package org.apache.inlong.manager.pojo.sink.paimon;
1919

20+
import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
21+
import org.apache.inlong.manager.common.exceptions.BusinessException;
22+
import org.apache.inlong.manager.common.util.JsonUtils;
23+
2024
import io.swagger.annotations.ApiModelProperty;
2125
import lombok.AllArgsConstructor;
2226
import lombok.Builder;
2327
import lombok.Data;
2428
import lombok.NoArgsConstructor;
2529
import org.apache.commons.lang3.StringUtils;
26-
import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
27-
import org.apache.inlong.manager.common.exceptions.BusinessException;
28-
import org.apache.inlong.manager.common.util.JsonUtils;
2930

3031
/**
3132
* Paimon column info

inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/paimon/PaimonSink.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717

1818
package org.apache.inlong.manager.pojo.sink.paimon;
1919

20-
import io.swagger.annotations.ApiModel;
21-
import io.swagger.annotations.ApiModelProperty;
22-
import lombok.*;
23-
import lombok.experimental.SuperBuilder;
2420
import org.apache.inlong.manager.common.consts.SinkType;
2521
import org.apache.inlong.manager.common.util.CommonBeanUtils;
2622
import org.apache.inlong.manager.common.util.JsonTypeDefine;
2723
import org.apache.inlong.manager.pojo.sink.SinkRequest;
2824
import org.apache.inlong.manager.pojo.sink.StreamSink;
2925

26+
import io.swagger.annotations.ApiModel;
27+
import io.swagger.annotations.ApiModelProperty;
28+
import lombok.experimental.SuperBuilder;
29+
3030
import java.util.HashMap;
3131
import java.util.List;
3232

inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/paimon/PaimonSinkDTO.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,20 @@
1717

1818
package org.apache.inlong.manager.pojo.sink.paimon;
1919

20+
import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
21+
import org.apache.inlong.manager.common.exceptions.BusinessException;
22+
import org.apache.inlong.manager.common.util.CommonBeanUtils;
23+
import org.apache.inlong.manager.common.util.JsonUtils;
24+
2025
import io.swagger.annotations.ApiModelProperty;
2126
import lombok.AllArgsConstructor;
2227
import lombok.Builder;
2328
import lombok.Data;
2429
import lombok.NoArgsConstructor;
2530
import org.apache.commons.lang3.StringUtils;
26-
import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
27-
import org.apache.inlong.manager.common.exceptions.BusinessException;
28-
import org.apache.inlong.manager.common.util.CommonBeanUtils;
29-
import org.apache.inlong.manager.common.util.JsonUtils;
3031

3132
import javax.validation.constraints.NotNull;
33+
3234
import java.util.HashMap;
3335
import java.util.List;
3436
import java.util.Map;
@@ -83,7 +85,8 @@ public class PaimonSinkDTO {
8385
* Get the dto instance from the request
8486
*/
8587
public static PaimonSinkDTO getFromRequest(PaimonSinkRequest request, String extParams) {
86-
PaimonSinkDTO dto = StringUtils.isNotBlank(extParams) ? PaimonSinkDTO.getFromJson(extParams) : new PaimonSinkDTO();
88+
PaimonSinkDTO dto =
89+
StringUtils.isNotBlank(extParams) ? PaimonSinkDTO.getFromJson(extParams) : new PaimonSinkDTO();
8790
return CommonBeanUtils.copyProperties(request, dto, true);
8891
}
8992

inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/paimon/PaimonSinkRequest.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,18 @@
1717

1818
package org.apache.inlong.manager.pojo.sink.paimon;
1919

20+
import org.apache.inlong.manager.common.consts.SinkType;
21+
import org.apache.inlong.manager.common.util.JsonTypeDefine;
22+
import org.apache.inlong.manager.pojo.sink.SinkRequest;
23+
2024
import io.swagger.annotations.ApiModel;
2125
import io.swagger.annotations.ApiModelProperty;
2226
import lombok.Data;
2327
import lombok.EqualsAndHashCode;
2428
import lombok.ToString;
25-
import org.apache.inlong.manager.common.consts.SinkType;
26-
import org.apache.inlong.manager.common.util.JsonTypeDefine;
27-
import org.apache.inlong.manager.pojo.sink.SinkRequest;
2829

2930
import javax.validation.constraints.Pattern;
31+
3032
import java.util.HashMap;
3133
import java.util.List;
3234

inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/ExtractNodeProviderFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
import org.apache.inlong.manager.common.exceptions.BusinessException;
2222
import org.apache.inlong.manager.pojo.sort.node.base.ExtractNodeProvider;
2323
import org.apache.inlong.manager.pojo.sort.node.provider.HudiProvider;
24-
import org.apache.inlong.manager.pojo.sort.node.provider.PaimonProvider;
2524
import org.apache.inlong.manager.pojo.sort.node.provider.IcebergProvider;
2625
import org.apache.inlong.manager.pojo.sort.node.provider.KafkaProvider;
2726
import org.apache.inlong.manager.pojo.sort.node.provider.MongoDBProvider;
2827
import org.apache.inlong.manager.pojo.sort.node.provider.MySQLBinlogProvider;
2928
import org.apache.inlong.manager.pojo.sort.node.provider.OracleProvider;
29+
import org.apache.inlong.manager.pojo.sort.node.provider.PaimonProvider;
3030
import org.apache.inlong.manager.pojo.sort.node.provider.PostgreSQLProvider;
3131
import org.apache.inlong.manager.pojo.sort.node.provider.PulsarProvider;
3232
import org.apache.inlong.manager.pojo.sort.node.provider.RedisProvider;

inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/LoadNodeProviderFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
import org.apache.inlong.manager.pojo.sort.node.provider.HDFSProvider;
2929
import org.apache.inlong.manager.pojo.sort.node.provider.HiveProvider;
3030
import org.apache.inlong.manager.pojo.sort.node.provider.HudiProvider;
31-
import org.apache.inlong.manager.pojo.sort.node.provider.PaimonProvider;
3231
import org.apache.inlong.manager.pojo.sort.node.provider.IcebergProvider;
3332
import org.apache.inlong.manager.pojo.sort.node.provider.KafkaProvider;
3433
import org.apache.inlong.manager.pojo.sort.node.provider.KuduProvider;
3534
import org.apache.inlong.manager.pojo.sort.node.provider.MySQLProvider;
3635
import org.apache.inlong.manager.pojo.sort.node.provider.OracleProvider;
36+
import org.apache.inlong.manager.pojo.sort.node.provider.PaimonProvider;
3737
import org.apache.inlong.manager.pojo.sort.node.provider.PostgreSQLProvider;
3838
import org.apache.inlong.manager.pojo.sort.node.provider.RedisProvider;
3939
import org.apache.inlong.manager.pojo.sort.node.provider.SQLServerProvider;

inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/paimon/PaimonSource.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,19 @@
1717

1818
package org.apache.inlong.manager.pojo.source.paimon;
1919

20+
import org.apache.inlong.manager.common.consts.SourceType;
21+
import org.apache.inlong.manager.common.util.CommonBeanUtils;
22+
import org.apache.inlong.manager.common.util.JsonTypeDefine;
23+
import org.apache.inlong.manager.pojo.source.SourceRequest;
24+
import org.apache.inlong.manager.pojo.source.StreamSource;
25+
2026
import io.swagger.annotations.ApiModel;
2127
import io.swagger.annotations.ApiModelProperty;
2228
import lombok.AllArgsConstructor;
2329
import lombok.Data;
2430
import lombok.EqualsAndHashCode;
2531
import lombok.ToString;
2632
import lombok.experimental.SuperBuilder;
27-
import org.apache.inlong.manager.common.consts.SourceType;
28-
import org.apache.inlong.manager.common.util.CommonBeanUtils;
29-
import org.apache.inlong.manager.common.util.JsonTypeDefine;
30-
import org.apache.inlong.manager.pojo.source.SourceRequest;
31-
import org.apache.inlong.manager.pojo.source.StreamSource;
3233

3334
import java.util.HashMap;
3435
import java.util.List;

inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/paimon/PaimonSourceDTO.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,20 @@
1717

1818
package org.apache.inlong.manager.pojo.source.paimon;
1919

20+
import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
21+
import org.apache.inlong.manager.common.exceptions.BusinessException;
22+
import org.apache.inlong.manager.common.util.CommonBeanUtils;
23+
import org.apache.inlong.manager.common.util.JsonUtils;
24+
2025
import io.swagger.annotations.ApiModelProperty;
2126
import lombok.AllArgsConstructor;
2227
import lombok.Builder;
2328
import lombok.Data;
2429
import lombok.NoArgsConstructor;
2530
import org.apache.commons.lang3.StringUtils;
26-
import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
27-
import org.apache.inlong.manager.common.exceptions.BusinessException;
28-
import org.apache.inlong.manager.common.util.CommonBeanUtils;
29-
import org.apache.inlong.manager.common.util.JsonUtils;
3031

3132
import javax.validation.constraints.NotNull;
33+
3234
import java.util.HashMap;
3335
import java.util.List;
3436
import java.util.Map;

inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/paimon/PaimonSourceRequest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,15 @@
1717

1818
package org.apache.inlong.manager.pojo.source.paimon;
1919

20+
import org.apache.inlong.manager.common.consts.SourceType;
21+
import org.apache.inlong.manager.common.util.JsonTypeDefine;
22+
import org.apache.inlong.manager.pojo.source.SourceRequest;
23+
2024
import io.swagger.annotations.ApiModel;
2125
import io.swagger.annotations.ApiModelProperty;
2226
import lombok.Data;
2327
import lombok.EqualsAndHashCode;
2428
import lombok.ToString;
25-
import org.apache.inlong.manager.common.consts.SourceType;
26-
import org.apache.inlong.manager.common.util.JsonTypeDefine;
27-
import org.apache.inlong.manager.pojo.source.SourceRequest;
2829

2930
import java.util.HashMap;
3031
import java.util.List;

inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/node/paimon/PaimonDataNodeOperator.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717

1818
package org.apache.inlong.manager.service.node.paimon;
1919

20-
import com.fasterxml.jackson.databind.ObjectMapper;
21-
import org.apache.commons.lang3.StringUtils;
2220
import org.apache.inlong.manager.common.consts.DataNodeType;
2321
import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
2422
import org.apache.inlong.manager.common.exceptions.BusinessException;
@@ -32,6 +30,9 @@
3230
import org.apache.inlong.manager.pojo.node.paimon.PaimonDataNodeRequest;
3331
import org.apache.inlong.manager.service.node.AbstractDataNodeOperator;
3432
import org.apache.inlong.manager.service.resource.sink.paimon.PaimonCatalogClient;
33+
34+
import com.fasterxml.jackson.databind.ObjectMapper;
35+
import org.apache.commons.lang3.StringUtils;
3536
import org.slf4j.Logger;
3637
import org.slf4j.LoggerFactory;
3738
import org.springframework.beans.factory.annotation.Autowired;

inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/sink/paimon/PaimonCatalogClient.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@
1717

1818
package org.apache.inlong.manager.service.resource.sink.paimon;
1919

20+
import org.apache.inlong.manager.pojo.sink.paimon.PaimonColumnInfo;
21+
import org.apache.inlong.manager.pojo.sink.paimon.PaimonTableInfo;
22+
2023
import com.google.common.collect.Maps;
2124
import org.apache.hadoop.fs.Path;
2225
import org.apache.hadoop.hive.conf.HiveConf;
2326
import org.apache.hadoop.hive.metastore.HiveMetaStoreClient;
2427
import org.apache.hadoop.hive.metastore.IMetaStoreClient;
2528
import org.apache.hadoop.hive.metastore.TableType;
26-
import org.apache.hadoop.hive.metastore.api.*;
2729
import org.apache.hadoop.hive.serde.serdeConstants;
2830
import org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe;
2931
import org.apache.hadoop.mapred.SequenceFileInputFormat;
3032
import org.apache.hadoop.security.UserGroupInformation;
31-
import org.apache.inlong.manager.pojo.sink.paimon.PaimonColumnInfo;
32-
import org.apache.inlong.manager.pojo.sink.paimon.PaimonTableInfo;
3333
import org.apache.thrift.TException;
3434
import org.slf4j.Logger;
3535
import org.slf4j.LoggerFactory;

inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/sink/paimon/PaimonResourceOperator.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717

1818
package org.apache.inlong.manager.service.resource.sink.paimon;
1919

20-
import org.apache.commons.collections.CollectionUtils;
21-
import org.apache.commons.lang3.StringUtils;
2220
import org.apache.inlong.manager.common.consts.InlongConstants;
2321
import org.apache.inlong.manager.common.consts.SinkType;
2422
import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
@@ -36,6 +34,9 @@
3634
import org.apache.inlong.manager.service.node.DataNodeOperateHelper;
3735
import org.apache.inlong.manager.service.resource.sink.SinkResourceOperator;
3836
import org.apache.inlong.manager.service.sink.StreamSinkService;
37+
38+
import org.apache.commons.collections.CollectionUtils;
39+
import org.apache.commons.lang3.StringUtils;
3940
import org.slf4j.Logger;
4041
import org.slf4j.LoggerFactory;
4142
import org.springframework.beans.factory.annotation.Autowired;
@@ -103,7 +104,8 @@ private PaimonSinkDTO getPaimonInfo(SinkInfo sinkInfo) {
103104
paimonInfo.setCatalogUri(dataNodeInfo.getUrl());
104105
}
105106

106-
paimonInfo.setDataPath(paimonInfo.getWarehouse() + "/" + paimonInfo.getDbName() + ".db/" + paimonInfo.getTableName());
107+
paimonInfo.setDataPath(
108+
paimonInfo.getWarehouse() + "/" + paimonInfo.getDbName() + ".db/" + paimonInfo.getTableName());
107109
return paimonInfo;
108110
}
109111

inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/paimon/PaimonSinkOperator.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717

1818
package org.apache.inlong.manager.service.sink.paimon;
1919

20-
import com.fasterxml.jackson.databind.ObjectMapper;
21-
import org.apache.commons.collections.CollectionUtils;
22-
import org.apache.commons.lang3.StringUtils;
2320
import org.apache.inlong.manager.common.consts.InlongConstants;
2421
import org.apache.inlong.manager.common.consts.SinkType;
2522
import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
@@ -36,6 +33,10 @@
3633
import org.apache.inlong.manager.pojo.sink.paimon.PaimonSinkDTO;
3734
import org.apache.inlong.manager.pojo.sink.paimon.PaimonSinkRequest;
3835
import org.apache.inlong.manager.service.sink.AbstractSinkOperator;
36+
37+
import com.fasterxml.jackson.databind.ObjectMapper;
38+
import org.apache.commons.collections.CollectionUtils;
39+
import org.apache.commons.lang3.StringUtils;
3940
import org.slf4j.Logger;
4041
import org.slf4j.LoggerFactory;
4142
import org.springframework.beans.factory.annotation.Autowired;

inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/paimon/PaimonSourceOperator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
package org.apache.inlong.manager.service.source.paimon;
1919

20-
import com.fasterxml.jackson.databind.ObjectMapper;
2120
import org.apache.inlong.manager.common.consts.SourceType;
2221
import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
2322
import org.apache.inlong.manager.common.exceptions.BusinessException;
@@ -30,6 +29,8 @@
3029
import org.apache.inlong.manager.pojo.source.paimon.PaimonSourceRequest;
3130
import org.apache.inlong.manager.pojo.stream.StreamField;
3231
import org.apache.inlong.manager.service.source.AbstractSourceOperator;
32+
33+
import com.fasterxml.jackson.databind.ObjectMapper;
3334
import org.springframework.beans.factory.annotation.Autowired;
3435
import org.springframework.stereotype.Service;
3536

0 commit comments

Comments
 (0)