aboutsummaryrefslogtreecommitdiffstats
path: root/datarouter-subscriber
diff options
context:
space:
mode:
authoregernug <gerard.nugent@est.tech>2019-02-04 14:27:11 +0000
committerConor Ward <conor.ward@est.tech>2019-02-06 11:44:36 +0000
commitee6fa61e2cd7df99891092709765235b6166a041 (patch)
treed239addfdac1e2b3d6fe2cb6dd6b1c3fd5b3da6e /datarouter-subscriber
parentf926474924870c9ed4d5c4c8ccba55a1942d8e37 (diff)
Replace ATT headers2.0.0
Change-Id: I27b9240e33381b91c40c21a04f7ec6bdb7c16ce0 Issue-ID: DMAAP-997 Signed-off-by: egernug <gerard.nugent@est.tech>
Diffstat (limited to 'datarouter-subscriber')
-rwxr-xr-xdatarouter-subscriber/pom.xml2
-rw-r--r--datarouter-subscriber/src/main/java/org/onap/dmaap/datarouter/subscriber/SampleSubscriberServlet.java4
-rwxr-xr-xdatarouter-subscriber/src/test/java/org/onap/dmaap/datarouter/subscriber/SampleSubscriberServletTest.java4
3 files changed, 5 insertions, 5 deletions
diff --git a/datarouter-subscriber/pom.xml b/datarouter-subscriber/pom.xml
index b5c149c3..8300b170 100755
--- a/datarouter-subscriber/pom.xml
+++ b/datarouter-subscriber/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.dmaap.datarouter</groupId>
<artifactId>parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>datarouter-subscriber</artifactId>
diff --git a/datarouter-subscriber/src/main/java/org/onap/dmaap/datarouter/subscriber/SampleSubscriberServlet.java b/datarouter-subscriber/src/main/java/org/onap/dmaap/datarouter/subscriber/SampleSubscriberServlet.java
index 28051285..315207eb 100644
--- a/datarouter-subscriber/src/main/java/org/onap/dmaap/datarouter/subscriber/SampleSubscriberServlet.java
+++ b/datarouter-subscriber/src/main/java/org/onap/dmaap/datarouter/subscriber/SampleSubscriberServlet.java
@@ -135,7 +135,7 @@ public class SampleSubscriberServlet extends HttpServlet {
if (queryString != null) {
fileid = fileid + "?" + queryString;
}
- String publishid = req.getHeader("X-ATT-DR-PUBLISH-ID");
+ String publishid = req.getHeader("X-DMAAP-DR-PUBLISH-ID");
String filename =
URLEncoder.encode(fileid, "UTF-8").replaceAll("^\\.", "%2E").replaceAll("\\*", "%2A");
String fullPath = outputDirectory + "/" + filename;
@@ -168,7 +168,7 @@ public class SampleSubscriberServlet extends HttpServlet {
}
Files.move(Paths.get(tmpPath), Paths.get(fullPath), StandardCopyOption.REPLACE_EXISTING);
try (PrintWriter writer = new PrintWriter(new FileOutputStream(tmpMetaDataPath))) {
- String metaData = req.getHeader("X-ATT-DR-META");
+ String metaData = req.getHeader("X-DMAAP-DR-META");
writer.print(metaData);
}
Files.move(Paths.get(tmpMetaDataPath), Paths.get(fullMetaDataPath), StandardCopyOption.REPLACE_EXISTING);
diff --git a/datarouter-subscriber/src/test/java/org/onap/dmaap/datarouter/subscriber/SampleSubscriberServletTest.java b/datarouter-subscriber/src/test/java/org/onap/dmaap/datarouter/subscriber/SampleSubscriberServletTest.java
index f3700e9f..109c63a9 100755
--- a/datarouter-subscriber/src/test/java/org/onap/dmaap/datarouter/subscriber/SampleSubscriberServletTest.java
+++ b/datarouter-subscriber/src/test/java/org/onap/dmaap/datarouter/subscriber/SampleSubscriberServletTest.java
@@ -99,8 +99,8 @@ public class SampleSubscriberServletTest {
private void setUpSuccessfulFlow() throws IOException {
when(request.getHeader("Authorization")).thenReturn("Basic TE9HSU46UEFTU1dPUkQ=");
when(request.getPathInfo()).thenReturn("/publish/1/testfile");
- when(request.getHeader("X-ATT-DR-PUBLISH-ID")).thenReturn("1");
- when(request.getHeader("X-ATT-DR-META")).thenReturn("{\"Key\":\"Value\"}");
+ when(request.getHeader("X-DMAAP-DR-PUBLISH-ID")).thenReturn("1");
+ when(request.getHeader("X-DMAAP-DR-META")).thenReturn("{\"Key\":\"Value\"}");
when(request.getQueryString()).thenReturn(null);
ServletInputStream inStream = mock(ServletInputStream.class);
when(request.getInputStream()).thenReturn(inStream);