This is an automated email from the ASF dual-hosted git repository.
healchow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git
The following commit(s) were added to refs/heads/master by this push:
new cce4fe0 [INLONG-3176][Manager] Fix duplicate key exceptions (#3177)
cce4fe0 is described below
commit cce4fe0065512d5b45d549b3a37b327c362f460a
Author: kipshi <[email protected]>
AuthorDate: Wed Mar 16 22:53:56 2022 +0800
[INLONG-3176][Manager] Fix duplicate key exceptions (#3177)
---
.../inlong/manager/client/api/impl/InlongStreamImpl.java | 10 ++++++----
.../apache/inlong/manager/client/api/util/InlongParser.java | 12 ++++++------
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongStreamImpl.java
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongStreamImpl.java
index fdcc715..a102181 100644
---
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongStreamImpl.java
+++
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongStreamImpl.java
@@ -73,9 +73,10 @@ public class InlongStreamImpl extends InlongStream {
this.streamSinks = sinkList.stream()
.map(sinkResponse ->
InlongStreamSinkTransfer.parseStreamSink(sinkResponse, null))
.collect(Collectors.toMap(StreamSink::getSinkName,
streamSink -> streamSink,
- (sinkName1, sinkName2) -> {
+ (sink1, sink2) -> {
throw new RuntimeException(
- String.format("duplicate sinkName:%s
in stream:%s", sinkName1, this.name));
+ String.format("duplicate sinkName:%s
in stream:%s", sink1.getSinkName(),
+ this.name));
}));
}
List<SourceResponse> sourceList = fullStreamResponse.getSourceInfo();
@@ -83,9 +84,10 @@ public class InlongStreamImpl extends InlongStream {
this.streamSources = sourceList.stream()
.map(sourceResponse ->
InlongStreamSourceTransfer.parseStreamSource(sourceResponse))
.collect(Collectors.toMap(StreamSource::getSourceName,
streamSource -> streamSource,
- (sourceName1, sourceName2) -> {
+ (source1, source2) -> {
throw new RuntimeException(
- String.format("duplicate sourceName:%s
in stream:%s", sourceName1, this.name));
+ String.format("duplicate sourceName:%s
in stream:%s",
+ source1.getSourceName(),
this.name));
}
));
}
diff --git
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/util/InlongParser.java
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/util/InlongParser.java
index 09377b9..4a61ca7 100644
---
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/util/InlongParser.java
+++
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/util/InlongParser.java
@@ -113,8 +113,8 @@ public class InlongParser {
JsonObject pageInfoJson = GsonUtil.fromJson(GsonUtil.toJson(data),
JsonObject.class);
JsonArray fullStreamArray = pageInfoJson.getAsJsonArray("list");
List<FullStreamResponse> list = Lists.newArrayList();
- for (int i = 0; i < fullStreamArray.size(); i++) {
- JsonObject fullStreamJson = (JsonObject) fullStreamArray.get(i);
+ for (int streamIndex = 0; streamIndex < fullStreamArray.size();
streamIndex++) {
+ JsonObject fullStreamJson = (JsonObject)
fullStreamArray.get(streamIndex);
FullStreamResponse fullStreamResponse =
GsonUtil.fromJson(fullStreamJson.toString(),
FullStreamResponse.class);
list.add(fullStreamResponse);
@@ -122,8 +122,8 @@ public class InlongParser {
JsonArray sourceJsonArr =
fullStreamJson.getAsJsonArray(SOURCE_INFO);
List<SourceResponse> sourceResponses = Lists.newArrayList();
fullStreamResponse.setSourceInfo(sourceResponses);
- for (int j = 0; j < sourceJsonArr.size(); j++) {
- JsonObject sourceJson = (JsonObject) sourceJsonArr.get(i);
+ for (int sourceIndex = 0; sourceIndex < sourceJsonArr.size();
sourceIndex++) {
+ JsonObject sourceJson = (JsonObject)
sourceJsonArr.get(sourceIndex);
String type = sourceJson.get(SOURCE_TYPE).getAsString();
SourceType sourceType = SourceType.forType(type);
switch (sourceType) {
@@ -146,8 +146,8 @@ public class InlongParser {
JsonArray sinkJsonArr = fullStreamJson.getAsJsonArray(SINK_INFO);
List<SinkResponse> sinkResponses = Lists.newArrayList();
fullStreamResponse.setSinkInfo(sinkResponses);
- for (int j = 0; j < sinkJsonArr.size(); j++) {
- JsonObject sinkJson = (JsonObject) sinkJsonArr.get(i);
+ for (int sinkIndex = 0; sinkIndex < sinkJsonArr.size();
sinkIndex++) {
+ JsonObject sinkJson = (JsonObject) sinkJsonArr.get(sinkIndex);
String type = sinkJson.get(SINK_TYPE).getAsString();
SinkType sinkType = SinkType.forType(type);
switch (sinkType) {
