X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-batch%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fbatch%2Fupdate%2FApprovals.java;h=57def168fa429c61e600222a9ec5f77b0e351353;hb=57effd69fb15e0c73f85296d10ff6b358a6cbebb;hp=f307ddf1f2010ae39615159d0721f24b7dac50fb;hpb=502da3cb1daf171395630dbaf4a2f2e2fb9aa93e;p=aaf%2Fauthz.git

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 f307ddf1..57def168 100644
--- 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
@@ -40,6 +40,7 @@ import org.onap.aaf.auth.batch.helpers.BatchDataView;
 import org.onap.aaf.auth.batch.helpers.NS;
 import org.onap.aaf.auth.batch.helpers.Role;
 import org.onap.aaf.auth.batch.helpers.UserRole;
+import org.onap.aaf.auth.batch.reports.Analyze;
 import org.onap.aaf.auth.dao.cass.UserRoleDAO;
 import org.onap.aaf.auth.env.AuthzTrans;
 import org.onap.aaf.auth.layer.Result;
@@ -87,7 +88,7 @@ public class Approvals extends Batch {
         		}
         	}
         } else {
-        	f = new File(logDir(), "Approvals"+Chrono.dateOnlyStamp()+".csv");
+        	f = new File(logDir(), Analyze.NEED_APPROVALS+Chrono.dateOnlyStamp()+".csv");
         	if(f.exists()) {
         		csvList.add(new CSV(env.access(),f).processAll());
 			} else {
@@ -109,10 +110,10 @@ public class Approvals extends Batch {
 		Pending p = Pending.create();
 
 		Holder<Integer> count = new Holder<>(0);
-        for(CSV approveCSV : csvList) {
-        	TimeTaken tt = trans.start("Processing %s's UserRoles",Trans.SUB,approveCSV.name());
+        for(CSV neeedApproveCSV : csvList) {
+        	TimeTaken tt = trans.start("Processing %s's UserRoles",Trans.SUB,neeedApproveCSV.name());
         	try {
-				approveCSV.visit(row -> {
+				neeedApproveCSV.visit(row -> {
 					switch(row.get(0)) {
 						case UserRole.APPROVE_UR:
 							UserRoleDAO.Data urdd = UserRole.row(row);
@@ -151,7 +152,7 @@ public class Approvals extends Batch {
 	    	}
             trans.info().printf("Processed %d UserRoles", count.get());
 
-        	tt = trans.start("Processing %s's UserRoles",Trans.SUB,approveCSV.name());
+        	tt = trans.start("Writing Approvals to %s",Trans.SUB,neeedApproveCSV.name());
         	int cnt = 0;
         	try {
 	            for(Entry<String, Pending> es : mpending.entrySet()) {