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=9cd0baee6fbd6366b5adbaf5d68ff8fea5ad57c8;hb=628b7105ce4d9818aac69a082e515f9275fd46fd;hp=2ba5d0221eb9854cba6b65ee453f8a7eec5f4f56;hpb=613846477296bd3888ba6e5f939afe688b486ad7;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 2ba5d022..9cd0baee 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;
@@ -52,7 +51,6 @@ public class NotInOrg extends Batch {
 	private static final String INFO = "info";
 	private Map<String, CSV.Writer> writerList;
 	private Map<String, CSV.Writer> whichWriter; 
-	private File logDir;
 	private Date now;
 	private Writer notInOrgW;
 	private Writer notInOrgDeleteW;
@@ -76,21 +74,19 @@ public class NotInOrg extends Batch {
             // Create Intermediate Output 
             writerList = new HashMap<>();
             whichWriter = new TreeMap<>();
-            logDir = new File(logDir());
-            logDir.mkdirs();
 
             now = new Date();
             String sdate = Chrono.dateOnlyStamp(now);
-           	File file = new File(logDir,NOT_IN_ORG + sdate +CSV);
-            CSV csv = new CSV(file);
+           	File file = new File(logDir(),NOT_IN_ORG + sdate +CSV);
+            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);
             
             // 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);
+            file = new File(logDir(),fn + sdate +CSV);
+            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);
@@ -108,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");
 				}
 			});