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%2FCredDAO.java;h=d64cff290fbcfa88e00b55a1e02d9a219cacbb24;hb=1338680ef142f9a33ee32a00b07c7d2ae658cb3a;hp=01cc9237c01de38b790ddcb5f7f1c9b1b7bbc7fb;hpb=a50007dcded86acc2dcd610810f8afac720a058a;p=aaf%2Fauthz.git

diff --git a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/CredDAO.java b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/CredDAO.java
index 01cc9237..d64cff29 100644
--- a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/CredDAO.java
+++ b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/CredDAO.java
@@ -53,6 +53,8 @@ public class CredDAO extends CassDAOImpl<AuthzTrans,CredDAO.Data> {
     public static final String TABLE = "cred";
     public static final int CACHE_SEG = 0x40; // yields segment 0x0-0x3F
     public static final int RAW = -1;
+    public static final int NONE = 0;
+    public static final int FQI = 10;
     public static final int BASIC_AUTH = 1;
     public static final int BASIC_AUTH_SHA256 = 2;
     public static final int CERT_SHA256_RSA =200;
@@ -112,7 +114,7 @@ public class CredDAO extends CassDAOImpl<AuthzTrans,CredDAO.Data> {
         }
     }
 
-    private static class CredLoader extends Loader<Data> implements Streamer<Data>{
+    public static class CredLoader extends Loader<Data> implements Streamer<Data>{
         public static final int MAGIC=153323443;
         public static final int VERSION=2;
         public static final int BUFF_SIZE=48; // Note: 
@@ -225,8 +227,12 @@ public class CredDAO extends CassDAOImpl<AuthzTrans,CredDAO.Data> {
 	@Override
 	public Result<Data> create(AuthzTrans trans, Data data) {
 		if(data.tag == null) {
-			long l = srand.nextLong();
-			data.tag = Long.toHexString(l);
+			if(data.type==0) {
+				data.tag="PlaceHolder";
+			} else {
+				long l = srand.nextLong();
+				data.tag = Long.toHexString(l);
+			}
 		}
 		return super.create(trans, data);
 	}
@@ -259,6 +265,16 @@ public class CredDAO extends CassDAOImpl<AuthzTrans,CredDAO.Data> {
         hd.memo = memo
                 ? String.format("%s by %s", override[0], hd.user)
                 : (modified.name() + "d credential for " + data.id);
+        String spacer = ": ";
+        if(data.notes!=null) {
+        	hd.memo+=spacer + data.notes;
+        	spacer = ", ";
+        }
+
+        if(data.tag!=null) {
+        	hd.memo+=spacer + data.tag;
+        }
+
         // Detail?
            if (modified==CRUD.delete) {
                     try {