Change Sonar flagged code

[aaf/authz.git] / auth / auth-batch / src / main / java / org / onap / aaf / auth / batch / update / Approvals.java

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/Approvals.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/Approvals.java
index 36fd627..f307ddf 100644 (file)
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/Approvals.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/Approvals.java
@@ -23,11 +23,12 @@ package org.onap.aaf.auth.batch.update;
 
 import java.io.File;
 import java.io.IOException;
-import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.GregorianCalendar;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
 import java.util.TreeMap;
 
 import org.onap.aaf.auth.batch.Batch;
@@ -46,20 +47,26 @@ import org.onap.aaf.auth.org.OrganizationException;
 import org.onap.aaf.cadi.CadiException;
 import org.onap.aaf.cadi.client.Holder;
 import org.onap.aaf.cadi.util.CSV;
+import org.onap.aaf.cadi.util.CSV.Writer;
 import org.onap.aaf.misc.env.APIException;
 import org.onap.aaf.misc.env.TimeTaken;
 import org.onap.aaf.misc.env.Trans;
 import org.onap.aaf.misc.env.util.Chrono;
 
 public class Approvals extends Batch {
-    private final AuthzTrans noAvg;
+       private final AuthzTrans noAvg;
        private BatchDataView dataview;
        private List<CSV> csvList;
-       private GregorianCalendar now;
-
+       private Writer napproveCW;
+       private final GregorianCalendar now;
+       private final String sdate;
+       private static final String CSV = ".csv";
+       private static final String APPROVALS_NEW = "ApprovalsNew";
+       
     public Approvals(AuthzTrans trans) throws APIException, IOException, OrganizationException {
         super(trans.env());
-        
+       now = new GregorianCalendar();
+       sdate = Chrono.dateOnlyStamp(now);
         noAvg = env.newTransNoAvg();
         noAvg.setUser(new BatchPrincipal("batch:Approvals"));
         session = cluster.connect();
@@ -68,8 +75,6 @@ public class Approvals extends Batch {
         Role.load(trans, session);
         UserRole.load(trans, session, UserRole.v2_0_11);
 
-        now = new GregorianCalendar();
-        
         csvList = new ArrayList<>();
         File f;
         if(args().length>0) {
@@ -90,44 +95,20 @@ public class Approvals extends Batch {
                        }
         }
         
+
+        File file = new File(logDir(),APPROVALS_NEW + sdate +CSV);
+        CSV approveCSV = new CSV(env.access(),file);
+        napproveCW = approveCSV.writer();
+        napproveCW.row("info",APPROVALS_NEW,sdate,1);
         
     }
 
     @Override
     protected void run(AuthzTrans trans) {
        Map<String,Pending> mpending = new TreeMap<>();
-               Holder<Integer> count = new Holder<>(0);
-        for(CSV approveCSV : csvList) {
-               TimeTaken tt = trans.start("Load Analyzed Reminders",Trans.SUB,approveCSV.name());
-               try {
-                               approveCSV.visit(row -> {
-                                       switch(row.get(0)) {
-                                               case Pending.REMIND:
-                                                       try {
-                                                               Pending p = new Pending(row);
-                                                               Pending mp = mpending.get(row.get(1));
-                                                               if(mp==null) {
-                                                                       mpending.put(row.get(1), p);
-                                                               } else {
-                                                                       mp.inc(p); // FYI, unlikely
-                                                               }
-                                                               count.set(count.get()+1);
-                                                       } catch (ParseException e) {
-                                                               trans.error().log(e);
-                                                       } 
-                                               break;
-                                       }
-                               });
-                       } catch (IOException | CadiException e) {
-                               e.printStackTrace();
-                               // .... but continue with next row
-               } finally {
-                       tt.done();
-               }
-        }
-        trans.info().printf("Processed %d Reminder Rows", count.get());
+               Pending p = Pending.create();
 
-        count.set(0);
+               Holder<Integer> count = new Holder<>(0);
         for(CSV approveCSV : csvList) {
                TimeTaken tt = trans.start("Processing %s's UserRoles",Trans.SUB,approveCSV.name());
                try {
@@ -141,14 +122,20 @@ public class Approvals extends Batch {
                                                        });
                                                        Result<Void> rw = uras.write(noAvg);
                                                        if(rw.isOK()) {
-                                                               Pending p = new Pending();
-                                                               Pending mp = mpending.get(urdd.user);
-                                                               if(mp==null) {
-                                                                       mpending.put(urdd.user, p);
+                                                               Set<String> approvers = uras.approvers();
+                                                               if(approvers.isEmpty()) {
+                                                                       trans.error().printf("No Approvers found for %s-%s (probably no owner)",urdd.user,urdd.role);
                                                                } else {
-                                                                       mp.inc(p);
+                                                                       for(String approver : approvers) {
+                                                                               Pending mp = mpending.get(approver);
+                                                                               if(mp==null) {
+                                                                                       mpending.put(approver, Pending.create());
+                                                                               } else {
+                                                                                       mp.inc(p); // FYI, unlikely
+                                                                               }
+                                                                       }
+                                                                       count.set(count.get()+1);
                                                                }
-                                                               count.set(count.get()+1);
                                                        } else {
                                                                trans.error().log(rw.errorString());
                                                        }
@@ -164,22 +151,25 @@ public class Approvals extends Batch {
                }
             trans.info().printf("Processed %d UserRoles", count.get());
 
-            count.set(0);
-               tt = trans.start("Notify for Pending", Trans.SUB);
+               tt = trans.start("Processing %s's UserRoles",Trans.SUB,approveCSV.name());
+               int cnt = 0;
                try {
-                       
-               } finally {
-                       tt.done();
-               }
-            trans.info().printf("Created %d Notifications", count.get());
-           }
+                   for(Entry<String, Pending> es : mpending.entrySet()) {
+                       p.row(napproveCW,es.getKey());
+                       ++cnt;
+                   }
+            } finally {
+               tt.done();
+               trans.info().printf("Processed %d Reminders", cnt);
+            }
+           }
     }
-    
-    @Override
+
+       @Override
     protected void _close(AuthzTrans trans) {
-       if(session!=null) {
-               session.close();
-               session = null;
-       }
+               if(napproveCW!=null) {
+                       napproveCW.flush();
+                       napproveCW.close();
+               }
     }
 }