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%2FExpiring.java;h=e171d17439bf57ffb6685a71d33a38aba874b121;hb=12414fe43077e12d7ef711951b1633ad31d73573;hp=1a7db0558e4d72699324b715dad828683aa841d7;hpb=71340cf50ea2c0fc9cfd0670052c4b4fcabe3db6;p=aaf%2Fauthz.git

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Expiring.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Expiring.java
index 1a7db055..e171d174 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Expiring.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Expiring.java
@@ -3,6 +3,8 @@
  * org.onap.aaf
  * ===========================================================================
  * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+ *
+ * Modifications Copyright (C) 2019 IBM.
  * ===========================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -61,7 +63,6 @@ public class Expiring extends Batch {
 	private static final String EXPIRED_OWNERS = "ExpiredOwners";
 	private int minOwners;
 	private Map<String, CSV.Writer> writerList;
-	private File logDir;
 	private ExpireRange expireRange;
 	private Date deleteDate;
 	
@@ -80,28 +81,26 @@ public class Expiring extends Batch {
             
             // Load Cred.  We don't follow Visitor, because we have to gather up everything into Identity Anyway
             Cred.load(trans, session);
-            UserRole.load(trans, session, UserRole.v2_0_11, new UserRole.DataLoadVisitor());
 
             minOwners=1;
 
             // Create Intermediate Output 
             writerList = new HashMap<>();
-            logDir = new File(logDir());
-            logDir.mkdirs();
             
             expireRange = new ExpireRange(trans.env().access());
             String sdate = Chrono.dateOnlyStamp(expireRange.now);
             for( List<Range> lr : expireRange.ranges.values()) {
             	for(Range r : lr ) {
             		if(writerList.get(r.name())==null) {
-                    	File file = new File(logDir,r.name() + sdate +CSV);
+                    	File file = new File(logDir(),r.name() + sdate +CSV);
                     	CSV csv = new CSV(file);
                     	CSV.Writer cw = csv.writer(false);
                     	cw.row(INFO,r.name(),Chrono.dateOnlyStamp(expireRange.now),r.reportingLevel());
                     	writerList.put(r.name(),cw);
                     	if("Delete".equals(r.name())) {
-                    		deleteDate = r.getStart();
+                    		deleteDate = r.getEnd();
                     	}
+                    	trans.init().log("Creating File:",file.getAbsolutePath());
             		}
             	}
             }
@@ -114,25 +113,22 @@ public class Expiring extends Batch {
     @Override
     protected void run(AuthzTrans trans) {
 		try {
-			File file = new File(logDir, EXPIRED_OWNERS + Chrono.dateOnlyStamp(expireRange.now) + CSV);
+			File file = new File(logDir(), EXPIRED_OWNERS + Chrono.dateOnlyStamp(expireRange.now) + CSV);
 			final CSV ownerCSV = new CSV(file);
 
 			Map<String, Set<UserRole>> owners = new TreeMap<String, Set<UserRole>>();
 			trans.info().log("Process UserRoles");
-			UserRole.load(trans, session, UserRole.v2_0_11, new Visitor<UserRole>() {
-				@Override
-				public void visit(UserRole ur) {
-					// Cannot just delete owners, unless there is at least one left. Process later
-					if ("owner".equals(ur.rname())) {
-						Set<UserRole> urs = owners.get(ur.role());
-						if (urs == null) {
-							urs = new HashSet<UserRole>();
-							owners.put(ur.role(), urs);
-						}
-						urs.add(ur);
-					} else {
-						writeAnalysis(trans,ur);
+			UserRole.load(trans, session, UserRole.v2_0_11, ur -> {
+				// Cannot just delete owners, unless there is at least one left. Process later
+				if ("owner".equals(ur.rname())) {
+					Set<UserRole> urs = owners.get(ur.role());
+					if (urs == null) {
+						urs = new HashSet<UserRole>();
+						owners.put(ur.role(), urs);
 					}
+					urs.add(ur);
+				} else {
+					writeAnalysis(trans,ur);
 				}
 			});