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=0b6eb7b11aee72c0b9b0d09f2d617bf0dd5ab635;hb=59ffb7d529245c3bd0233dbf6cb0ae9fe9ccb856;hp=ecf66fed274ce3927f3463ad30eb05a3cacd7531;hpb=6a37b8869b1f79eaf1ccb9e6cf44accf40e99f6b;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 ecf66fed..0b6eb7b1 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
@@ -309,10 +309,20 @@ public class UserRole implements Cloneable, CacheChange.Data  {
     }
 
     public void row(final CSV.Writer csvw) {
-    	csvw.row("ur",user(),ns(),rname(),Chrono.dateOnlyStamp(expires()));
+    	csvw.row("ur",user(),ns(),rname(),Chrono.dateOnlyStamp(expires()),expires().getTime());
     }
     
-    public static void row(StringBuilder sb, List<String> row) {
+    public static Data row(List<String> row) {
+		Data data = new Data();
+		data.user = row.get(1);
+		data.ns = row.get(2);
+		data.rname = row.get(3);
+		data.role = data.ns + '.' + data.rname;
+		data.expires = new Date(Long.parseLong(row.get(5)));
+		return data;
+	}
+
+	public static void batchDelete(StringBuilder sb, List<String> row) {
     	sb.append("DELETE from authz.user_role WHERE user='");
     	sb.append(row.get(1));
     	sb.append("' AND role='");
@@ -322,6 +332,18 @@ public class UserRole implements Cloneable, CacheChange.Data  {
     	sb.append("';\n");
     }
 
+    public static void batchExtend(StringBuilder sb, List<String> row, String newDate ) {
+    	sb.append("UPDATE authz.user_role SET expires='");
+    	sb.append(newDate);
+    	sb.append("' WHERE user='");
+    	sb.append(row.get(1));
+    	sb.append("' AND role='");
+    	sb.append(row.get(2));
+    	sb.append('.');
+    	sb.append(row.get(3));
+    	sb.append("';\n");
+    }
+    
 	public static String histMemo(String fmt, List<String> row) {
 		return String.format(fmt, row.get(1),row.get(2)+'.'+row.get(3), row.get(4));
 	}