From: Kai <lukai@chinamobile.com>
Date: Mon, 12 Oct 2020 04:46:07 +0000 (+0800)
Subject: Fix issue: requestID issue on TCAgen2 CL output
X-Git-Tag: 1.2.1-tca-gen2^0
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=afa65f691d99aae98a18223ce1e670aba0f4cabd;p=dcaegen2%2Fanalytics%2Ftca-gen2.git

Fix issue: requestID issue on TCAgen2 CL output

Issue-ID: DCAEGEN2-2469
Signed-off-by: Kai Lu <lukai@chinamobile.com>
Change-Id: I259a97242352fbe32d0711565008efe9256d47d9
---

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()
 
                 );