From 69daf676c2eea017dbde3d7fdafb42dcbe730e75 Mon Sep 17 00:00:00 2001 From: Chengkai Yan Date: Mon, 5 Nov 2018 17:02:36 +0100 Subject: Update meta-data Add commonEventHeader to X-ATT-DR-META Format code with formatter:off/on Change-Id: I490620af127a03face48bf7b2ad3abf0bb80d4fa Signed-off-by: Chengkai Yan Issue-ID: DCAEGEN2-935 --- .../datafile/service/producer/DmaapProducerReactiveHttpClient.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'datafile-dmaap-client/src/main') diff --git a/datafile-dmaap-client/src/main/java/org/onap/dcaegen2/collectors/datafile/service/producer/DmaapProducerReactiveHttpClient.java b/datafile-dmaap-client/src/main/java/org/onap/dcaegen2/collectors/datafile/service/producer/DmaapProducerReactiveHttpClient.java index b4c52693..380eac88 100644 --- a/datafile-dmaap-client/src/main/java/org/onap/dcaegen2/collectors/datafile/service/producer/DmaapProducerReactiveHttpClient.java +++ b/datafile-dmaap-client/src/main/java/org/onap/dcaegen2/collectors/datafile/service/producer/DmaapProducerReactiveHttpClient.java @@ -55,7 +55,7 @@ public class DmaapProducerReactiveHttpClient { private static final String X_ATT_DR_META = "X-ATT-DR-META"; private static final String NAME_JSON_TAG = "name"; - private static final String LOCATION_JSON_TAG = "location"; + private static final String INTERNAL_LOCATION_JSON_TAG = "internalLocation"; private static final String URI_SEPARATOR = "/"; private static final String DEFAULT_FEED_ID = "1"; @@ -104,7 +104,7 @@ public class DmaapProducerReactiveHttpClient { addUserCredentialsToHead(headers); IFileSystemResource fileSystemResource = getFileSystemResource(); - fileSystemResource.setPath(consumerDmaapModel.getLocation()); + fileSystemResource.setPath(consumerDmaapModel.getInternalLocation()); InputStream fileInputStream = fileSystemResource.getInputStream(); HttpEntity request = addFileToRequest(fileInputStream, headers); @@ -132,7 +132,7 @@ public class DmaapProducerReactiveHttpClient { private void addMetaDataToHead(ConsumerDmaapModel consumerDmaapModel, HttpHeaders headers) { JsonElement metaData = new JsonParser().parse(CommonFunctions.createJsonBody(consumerDmaapModel)); metaData.getAsJsonObject().remove(NAME_JSON_TAG).getAsString(); - metaData.getAsJsonObject().remove(LOCATION_JSON_TAG); + metaData.getAsJsonObject().remove(INTERNAL_LOCATION_JSON_TAG); headers.set(X_ATT_DR_META, metaData.toString()); } private HttpEntity addFileToRequest(InputStream inputStream, HttpHeaders headers) -- cgit 1.2.3-korg