diff options
| author |   Vijay Venkatesh Kumar <vv770d@att.com> | 2019-02-12 03:33:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-02-12 03:33:01 +0000 |
| commit | d9a495306410ea3dc4b9fbfc8e1e99fd32dd77f6 (patch) | |
| tree | bcb2b5e47a753a704c3ab7d0800293fe13487431 | |
| parent | 70cf309e54b2b24b83b5bc08e424f4614648b575 (diff) | |
| parent | 9e245bc37e059df859ada260425d744e9a1e8cf5 (diff) | |
Merge "Change ATT Meta Header for generic alternative"
2 files changed, 4 insertions, 4 deletions
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 a4b37c58..b3c8c3ef 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 @@ -57,7 +57,7 @@ import reactor.core.publisher.Flux; */ public class DmaapProducerReactiveHttpClient { - private static final String X_ATT_DR_META = "X-ATT-DR-META"; + private static final String X_DMAAP_DR_META = "X-DMAAP-DR-META"; private static final String NAME_JSON_TAG = "name"; private static final String INTERNAL_LOCATION_JSON_TAG = "internalLocation"; private static final String URI_SEPARATOR = "/"; @@ -145,7 +145,7 @@ public class DmaapProducerReactiveHttpClient { JsonElement metaData = new JsonParser().parse(new CommonFunctions().createJsonBody(model)); String name = metaData.getAsJsonObject().remove(NAME_JSON_TAG).getAsString(); metaData.getAsJsonObject().remove(INTERNAL_LOCATION_JSON_TAG); - put.addHeader(X_ATT_DR_META, metaData.toString()); + put.addHeader(X_DMAAP_DR_META, metaData.toString()); put.setURI(getUri(name)); } diff --git a/datafile-dmaap-client/src/test/java/org/onap/dcaegen2/collectors/datafile/service/producer/DmaapProducerReactiveHttpClientTest.java b/datafile-dmaap-client/src/test/java/org/onap/dcaegen2/collectors/datafile/service/producer/DmaapProducerReactiveHttpClientTest.java index 3fbd57cc..beac4ee8 100644 --- a/datafile-dmaap-client/src/test/java/org/onap/dcaegen2/collectors/datafile/service/producer/DmaapProducerReactiveHttpClientTest.java +++ b/datafile-dmaap-client/src/test/java/org/onap/dcaegen2/collectors/datafile/service/producer/DmaapProducerReactiveHttpClientTest.java @@ -62,7 +62,7 @@ class DmaapProducerReactiveHttpClientTest { private static final String FILE_NAME = "A20161224.1030-1045.bin.gz"; private static final String INTERNAL_LOCATION_JSON_TAG = "internalLocation"; private static final String NAME_JSON_TAG = "name"; - private static final String X_ATT_DR_META = "X-ATT-DR-META"; + private static final String X_DMAAP_DR_META = "X-DMAAP-DR-META"; private static final String HOST = "54.45.33.2"; private static final String HTTPS_SCHEME = "https"; @@ -131,7 +131,7 @@ class DmaapProducerReactiveHttpClientTest { JsonElement metaData = new JsonParser().parse(new CommonFunctions().createJsonBody(consumerDmaapModel)); metaData.getAsJsonObject().remove(NAME_JSON_TAG).getAsString(); metaData.getAsJsonObject().remove(INTERNAL_LOCATION_JSON_TAG); - httpPut.addHeader(X_ATT_DR_META, metaData.toString()); + httpPut.addHeader(X_DMAAP_DR_META, metaData.toString()); httpPut.setURI(expectedUri); String plainCreds = "dradmin" + ":" + "dradmin"; |