Batch work and client

[aaf/authz.git] / auth / auth-batch / src / main / java / org / onap / aaf / auth / batch / reports / NotInOrg.java

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 2ba5d02..9cd0bae 100644 (file)
--- 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");
                                }
                        });