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%2FNsRoleUserReport.java;h=fcdc663179af778d4cb36e3838587fa22b55e19b;hb=fe3c40d9686febe8b6dd633bb9b1bbebba00288b;hp=8281e747a1cac69b1c5a1e24c043d8ed6964cd7f;hpb=12414fe43077e12d7ef711951b1633ad31d73573;p=aaf%2Fauthz.git diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/NsRoleUserReport.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/NsRoleUserReport.java index 8281e747..fcdc6631 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/NsRoleUserReport.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/NsRoleUserReport.java @@ -68,7 +68,7 @@ public class NsRoleUserReport extends Batch { now = new Date(); String sdate = Chrono.dateOnlyStamp(now); File file = new File(logDir(),REPORT + sdate +CSV); - CSV csv = new CSV(file); + CSV csv = new CSV(env.access(),file); report = csv.writer(false); theMap = new TreeMap<>(); @@ -86,24 +86,21 @@ public class NsRoleUserReport extends Batch { trans.info().log("Create Report on Roles by NS"); final AuthzTrans transNoAvg = trans.env().newTransNoAvg(); - UserRole.load(transNoAvg, session, UserRole.v2_0_11, new Visitor() { - @Override - public void visit(UserRole ur) { - if(ur.expires().after(now)) { - Map roleCount = theMap.get(ur.ns()); - Integer count; - if(roleCount==null) { - roleCount = new TreeMap<>(); - theMap.put(ur.ns(),roleCount); + UserRole.load(transNoAvg, session, UserRole.v2_0_11, ur -> { + if(ur.expires().after(now)) { + Map roleCount = theMap.get(ur.ns()); + Integer count; + if(roleCount==null) { + roleCount = new TreeMap<>(); + theMap.put(ur.ns(),roleCount); + count = 0; + } else { + count = roleCount.get(ur.rname()); + if(count == null) { count = 0; - } else { - count = roleCount.get(ur.rname()); - if(count == null) { - count = 0; - } } - roleCount.put(ur.rname(), count+1); } + roleCount.put(ur.rname(), count+1); } });