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%2FX509.java;h=c68a994532eb949f97601a0ece3d4804cb98c44e;hb=3d1706fcbe7f95830ff6fd23cf679ee55c6d0595;hp=39f017cbd90cc37f2d23536d07d7b2a9c6814f6b;hpb=2b5103e038a7727734097a671d331db9aaab77ba;p=aaf%2Fauthz.git

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/X509.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/X509.java
index 39f017cb..c68a9945 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/X509.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/X509.java
@@ -50,11 +50,11 @@ public class X509 {
     public ByteBuffer serial;
     
     public X509(String ca, String id, String x500, String x509, ByteBuffer serial) {
-    	this.ca = ca;
-    	this.id = id;
-    	this.x500 = x500;
-    	this.x509 = x509;
-    	this.serial = serial;
+        this.ca = ca;
+        this.id = id;
+        this.x500 = x500;
+        this.x509 = x509;
+        this.serial = serial;
     }
     
 
@@ -81,7 +81,7 @@ public class X509 {
             tt = trans.start("Load X509s", Env.SUB);
             try {
                 while (iter.hasNext()) {
-                	++count;
+                    ++count;
                     row = iter.next();
                     visitor.visit(new X509(row.getString(0),row.getString(1), row.getString(2),row.getString(3),row.getBytes(4)));
                 }
@@ -108,42 +108,48 @@ public class X509 {
     }
     
 
-	public void row(CSV.Writer cw, X509Certificate x509Cert) {
-		cw.row("x509",ca,Hash.toHex(serial.array()),Chrono.dateOnlyStamp(x509Cert.getNotAfter()),x500);
-	}
-
-	public void row(CSV.Writer cw, X509Certificate x509Cert,String reason) {
-		cw.row("x509",ca,Hash.toHex(serial.array()),Chrono.dateOnlyStamp(x509Cert.getNotAfter()),x500,reason);
-	}
-
-
-	public static void row(StringBuilder sb, List<String> row) {
-    	sb.append("DELETE from authz.x509 WHERE ca='");
-    	sb.append(row.get(1));
-    	sb.append("' AND serial=");
-    	sb.append(row.get(2));
-    	sb.append(";\n");
-	}
-
-
-	public static String histSubject(List<String> row) {
-		return row.get(4);
-	}
-
-
-	public static String histMemo(String fmt, List<String> row) {
-		String id="n/a";
-		for(String s : Split.splitTrim(',', row.get(4))) {
-			if(s.startsWith("OU=") && s.indexOf('@')>=0) {
-				int colon = s.indexOf(':');
-				if(colon<0) {
-					colon=s.length();
-				}
-				id=s.substring(3,colon);
-				break;
-			}
-		}
-		return String.format(fmt, "Cert for " + id,"CA " + row.get(1),row.get(3));
-	}
+    public void row(CSV.Writer cw, X509Certificate x509Cert) {
+        cw.row("x509",ca,Hash.toHex(serial.array()),Chrono.dateOnlyStamp(x509Cert.getNotAfter()),x500);
+    }
+
+    public void row(CSV.Writer cw, X509Certificate x509Cert,String reason) {
+        cw.row("x509",ca,Hash.toHex(serial.array()),Chrono.dateOnlyStamp(x509Cert.getNotAfter()),x500,reason);
+    }
+
+
+    public static void row(StringBuilder sb, List<String> row) {
+        sb.append("DELETE from authz.x509 WHERE ca='");
+        sb.append(row.get(1));
+        sb.append("' AND serial=");
+        sb.append(row.get(2));
+        sb.append(";\n");
+    }
+
+    public static void batchDelete(StringBuilder sb, List<String> row) {
+        sb.append("DELETE from authz.x509 WHERE ca='");
+        sb.append(row.get(1));
+        sb.append("' AND serial=");
+        sb.append(row.get(2));
+        sb.append(";\n");
+    }
+    public static String histSubject(List<String> row) {
+        return row.get(4);
+    }
+
+
+    public static String histMemo(String fmt, List<String> row) {
+        String id="n/a";
+        for(String s : Split.splitTrim(',', row.get(4))) {
+            if(s.startsWith("OU=") && s.indexOf('@')>=0) {
+                int colon = s.indexOf(':');
+                if(colon<0) {
+                    colon=s.length();
+                }
+                id=s.substring(3,colon);
+                break;
+            }
+        }
+        return String.format(fmt, "Cert for " + id,"CA " + row.get(1),row.get(3));
+    }
 
 }
\ No newline at end of file