Issue-ID: AAF-788
Change-Id: Ib4a2f69be5b0c9d85d30855cedbb786d21ac56cc
Signed-off-by: Instrumental <jonathan.gathman@att.com>
protected final Organization org;
protected String version;
protected final Organization org;
protected String version;
+ protected static final Date now = new Date();
+ protected static final Date never = new Date(0);
+
protected Batch(AuthzEnv env) throws APIException, IOException, OrganizationException {
if (batchEnv != null) {
env.info().log("Redirecting to ",batchEnv,"environment");
protected Batch(AuthzEnv env) throws APIException, IOException, OrganizationException {
if (batchEnv != null) {
env.info().log("Redirecting to ",batchEnv,"environment");
public static final String ONE_WEEK = "OneWeek";
private static final String AAF_BATCH_RANGE = "aaf_batch_range.";
public Map<String,List<Range>> ranges;
public static final String ONE_WEEK = "OneWeek";
private static final String AAF_BATCH_RANGE = "aaf_batch_range.";
public Map<String,List<Range>> ranges;
- public static final Date now = new Date();
+ private static final Date now = new Date();
+
+ public Date now() {
+ return now;
+ }
public class LastNotified {
private Map<String,Date> lastNotified = new TreeMap<>();
private Session session;
public class LastNotified {
private Map<String,Date> lastNotified = new TreeMap<>();
private Session session;
- public static final Date never = new Date(0);
+ private static final Date never = new Date(0);
public LastNotified(Session session) {
this.session = session;
public LastNotified(Session session) {
this.session = session;
writerList = new HashMap<>();
expireRange = new ExpireRange(trans.env().access());
writerList = new HashMap<>();
expireRange = new ExpireRange(trans.env().access());
- sdate = Chrono.dateOnlyStamp(ExpireRange.now);
+ sdate = Chrono.dateOnlyStamp(now);
for( List<Range> lr : expireRange.ranges.values()) {
for(Range r : lr ) {
if(writerList.get(r.name())==null) {
for( List<Range> lr : expireRange.ranges.values()) {
for(Range r : lr ) {
if(writerList.get(r.name())==null) {
for (Set<UserRole> sur : owners.values()) {
int goodOwners = 0;
for (UserRole ur : sur) {
for (Set<UserRole> sur : owners.values()) {
int goodOwners = 0;
for (UserRole ur : sur) {
- if (ur.expires().after(ExpireRange.now)) {
+ if (ur.expires().after(now)) {
}
});
} catch (IOException | CadiException e) {
}
});
} catch (IOException | CadiException e) {
- e.printStackTrace();
- // .... but continue with next row
trans.info().printf("Processed %d x509 records, updated %d records in %d batches.", count, cbl.total(), cbl.batches());
count = 0;
} catch (Exception e) {
trans.info().printf("Processed %d x509 records, updated %d records in %d batches.", count, cbl.total(), cbl.batches());
count = 0;
} catch (Exception e) {
private BatchDataView dataview;
private List<CSV> csvList;
private Writer napproveCW;
private BatchDataView dataview;
private List<CSV> csvList;
private Writer napproveCW;
- private static final GregorianCalendar now = new GregorianCalendar();
- private static final String sdate = Chrono.dateOnlyStamp(now);
+ 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());
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();
noAvg = env.newTransNoAvg();
noAvg.setUser(new BatchPrincipal("batch:Approvals"));
session = cluster.connect();
import static org.junit.Assert.*;
import static org.junit.Assert.*;
import java.util.GregorianCalendar;
import java.util.Set;
import java.util.GregorianCalendar;
import java.util.Set;
@Test
public void test() {
ExpireRange expRange = new ExpireRange(new PropAccess());
@Test
public void test() {
ExpireRange expRange = new ExpireRange(new PropAccess());
+ Date now = expRange.now();
Set<String> names=expRange.names();
assertTrue(names.contains("OneMonth"));
Set<String> names=expRange.names();
assertTrue(names.contains("OneMonth"));
String[] all = new String[] {"ur","cred"};
// Test 3 weeks prior
String[] all = new String[] {"ur","cred"};
// Test 3 weeks prior
- gc.setTime(expRange.now);
gc.add(GregorianCalendar.WEEK_OF_MONTH,-3);
for(String rs : all) {
r = expRange.getRange(rs, gc.getTime());
gc.add(GregorianCalendar.WEEK_OF_MONTH,-3);
for(String rs : all) {
r = expRange.getRange(rs, gc.getTime());
- gc.setTime(expRange.now);
gc.add(GregorianCalendar.WEEK_OF_MONTH,-1);
for(String rs : all) {
r = expRange.getRange(rs, gc.getTime());
gc.add(GregorianCalendar.WEEK_OF_MONTH,-1);
for(String rs : all) {
r = expRange.getRange(rs, gc.getTime());
- r = expRange.getRange("cred", expRange.now);
+ r = expRange.getRange("cred", now);