X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-cass%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fdao%2Fcass%2FPermDAO.java;h=0033f8a1eebdbe54fdd1f827b35b5e464114e2e9;hb=refs%2Fchanges%2F28%2F90228%2F1;hp=6e1057b806dc83b7a956e26aaca0681952ae5a31;hpb=7e966914050e66219689001ff4ab601a49eef0ac;p=aaf%2Fauthz.git

diff --git a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/PermDAO.java b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/PermDAO.java
index 6e1057b8..0033f8a1 100644
--- a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/PermDAO.java
+++ b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/PermDAO.java
@@ -93,11 +93,31 @@ public class PermDAO extends CassDAOImpl<AuthzTrans,PermDAO.Data> {
         }
 
         public String fullType() {
-            return ns + '.' + type;
+        	StringBuilder sb = new StringBuilder();
+        	if(ns==null) {
+        		sb.append('.');
+        	} else {
+	        	sb.append(ns);
+	        	sb.append(ns.indexOf('@')<0?'.':':');
+        	}
+        	sb.append(type);
+        	return sb.toString();
         }
         
         public String fullPerm() {
-            return ns + '.' + type + '|' + instance + '|' + action;
+        	StringBuilder sb = new StringBuilder();
+        	if(ns==null) {
+        		sb.append("null.");
+        	} else {
+        		sb.append(ns);
+        		sb.append(ns.indexOf('@')<0?'.':':');
+        	}
+        	sb.append(type);
+        	sb.append('|');
+        	sb.append(instance);
+        	sb.append('|');
+        	sb.append(action);
+        	return sb.toString();
         }
 
         public String encode() {
@@ -193,17 +213,26 @@ public class PermDAO extends CassDAOImpl<AuthzTrans,PermDAO.Data> {
             Data rv = new PermDAO.Data();
             if (rdns.isOKhasData()) {
                 switch(s.length) {
+	                case 4:
+	                	rv.ns=s[0];
+	                    rv.type=s[1];
+	                    rv.instance=s[2];
+	                    rv.action=s[3];
+	                    break;
                     case 3:
+	                	rv.ns=s[0];
                         rv.type=s[1];
                         rv.instance=s[2];
                         rv.action=s[3];
                         break;
                     case 2:
+	                	rv.ns=s[0];
                         rv.type=s[1];
                         rv.instance=s[2];
                         rv.action=STAR;
                         break;
                     default:
+	                	rv.ns=s[0];
                         rv.type=s[1];
                         rv.instance = STAR;
                         rv.action = STAR;