This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 99d879207d [INLONG-9974][Manager] Data preview simplifies interface
field information (#9975)
99d879207d is described below
commit 99d879207df378c7e2a8f1d9ffdca5e0796b0626
Author: fuweng11 <76141879+fuwen...@users.noreply.github.com>
AuthorDate: Thu Apr 11 14:34:46 2024 +0800
[INLONG-9974][Manager] Data preview simplifies interface field information
(#9975)
---
.../org/apache/inlong/common/enums/DataTypeEnum.java | 2 +-
.../inlong/manager/pojo/consume/BriefMQMessage.java | 16 +++++++++++++---
.../manager/service/datatype/CsvDataTypeOperator.java | 16 +++++++---------
.../manager/service/datatype/DataTypeOperator.java | 7 ++++---
.../service/message/InlongMsgDeserializeOperator.java | 4 ++--
.../service/message/RawMsgDeserializeOperator.java | 6 +++---
6 files changed, 30 insertions(+), 21 deletions(-)
diff --git
a/inlong-common/src/main/java/org/apache/inlong/common/enums/DataTypeEnum.java
b/inlong-common/src/main/java/org/apache/inlong/common/enums/DataTypeEnum.java
index f327508660..385c5ed71d 100644
---
a/inlong-common/src/main/java/org/apache/inlong/common/enums/DataTypeEnum.java
+++
b/inlong-common/src/main/java/org/apache/inlong/common/enums/DataTypeEnum.java
@@ -52,7 +52,7 @@ public enum DataTypeEnum {
public static DataTypeEnum convert(String value) {
for (DataTypeEnum v : values()) {
- if (v.getType().equals(value)) {
+ if (v.getType().equals(value.toLowerCase(Locale.ROOT))) {
return v;
}
}
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/BriefMQMessage.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/BriefMQMessage.java
index 72dd4f6303..d471c23865 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/BriefMQMessage.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/consume/BriefMQMessage.java
@@ -17,8 +17,6 @@
package org.apache.inlong.manager.pojo.consume;
-import org.apache.inlong.manager.pojo.stream.StreamField;
-
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@@ -61,6 +59,18 @@ public class BriefMQMessage {
private String body;
@ApiModelProperty(value = "List of field info")
- private List<StreamField> fieldList;
+ private List<FieldInfo> fieldList;
+
+ @Data
+ @Builder
+ @NoArgsConstructor
+ @AllArgsConstructor
+ public static class FieldInfo {
+
+ private String fieldName;
+
+ private String FieldValue;
+
+ }
}
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/datatype/CsvDataTypeOperator.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/datatype/CsvDataTypeOperator.java
index 5bb0b969f6..cb1cededdb 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/datatype/CsvDataTypeOperator.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/datatype/CsvDataTypeOperator.java
@@ -19,8 +19,8 @@ package org.apache.inlong.manager.service.datatype;
import org.apache.inlong.common.enums.DataTypeEnum;
import org.apache.inlong.manager.common.util.CommonBeanUtils;
+import org.apache.inlong.manager.pojo.consume.BriefMQMessage.FieldInfo;
import org.apache.inlong.manager.pojo.stream.InlongStreamInfo;
-import org.apache.inlong.manager.pojo.stream.StreamField;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -38,26 +38,24 @@ public class CsvDataTypeOperator implements
DataTypeOperator {
}
@Override
- public List<StreamField> parseFields(String str, InlongStreamInfo
streamInfo) throws Exception {
- List<StreamField> streamFields =
CommonBeanUtils.copyListProperties(streamInfo.getFieldList(),
- StreamField::new);
+ public List<FieldInfo> parseFields(String str, InlongStreamInfo
streamInfo) throws Exception {
+ List<FieldInfo> fields =
CommonBeanUtils.copyListProperties(streamInfo.getFieldList(), FieldInfo::new);
try {
char separator = '|';
if (StringUtils.isNotBlank(streamInfo.getDataSeparator())) {
separator = (char)
Integer.parseInt(streamInfo.getDataSeparator());
}
String[] bodys = StringUtils.split(str, separator);
- if (bodys.length != streamFields.size()) {
- return streamFields;
+ if (bodys.length != fields.size()) {
+ return fields;
}
for (int i = 0; i < bodys.length; i++) {
- streamFields.get(i).setFieldValue(bodys[i]);
+ fields.get(i).setFieldValue(bodys[i]);
}
- return streamFields;
} catch (Exception e) {
log.warn("parse fields failed for groupId = {}, streamId = {}",
streamInfo.getInlongGroupId(),
streamInfo.getInlongStreamId(), e);
}
- return streamFields;
+ return fields;
}
}
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/datatype/DataTypeOperator.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/datatype/DataTypeOperator.java
index f2e42b2171..bc9d681fa8 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/datatype/DataTypeOperator.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/datatype/DataTypeOperator.java
@@ -18,8 +18,9 @@
package org.apache.inlong.manager.service.datatype;
import org.apache.inlong.common.enums.DataTypeEnum;
+import org.apache.inlong.manager.common.util.CommonBeanUtils;
+import org.apache.inlong.manager.pojo.consume.BriefMQMessage.FieldInfo;
import org.apache.inlong.manager.pojo.stream.InlongStreamInfo;
-import org.apache.inlong.manager.pojo.stream.StreamField;
import java.util.List;
@@ -39,8 +40,8 @@ public interface DataTypeOperator {
* @param streamInfo inlong stream info
* @return list of field info
*/
- default List<StreamField> parseFields(String message, InlongStreamInfo
streamInfo) throws Exception {
- return streamInfo.getFieldList();
+ default List<FieldInfo> parseFields(String message, InlongStreamInfo
streamInfo) throws Exception {
+ return CommonBeanUtils.copyListProperties(streamInfo.getFieldList(),
FieldInfo::new);
}
}
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/message/InlongMsgDeserializeOperator.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/message/InlongMsgDeserializeOperator.java
index 16a268428d..f578ad32d4 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/message/InlongMsgDeserializeOperator.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/message/InlongMsgDeserializeOperator.java
@@ -24,8 +24,8 @@ import org.apache.inlong.common.msg.InLongMsg;
import org.apache.inlong.common.util.StringUtil;
import org.apache.inlong.manager.common.exceptions.BusinessException;
import org.apache.inlong.manager.pojo.consume.BriefMQMessage;
+import org.apache.inlong.manager.pojo.consume.BriefMQMessage.FieldInfo;
import org.apache.inlong.manager.pojo.stream.InlongStreamInfo;
-import org.apache.inlong.manager.pojo.stream.StreamField;
import org.apache.inlong.manager.service.datatype.DataTypeOperator;
import org.apache.inlong.manager.service.datatype.DataTypeOperatorFactory;
@@ -84,7 +84,7 @@ public class InlongMsgDeserializeOperator implements
DeserializeOperator {
String body = new String(bodyBytes,
Charset.forName(streamInfo.getDataEncoding()));
DataTypeOperator dataTypeOperator =
dataTypeOperatorFactory.getInstance(DataTypeEnum.forType(streamInfo.getDataType()));
- List<StreamField> streamFieldList =
dataTypeOperator.parseFields(body, streamInfo);
+ List<FieldInfo> streamFieldList =
dataTypeOperator.parseFields(body, streamInfo);
BriefMQMessage message = BriefMQMessage.builder()
.id(index)
.inlongGroupId(groupId)
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/message/RawMsgDeserializeOperator.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/message/RawMsgDeserializeOperator.java
index 6c6e2840e3..db025d2c2f 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/message/RawMsgDeserializeOperator.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/message/RawMsgDeserializeOperator.java
@@ -22,8 +22,8 @@ import org.apache.inlong.common.enums.MessageWrapType;
import org.apache.inlong.common.msg.AttributeConstants;
import org.apache.inlong.manager.common.exceptions.BusinessException;
import org.apache.inlong.manager.pojo.consume.BriefMQMessage;
+import org.apache.inlong.manager.pojo.consume.BriefMQMessage.FieldInfo;
import org.apache.inlong.manager.pojo.stream.InlongStreamInfo;
-import org.apache.inlong.manager.pojo.stream.StreamField;
import org.apache.inlong.manager.service.datatype.DataTypeOperator;
import org.apache.inlong.manager.service.datatype.DataTypeOperatorFactory;
@@ -58,7 +58,7 @@ public class RawMsgDeserializeOperator implements
DeserializeOperator {
try {
DataTypeOperator dataTypeOperator =
dataTypeOperatorFactory.getInstance(DataTypeEnum.forType(streamInfo.getDataType()));
- List<StreamField> streamFieldList =
dataTypeOperator.parseFields(body, streamInfo);
+ List<FieldInfo> fieldList = dataTypeOperator.parseFields(body,
streamInfo);
BriefMQMessage briefMQMessage = BriefMQMessage.builder()
.id(index)
.inlongGroupId(groupId)
@@ -67,7 +67,7 @@ public class RawMsgDeserializeOperator implements
DeserializeOperator {
.clientIp(headers.get(CLIENT_IP))
.headers(headers)
.body(body)
- .fieldList(streamFieldList)
+ .fieldList(fieldList)
.build();
return Collections.singletonList(briefMQMessage);
} catch (Exception e) {
