X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-batch%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fbatch%2Fhelpers%2FFuture.java;h=4f87e330a2318ee5f33c68ba2a0273fc8939c81b;hb=889a9891f6df5bbb26a760cfb106be947e87aa5c;hp=13f81938dea4261d679d611ab2fe5a6f2cd9e2ba;hpb=a50007dcded86acc2dcd610810f8afac720a058a;p=aaf%2Fauthz.git

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Future.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Future.java
index 13f81938..4f87e330 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Future.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Future.java
@@ -23,6 +23,7 @@
 
 package org.onap.aaf.auth.batch.helpers;
 
+import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Date;
@@ -32,6 +33,7 @@ import java.util.TreeMap;
 import java.util.UUID;
 
 import org.onap.aaf.auth.dao.cass.FutureDAO;
+import org.onap.aaf.auth.dao.cass.UserRoleDAO;
 import org.onap.aaf.auth.env.AuthzTrans;
 import org.onap.aaf.auth.layer.Result;
 import org.onap.aaf.cadi.util.CSV;
@@ -90,7 +92,21 @@ public class Future implements CacheChange.Data, Comparable<Future> {
         fdd.start = start;
         fdd.expires = expires;
         fdd.construct = construct;
-        role = Approval.roleFromMemo(memo);
+        String role = null;
+        switch(target) {
+        	case "user_role":
+    			UserRoleDAO.Data urdd = new UserRoleDAO.Data();
+    			try {
+    				urdd.reconstitute(construct);
+    				fdd.target_key = urdd.user + '|' + urdd.role;
+    				fdd.target_date=urdd.expires;
+    				role=urdd.role;
+    			} catch (IOException e) {
+    				e.printStackTrace(System.err);
+    			}
+    			break;
+        }
+    	this.role = role;
     }
     
     public final UUID id() {