X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-batch%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fbatch%2Freports%2FNotInOrg.java;h=fb562b2434499f19922fcd2dc9a8cf9b0b7dea25;hb=08755cae37030d74d8fcadf38f9919c9d9fd21c0;hp=fe754c1092df67c16cac3cd94922451d052a71da;hpb=12414fe43077e12d7ef711951b1633ad31d73573;p=aaf%2Fauthz.git

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/NotInOrg.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/NotInOrg.java
index fe754c10..fb562b24 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/NotInOrg.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/NotInOrg.java
@@ -32,7 +32,6 @@ import org.onap.aaf.auth.batch.Batch;
 import org.onap.aaf.auth.batch.helpers.Cred;
 import org.onap.aaf.auth.batch.helpers.Cred.Instance;
 import org.onap.aaf.auth.batch.helpers.UserRole;
-import org.onap.aaf.auth.batch.helpers.Visitor;
 import org.onap.aaf.auth.env.AuthzTrans;
 import org.onap.aaf.auth.org.Organization;
 import org.onap.aaf.auth.org.Organization.Identity;
@@ -79,7 +78,7 @@ public class NotInOrg extends Batch {
             now = new Date();
             String sdate = Chrono.dateOnlyStamp(now);
            	File file = new File(logDir(),NOT_IN_ORG + sdate +CSV);
-            CSV csv = new CSV(file);
+            CSV csv = new CSV(env.access(),file);
             notInOrgW = csv.writer(false);
             notInOrgW.row(INFO,NOT_IN_ORG,Chrono.dateOnlyStamp(now),0);
             writerList.put(NOT_IN_ORG,notInOrgW);
@@ -87,7 +86,7 @@ public class NotInOrg extends Batch {
             // These will have been double-checked by the Organization, and can be deleted immediately.
             String fn = NOT_IN_ORG+"Delete";
             file = new File(logDir(),fn + sdate +CSV);
-            CSV csvDelete = new CSV(file);
+            CSV csvDelete = new CSV(env.access(),file);
             notInOrgDeleteW = csvDelete.writer(false);
             notInOrgDeleteW.row(INFO,fn,Chrono.dateOnlyStamp(now),0);
             writerList.put(NOT_IN_ORG,notInOrgW);
@@ -105,16 +104,13 @@ public class NotInOrg extends Batch {
 			trans.info().log("User Roles");
 			
 			final AuthzTrans transNoAvg = trans.env().newTransNoAvg();
-			UserRole.load(trans, session, UserRole.v2_0_11, new Visitor<UserRole>() {
-				@Override
-				public void visit(UserRole ur) {
-					try {
-						if(!check(transNoAvg, checked, ur.user())) {
-							ur.row(whichWriter(transNoAvg,ur.user()));
-						}
-					} catch (OrganizationException e) {
-						trans.error().log(e, "Error Decrypting X509");
+			UserRole.load(trans, session, UserRole.v2_0_11, ur -> {
+				try {
+					if(!check(transNoAvg, checked, ur.user())) {
+						ur.row(whichWriter(transNoAvg,ur.user()),UserRole.UR);
 					}
+				} catch (OrganizationException e) {
+					trans.error().log(e, "Error Decrypting X509");
 				}
 			});
 			
@@ -129,27 +125,6 @@ public class NotInOrg extends Batch {
 				}
 			}
 			
-			/* 
-			 * Do we delete now?  Or work on Revocation semantics 
-			 * 
-			trans.info().log("Checking for X509s without IDs");
-			X509.load(trans, session, new Visitor<X509>() {
-				@Override
-				public void visit(X509 x509) {
-					try {
-						for(Certificate cert : Factory.toX509Certificate(x509.x509)) {
-							X509Certificate xc = (X509Certificate)cert;
-							xc.getSubjectDN();
-							if(!check(transNoAvg,checked, (X))) {
-								x509.row(notInOrgW,);
-							}
-						}
-					} catch (CertificateException | IOException e) {
-						trans.error().log(e, "Error Decrypting X509");
-					}					
-				}
-			});
-			 */
 		} catch (OrganizationException e) {
 			trans.info().log(e);
 		}
@@ -159,7 +134,7 @@ public class NotInOrg extends Batch {
 	private Writer whichWriter(AuthzTrans transNoAvg, String id) {
 		Writer w = whichWriter.get(id);
 		if(w==null) {
-			w = org.mayAutoDelete(transNoAvg, id)?
+			w = org.isRevoked(transNoAvg, id)?
 					notInOrgDeleteW:
 					notInOrgW;
 			whichWriter.put(id,w);