Update for more Logging Info

[aaf/authz.git] / auth / auth-cass / src / main / java / org / onap / aaf / auth / dao / cass / PermDAO.java

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 6e1057b..3b77a57 100644 (file)
--- 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,26 @@ 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(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 +208,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;