From: sunil unnava <sunil.unnava@att.com>
Date: Wed, 12 Sep 2018 20:08:08 +0000 (-0400)
Subject: update the topic name pattern
X-Git-Tag: 1.1.8~1
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fmessagerouter%2Fmsgrtr.git;a=commitdiff_plain;h=3feb5521d49d3ca29870c168064897f28b72b444

update the topic name pattern

Issue-ID: DMAAP-772
Change-Id: I485c54ce6375ea0ab1f069f130351c5a3ef05615
Signed-off-by: sunil unnava <sunil.unnava@att.com>
---

diff --git a/src/main/java/com/att/dmf/mr/security/DMaaPAAFAuthenticatorImpl.java b/src/main/java/com/att/dmf/mr/security/DMaaPAAFAuthenticatorImpl.java
index ed0893d..e4e24cd 100644
--- a/src/main/java/com/att/dmf/mr/security/DMaaPAAFAuthenticatorImpl.java
+++ b/src/main/java/com/att/dmf/mr/security/DMaaPAAFAuthenticatorImpl.java
@@ -56,7 +56,7 @@ public class DMaaPAAFAuthenticatorImpl implements DMaaPAAFAuthenticator {
 		
 		String permission = "";
 		String nameSpace ="";
-		if(topicName.contains(".") && topicName.contains("com.att")) {
+		if(topicName.contains(".") && topicName.contains("org.onap")) {
 			
 			nameSpace = topicName.substring(0,topicName.lastIndexOf("."));
 		}
@@ -64,13 +64,13 @@ public class DMaaPAAFAuthenticatorImpl implements DMaaPAAFAuthenticator {
 			nameSpace = null;
 			 nameSpace= com.att.ajsc.filemonitor.AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,"defaultNSforUEB");
 			
-			if(null==nameSpace)nameSpace="com.att.dmaap.mr.ueb";
+			if(null==nameSpace)nameSpace="org.onap.dmaap.mr";
 			
 			
 			
 		}
 		
-		permission = nameSpace+".mr.topic|:topic."+topicName+"|"+action;
+		permission = nameSpace+".topic|:topic."+topicName+"|"+action;
 		return permission;
 		
 	}