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%2FUserRole.java;h=96169434279e740b0686fa463f4b18bcae2c4b5e;hb=f64f482462b697e06a47ad55aa5447dc829ce727;hp=343a0e2ba918cafd7174a1e72daa2df0c4fc297a;hpb=da6154df2951bbdedea753f588d41153e3582ef5;p=aaf%2Fauthz.git

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/UserRole.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/UserRole.java
index 343a0e2b..96169434 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/UserRole.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/UserRole.java
@@ -21,6 +21,7 @@
 
 package org.onap.aaf.auth.batch.helpers;
 
+import java.io.IOException;
 import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.Date;
@@ -29,10 +30,10 @@ import java.util.List;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-import org.onap.aaf.auth.batch.actions.URDelete;
 import org.onap.aaf.auth.dao.cass.UserRoleDAO;
 import org.onap.aaf.auth.dao.cass.UserRoleDAO.Data;
 import org.onap.aaf.auth.env.AuthzTrans;
+import org.onap.aaf.cadi.CadiException;
 import org.onap.aaf.cadi.util.CSV;
 import org.onap.aaf.misc.env.Env;
 import org.onap.aaf.misc.env.TimeTaken;
@@ -125,6 +126,14 @@ public class UserRole implements Cloneable, CacheChange.Data  {
         load(trans,session,creator,"user='"+ user +'\'',visitor);
     }
 
+    public static void load(Trans trans, CSV csv, Creator<UserRole> creator, Visitor<UserRole> visitor) throws IOException, CadiException {
+//	    public UserRole(String user, String role, String ns, String rname, Date expires) {
+    	csv.visit( row -> {
+    		visitor.visit(new UserRole(row.get(1),row.get(2),row.get(3),row.get(4),
+    			new Date(Long.parseLong(row.get(6)))));
+    	});
+    }
+    
     private static void load(Trans trans, Session session, Creator<UserRole> creator, String where, Visitor<UserRole> visitor) {
         String query = creator.query(where);
         trans.debug().log( "query: " + query );
@@ -295,22 +304,6 @@ public class UserRole implements Cloneable, CacheChange.Data  {
         cache.resetLocalData();
     }
     
-    public static int sizeForDeletion() {
-        return cache.cacheSize();
-    }
-
-    public static boolean pendingDelete(UserRole ur) {
-        return cache.contains(ur);
-    }
-
-    public static void actuateDeletionNow(AuthzTrans trans, URDelete directDel) {
-        for (UserRole ur : cache.getRemoved()) {
-            directDel.exec(trans, ur, "Actuating UserRole Deletion");
-        }
-        cache.getRemoved().clear();
-        cache.resetLocalData();
-    }
-
     public void row(final CSV.Writer csvw, String tag) {
     	csvw.row(tag,user(),role(),ns(),rname(),Chrono.dateOnlyStamp(expires()),expires().getTime());
     }
@@ -347,6 +340,16 @@ public class UserRole implements Cloneable, CacheChange.Data  {
     	sb.append("';\n");
     }
 
+    public void batchExtend(StringBuilder sb, Date newDate) {
+    	sb.append("UPDATE authz.user_role SET expires='");
+    	sb.append(Chrono.dateTime(newDate));
+    	sb.append("' WHERE user='");
+    	sb.append(user());
+    	sb.append("' AND role='");
+    	sb.append(role());
+    	sb.append("';\n");
+    }
+    
     public void batchUpdateExpires(StringBuilder sb) {
     	sb.append("UPDATE authz.user_role SET expires='");
     	sb.append(Chrono.dateTime(expires()));
@@ -371,4 +374,12 @@ public class UserRole implements Cloneable, CacheChange.Data  {
 	public static String histSubject(List<String> row) {
 		return row.get(1) + '|' + row.get(2);	
 	}
+
+	public static void clear() {
+		data.clear();
+		byUser.clear();
+		byRole.clear();
+		cache.resetLocalData();
+		
+	}
 }
\ No newline at end of file