Change ATT Meta Header for generic alternative

Change-Id: Ie4ba3d8afebf7cda3dc0a841c5c5fa5d4cd95046
Issue-ID: DMAAP-999
Signed-off-by: egernug <gerard.nugent@est.tech>

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 a4b37c5..b3c8c3e 100644 (file)
--- 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 3fbd57c..beac4ee 100644 (file)
--- 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";