[INLONG-4601][Manager] Change the fieldList in SinkRequest to sinkFieldList (apache#4604)

LvJiancheng · vernedeng · commit e65fa664acab · 2022-07-04T21:39:00.000+08:00
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/SinkRequest.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/SinkRequest.java
@@ -74,7 +74,7 @@ public class SinkRequest {
     private Integer enableCreateResource = 1;
 
     @ApiModelProperty("Sink field list")
-    private List<SinkField> fieldList;
+    private List<SinkField> sinkFieldList;
 
     @ApiModelProperty("Other properties if needed")
     private Map<String, Object> properties = Maps.newHashMap();
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/StreamSinkServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/StreamSinkServiceImpl.java
@@ -101,7 +101,7 @@ public Integer save(SinkRequest request, String operator) {
 
         // According to the sink type, save sink information
         StreamSinkOperation operation = operationFactory.getInstance(SinkType.forType(sinkType));
-        List<SinkField> fields = request.getFieldList();
+        List<SinkField> fields = request.getSinkFieldList();
         // Remove id in sinkField when save
         if (CollectionUtils.isNotEmpty(fields)) {
             fields.stream().forEach(sinkField -> sinkField.setId(null));
@@ -208,7 +208,7 @@ public Boolean update(SinkRequest request, String operator) {
                 throw new BusinessException(String.format(err, sinkName, groupId, streamId));
             }
         }
-        List<SinkField> fields = request.getFieldList();
+        List<SinkField> fields = request.getSinkFieldList();
         // Remove id in sinkField when save
         if (CollectionUtils.isNotEmpty(fields)) {
             fields.stream().forEach(sinkField -> sinkField.setId(null));
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/ck/ClickHouseSinkOperation.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/ck/ClickHouseSinkOperation.java
@@ -107,7 +107,7 @@ public Integer saveOpt(SinkRequest request, String operator) {
 
     @Override
     public void saveFieldOpt(SinkRequest request) {
-        List<SinkField> fieldList = request.getFieldList();
+        List<SinkField> fieldList = request.getSinkFieldList();
         LOGGER.info("begin to save field={}", fieldList);
         if (CollectionUtils.isEmpty(fieldList)) {
             return;
@@ -210,7 +210,7 @@ public void updateOpt(SinkRequest request, String operator) {
     @Override
     public void updateFieldOpt(Boolean onlyAdd, SinkRequest request) {
         Integer sinkId = request.getId();
-        List<SinkField> fieldRequestList = request.getFieldList();
+        List<SinkField> fieldRequestList = request.getSinkFieldList();
         if (CollectionUtils.isEmpty(fieldRequestList)) {
             return;
         }
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/es/ElasticsearchSinkOperation.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/es/ElasticsearchSinkOperation.java
@@ -107,7 +107,7 @@ public Integer saveOpt(SinkRequest request, String operator) {
 
     @Override
     public void saveFieldOpt(SinkRequest request) {
-        List<SinkField> fieldList = request.getFieldList();
+        List<SinkField> fieldList = request.getSinkFieldList();
         LOGGER.info("begin to save field={}", fieldList);
         if (CollectionUtils.isEmpty(fieldList)) {
             return;
@@ -210,7 +210,7 @@ public void updateOpt(SinkRequest request, String operator) {
     @Override
     public void updateFieldOpt(Boolean onlyAdd, SinkRequest request) {
         Integer sinkId = request.getId();
-        List<SinkField> fieldRequestList = request.getFieldList();
+        List<SinkField> fieldRequestList = request.getSinkFieldList();
         if (CollectionUtils.isEmpty(fieldRequestList)) {
             return;
         }
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/greenplum/GreenplumSinkOperation.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/greenplum/GreenplumSinkOperation.java
@@ -105,7 +105,7 @@ public Integer saveOpt(SinkRequest request, String operator) {
 
     @Override
     public void saveFieldOpt(SinkRequest request) {
-        List<SinkField> fieldList = request.getFieldList();
+        List<SinkField> fieldList = request.getSinkFieldList();
         LOGGER.info("begin to save field={}", fieldList);
         if (CollectionUtils.isEmpty(fieldList)) {
             return;
@@ -204,7 +204,7 @@ public void updateOpt(SinkRequest request, String operator) {
     @Override
     public void updateFieldOpt(Boolean onlyAdd, SinkRequest request) {
         Integer sinkId = request.getId();
-        List<SinkField> fieldRequestList = request.getFieldList();
+        List<SinkField> fieldRequestList = request.getSinkFieldList();
         if (CollectionUtils.isEmpty(fieldRequestList)) {
             return;
         }
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/hbase/HBaseSinkOperation.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/hbase/HBaseSinkOperation.java
@@ -104,7 +104,7 @@ public Integer saveOpt(SinkRequest request, String operator) {
 
     @Override
     public void saveFieldOpt(SinkRequest request) {
-        List<SinkField> fieldList = request.getFieldList();
+        List<SinkField> fieldList = request.getSinkFieldList();
         LOGGER.info("begin to save hbase field={}", fieldList);
         if (CollectionUtils.isEmpty(fieldList)) {
             return;
@@ -206,7 +206,7 @@ public void updateOpt(SinkRequest request, String operator) {
     @Override
     public void updateFieldOpt(Boolean onlyAdd, SinkRequest request) {
         Integer sinkId = request.getId();
-        List<SinkField> fieldRequestList = request.getFieldList();
+        List<SinkField> fieldRequestList = request.getSinkFieldList();
         if (CollectionUtils.isEmpty(fieldRequestList)) {
             return;
         }
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/hdfs/HdfsSinkOperation.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/hdfs/HdfsSinkOperation.java
@@ -105,7 +105,7 @@ public Integer saveOpt(SinkRequest request, String operator) {
 
     @Override
     public void saveFieldOpt(SinkRequest request) {
-        List<SinkField> fieldList = request.getFieldList();
+        List<SinkField> fieldList = request.getSinkFieldList();
         LOGGER.info("begin to save hdfs field={}", fieldList);
         if (CollectionUtils.isEmpty(fieldList)) {
             return;
@@ -204,7 +204,7 @@ public void updateOpt(SinkRequest request, String operator) {
     @Override
     public void updateFieldOpt(Boolean onlyAdd, SinkRequest request) {
         Integer sinkId = request.getId();
-        List<SinkField> fieldRequestList = request.getFieldList();
+        List<SinkField> fieldRequestList = request.getSinkFieldList();
         if (CollectionUtils.isEmpty(fieldRequestList)) {
             return;
         }
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/hive/HiveSinkOperation.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/hive/HiveSinkOperation.java
@@ -80,7 +80,7 @@ public Integer saveOpt(SinkRequest request, String operator) {
         Preconditions.checkTrue(SinkType.SINK_HIVE.equals(sinkType),
                 ErrorCodeEnum.SINK_TYPE_NOT_SUPPORT.getMessage() + ": " + sinkType);
         HiveSinkRequest hiveRequest = (HiveSinkRequest) request;
-        LoadNodeUtils.checkPartitionField(hiveRequest.getFieldList(), hiveRequest.getPartitionFieldList());
+        LoadNodeUtils.checkPartitionField(hiveRequest.getSinkFieldList(), hiveRequest.getPartitionFieldList());
         StreamSinkEntity entity = CommonBeanUtils.copyProperties(hiveRequest, StreamSinkEntity::new);
         entity.setStatus(SinkStatus.NEW.getCode());
         entity.setIsDeleted(GlobalConstants.UN_DELETED);
@@ -107,7 +107,7 @@ public Integer saveOpt(SinkRequest request, String operator) {
 
     @Override
     public void saveFieldOpt(SinkRequest request) {
-        List<SinkField> fieldList = request.getFieldList();
+        List<SinkField> fieldList = request.getSinkFieldList();
         LOGGER.info("begin to save hive field={}", fieldList);
         if (CollectionUtils.isEmpty(fieldList)) {
             return;
@@ -187,7 +187,7 @@ public void updateOpt(SinkRequest request, String operator) {
         StreamSinkEntity entity = sinkMapper.selectByPrimaryKey(request.getId());
         Preconditions.checkNotNull(entity, ErrorCodeEnum.SINK_INFO_NOT_FOUND.getMessage());
         HiveSinkRequest hiveRequest = (HiveSinkRequest) request;
-        LoadNodeUtils.checkPartitionField(hiveRequest.getFieldList(), hiveRequest.getPartitionFieldList());
+        LoadNodeUtils.checkPartitionField(hiveRequest.getSinkFieldList(), hiveRequest.getPartitionFieldList());
         CommonBeanUtils.copyProperties(hiveRequest, entity, true);
         try {
             HiveSinkDTO dto = HiveSinkDTO.getFromRequest(hiveRequest);
@@ -211,7 +211,7 @@ public void updateOpt(SinkRequest request, String operator) {
     @Override
     public void updateFieldOpt(Boolean onlyAdd, SinkRequest request) {
         Integer sinkId = request.getId();
-        List<SinkField> fieldRequestList = request.getFieldList();
+        List<SinkField> fieldRequestList = request.getSinkFieldList();
         if (CollectionUtils.isEmpty(fieldRequestList)) {
             return;
         }
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/iceberg/IcebergSinkOperation.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/iceberg/IcebergSinkOperation.java
@@ -106,7 +106,7 @@ public Integer saveOpt(SinkRequest request, String operator) {
 
     @Override
     public void saveFieldOpt(SinkRequest request) {
-        List<SinkField> fieldList = request.getFieldList();
+        List<SinkField> fieldList = request.getSinkFieldList();
         LOGGER.info("begin to save iceberg field={}", fieldList);
         if (CollectionUtils.isEmpty(fieldList)) {
             return;
@@ -230,7 +230,7 @@ public void updateOpt(SinkRequest request, String operator) {
     @Override
     public void updateFieldOpt(Boolean onlyAdd, SinkRequest request) {
         Integer sinkId = request.getId();
-        List<SinkField> fieldRequestList = request.getFieldList();
+        List<SinkField> fieldRequestList = request.getSinkFieldList();
         if (CollectionUtils.isEmpty(fieldRequestList)) {
             return;
         }
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/kafka/KafkaSinkOperation.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/kafka/KafkaSinkOperation.java
@@ -105,7 +105,7 @@ public Integer saveOpt(SinkRequest request, String operator) {
 
     @Override
     public void saveFieldOpt(SinkRequest request) {
-        List<SinkField> fieldList = request.getFieldList();
+        List<SinkField> fieldList = request.getSinkFieldList();
         LOGGER.info("begin to save field={}", fieldList);
         if (CollectionUtils.isEmpty(fieldList)) {
             return;
@@ -204,7 +204,7 @@ public void updateOpt(SinkRequest request, String operator) {
     @Override
     public void updateFieldOpt(Boolean onlyAdd, SinkRequest request) {
         Integer sinkId = request.getId();
-        List<SinkField> fieldRequestList = request.getFieldList();
+        List<SinkField> fieldRequestList = request.getSinkFieldList();
         if (CollectionUtils.isEmpty(fieldRequestList)) {
             return;
         }
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/mysql/MySQLSinkOperation.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/mysql/MySQLSinkOperation.java
@@ -105,7 +105,7 @@ public Integer saveOpt(SinkRequest request, String operator) {
 
     @Override
     public void saveFieldOpt(SinkRequest request) {
-        List<SinkField> fieldList = request.getFieldList();
+        List<SinkField> fieldList = request.getSinkFieldList();
         LOGGER.info("begin to save field={}", fieldList);
         if (CollectionUtils.isEmpty(fieldList)) {
             return;
@@ -204,7 +204,7 @@ public void updateOpt(SinkRequest request, String operator) {
     @Override
     public void updateFieldOpt(Boolean onlyAdd, SinkRequest request) {
         Integer sinkId = request.getId();
-        List<SinkField> fieldRequestList = request.getFieldList();
+        List<SinkField> fieldRequestList = request.getSinkFieldList();
         if (CollectionUtils.isEmpty(fieldRequestList)) {
             return;
         }
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/postgres/PostgresSinkOperation.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/postgres/PostgresSinkOperation.java
@@ -104,7 +104,7 @@ public Integer saveOpt(SinkRequest request, String operator) {
 
     @Override
     public void saveFieldOpt(SinkRequest request) {
-        List<SinkField> fieldList = request.getFieldList();
+        List<SinkField> fieldList = request.getSinkFieldList();
         LOGGER.info("begin to save field={}", fieldList);
         if (CollectionUtils.isEmpty(fieldList)) {
             return;
@@ -203,7 +203,7 @@ public void updateOpt(SinkRequest request, String operator) {
     @Override
     public void updateFieldOpt(Boolean onlyAdd, SinkRequest request) {
         Integer sinkId = request.getId();
-        List<SinkField> fieldRequestList = request.getFieldList();
+        List<SinkField> fieldRequestList = request.getSinkFieldList();
         if (CollectionUtils.isEmpty(fieldRequestList)) {
             return;
         }
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/sqlserver/SqlServerSinkOperation.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/sqlserver/SqlServerSinkOperation.java
@@ -105,7 +105,7 @@ public Integer saveOpt(SinkRequest request, String operator) {
 
     @Override
     public void saveFieldOpt(SinkRequest request) {
-        List<SinkField> fieldList = request.getFieldList();
+        List<SinkField> fieldList = request.getSinkFieldList();
         LOGGER.info("begin to save field={}", fieldList);
         if (CollectionUtils.isEmpty(fieldList)) {
             return;
@@ -204,7 +204,7 @@ public void updateOpt(SinkRequest request, String operator) {
     @Override
     public void updateFieldOpt(Boolean onlyAdd, SinkRequest request) {
         Integer sinkId = request.getId();
-        List<SinkField> fieldRequestList = request.getFieldList();
+        List<SinkField> fieldRequestList = request.getSinkFieldList();
         if (CollectionUtils.isEmpty(fieldRequestList)) {
             return;
         }
diff --git a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/core/sink/GreenplumStreamSinkServiceTest.java b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/core/sink/GreenplumStreamSinkServiceTest.java
@@ -75,7 +75,7 @@ public Integer saveSink(String sinkName) {
         sinkField.setId(fieldId);
         List<SinkField> sinkFieldList = new ArrayList<>();
         sinkFieldList.add(sinkField);
-        sinkInfo.setFieldList(sinkFieldList);
+        sinkInfo.setSinkFieldList(sinkFieldList);
         return sinkService.save(sinkInfo, globalOperator);
     }
 
diff --git a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/core/sink/HdfsStreamSinkServiceTest.java b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/core/sink/HdfsStreamSinkServiceTest.java
@@ -72,7 +72,7 @@ public Integer saveSink(String sinkName) {
         sinkField.setId(fieldId);
         List<SinkField> sinkFieldList = new ArrayList<>();
         sinkFieldList.add(sinkField);
-        hdfsSinkRequest.setFieldList(sinkFieldList);
+        hdfsSinkRequest.setSinkFieldList(sinkFieldList);
         return sinkService.save(hdfsSinkRequest, globalOperator);
     }
 
diff --git a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/core/sink/MysqlStreamSinkServiceTest.java b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/core/sink/MysqlStreamSinkServiceTest.java
@@ -75,7 +75,7 @@ public Integer saveSink(String sinkName) {
         sinkField.setId(fieldId);
         List<SinkField> sinkFieldList = new ArrayList<>();
         sinkFieldList.add(sinkField);
-        sinkInfo.setFieldList(sinkFieldList);
+        sinkInfo.setSinkFieldList(sinkFieldList);
         return sinkService.save(sinkInfo, globalOperator);
     }
 
diff --git a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/sort/DisableZkForSortTest.java b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/sort/DisableZkForSortTest.java
@@ -90,7 +90,7 @@ public HiveSinkRequest createHiveSink(InlongStreamInfo streamInfo) {
                     return fieldInfo;
                 })
                 .collect(Collectors.toList());
-        sinkRequest.setFieldList(sinkFields);
+        sinkRequest.setSinkFieldList(sinkFields);
         sinkRequest.setEnableCreateResource(0);
         sinkRequest.setUsername(OPERATOR);
         sinkRequest.setPassword("password");

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public Integer saveSink(String sinkName) {`
`75`	`75`	`sinkField.setId(fieldId);`
`76`	`76`	`List<SinkField> sinkFieldList = new ArrayList<>();`
`77`	`77`	`sinkFieldList.add(sinkField);`
`78`		`- sinkInfo.setFieldList(sinkFieldList);`
	`78`	`+ sinkInfo.setSinkFieldList(sinkFieldList);`
`79`	`79`	`return sinkService.save(sinkInfo, globalOperator);`
`80`	`80`	`}`
`81`	`81`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public Integer saveSink(String sinkName) {`
`72`	`72`	`sinkField.setId(fieldId);`
`73`	`73`	`List<SinkField> sinkFieldList = new ArrayList<>();`
`74`	`74`	`sinkFieldList.add(sinkField);`
`75`		`- hdfsSinkRequest.setFieldList(sinkFieldList);`
	`75`	`+ hdfsSinkRequest.setSinkFieldList(sinkFieldList);`
`76`	`76`	`return sinkService.save(hdfsSinkRequest, globalOperator);`
`77`	`77`	`}`
`78`	`78`