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 0ec6e671a6 [INLONG-10648][Manager] Fix the problem of the get sort
config interface returns an error status code (#10649)
0ec6e671a6 is described below
commit 0ec6e671a68401c9903200e99f90845d04f87cb4
Author: fuweng11 <[email protected]>
AuthorDate: Wed Jul 17 20:47:49 2024 +0800
[INLONG-10648][Manager] Fix the problem of the get sort config interface
returns an error status code (#10649)
---
.../org/apache/inlong/manager/service/core/impl/SortServiceImpl.java | 2 +-
.../org/apache/inlong/manager/service/datatype/CsvDataTypeOperator.java | 2 +-
.../org/apache/inlong/manager/service/datatype/KvDataTypeOperator.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/SortServiceImpl.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/SortServiceImpl.java
index d01911acb9..55f31508a4 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/SortServiceImpl.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/SortServiceImpl.java
@@ -216,7 +216,7 @@ public class SortServiceImpl implements SortService,
PluginBinder {
String errMsg = String.format("there is no valid sort config of
cluster %s", clusterName);
log.debug(errMsg);
return SortConfigResponse.builder()
- .code(RESPONSE_CODE_SUCCESS)
+ .code(RESPONSE_CODE_FAIL)
.msg(errMsg)
.build();
}
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 a7cfae7331..5c3978afc7 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
@@ -67,7 +67,7 @@ public class CsvDataTypeOperator implements DataTypeOperator {
separator = (char) Integer.parseInt(streamInfo.getDataSeparator());
}
Character escape = null;
- if (streamInfo.getDataEscapeChar() != null) {
+ if (StringUtils.isNotBlank(streamInfo.getDataEscapeChar())) {
escape = streamInfo.getDataEscapeChar().charAt(0);
}
CsvConfig csvConfig = new CsvConfig();
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/datatype/KvDataTypeOperator.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/datatype/KvDataTypeOperator.java
index 79177f3d70..1eb73888cd 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/datatype/KvDataTypeOperator.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/datatype/KvDataTypeOperator.java
@@ -78,7 +78,7 @@ public class KvDataTypeOperator implements DataTypeOperator {
separator = (char) Integer.parseInt(streamInfo.getDataSeparator());
}
Character escape = null;
- if (streamInfo.getDataEscapeChar() != null) {
+ if (StringUtils.isNotBlank(streamInfo.getDataEscapeChar())) {
escape = streamInfo.getDataEscapeChar().charAt(0);
}
KvConfig kvConfig = new KvConfig();