From c96f94f691a91265ba140bc49a54d533f7725d36 Mon Sep 17 00:00:00 2001 From: Kai Date: Mon, 12 Oct 2020 12:46:07 +0800 Subject: Fix issue: requestID issue on TCAgen2 CL output Issue-ID: DCAEGEN2-2469 Signed-off-by: Kai Lu Change-Id: I259a97242352fbe32d0711565008efe9256d47d9 (cherry picked from commit afa65f691d99aae98a18223ce1e670aba0f4cabd) --- .../java/org/onap/dcae/analytics/web/dmaap/MrMessageSplitter.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dcae-analytics/dcae-analytics-web/src/main/java/org/onap/dcae/analytics/web/dmaap/MrMessageSplitter.java b/dcae-analytics/dcae-analytics-web/src/main/java/org/onap/dcae/analytics/web/dmaap/MrMessageSplitter.java index 0396005..f8ab481 100644 --- a/dcae-analytics/dcae-analytics-web/src/main/java/org/onap/dcae/analytics/web/dmaap/MrMessageSplitter.java +++ b/dcae-analytics/dcae-analytics-web/src/main/java/org/onap/dcae/analytics/web/dmaap/MrMessageSplitter.java @@ -22,7 +22,6 @@ package org.onap.dcae.analytics.web.dmaap; import static org.apache.commons.text.StringEscapeUtils.unescapeJava; import static org.apache.commons.text.StringEscapeUtils.unescapeJson; import static org.onap.dcae.analytics.model.AnalyticsHttpConstants.REQUEST_ID_HEADER_KEY; -import static org.onap.dcae.analytics.model.AnalyticsModelConstants.ANALYTICS_REQUEST_ID_DELIMITER; import java.io.IOException; import java.util.Collections; @@ -95,8 +94,7 @@ public class MrMessageSplitter extends AbstractMessageSplitter { MessageBuilder .withPayload(messagePartitions.get(0)) .copyHeaders(message.getHeaders()) - .setHeader(REQUEST_ID_HEADER_KEY, - requestId + ANALYTICS_REQUEST_ID_DELIMITER + batchIndex) + .setHeader(REQUEST_ID_HEADER_KEY, requestId) .build() ); -- cgit 1.2.3-korg