X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-batch%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fbatch%2Fhelpers%2FExpireRange.java;h=6a5dbadc2be9ce19e5228a78f9f1d1d01cd7d6a4;hb=78ccdcc1d1c29760e4cf833f94df62e1c5aa733f;hp=13d74c8f25a1bfde183f6719b9a8f6a5559c2e3b;hpb=889a9891f6df5bbb26a760cfb106be947e87aa5c;p=aaf%2Fauthz.git diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/ExpireRange.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/ExpireRange.java index 13d74c8f..6a5dbadc 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/ExpireRange.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/ExpireRange.java @@ -9,9 +9,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -23,6 +23,7 @@ package org.onap.aaf.auth.batch.helpers; import java.util.ArrayList; +import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; import java.util.HashMap; @@ -31,157 +32,199 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.onap.aaf.auth.org.Organization.Identity; import org.onap.aaf.cadi.Access; public class ExpireRange { - public static final String ONE_MONTH = "OneMonth"; - public static final String TWO_MONTH = "TwoMonth"; - public static final String TWO_WEEK = "TwoWeek"; - public static final String ONE_WEEK = "OneWeek"; - private static final String AAF_BATCH_RANGE = "aaf_batch_range."; - public Map> ranges; - public static final Date now = new Date(); - - private Range delRange; - - public ExpireRange(final Access access) { - ranges = new HashMap<>(); - int i=0; - String prop = access.getProperty(AAF_BATCH_RANGE + i,null); - if(prop==null && i==0) { - List lcred = getRangeList("cred"); - List lur = getRangeList("ur"); - List lx509 = getRangeList("x509"); - - delRange = new Range("Delete",0,0,-1,0,GregorianCalendar.WEEK_OF_MONTH,-2); - lur.add(delRange); - lcred.add(delRange); - lx509.add(delRange); - - lcred.add(new Range(ONE_WEEK,3,1,0,0,GregorianCalendar.WEEK_OF_MONTH,1)); - lcred.add(new Range(TWO_WEEK,2,1,GregorianCalendar.WEEK_OF_MONTH,1,GregorianCalendar.WEEK_OF_MONTH,2)); - lcred.add(new Range(ONE_MONTH,1,7,GregorianCalendar.WEEK_OF_MONTH,2,GregorianCalendar.MONTH,1)); - lcred.add(new Range(TWO_MONTH,1,0,GregorianCalendar.MONTH,1,GregorianCalendar.MONTH,2)); - - lur.add(new Range(ONE_MONTH,1,7,GregorianCalendar.WEEK_OF_MONTH,2,GregorianCalendar.MONTH,1)); - - lx509.add(new Range(ONE_MONTH,1,7,GregorianCalendar.WEEK_OF_MONTH,2,GregorianCalendar.MONTH,1)); - } - } - - public static Range newFutureRange() { - return new Range("Approval",1,1,0,0,GregorianCalendar.MONTH,1); - } - - public Set names() { - Set names = new HashSet<>(); + private static final String DELETE = "Delete"; + public static final String ONE_MONTH = "OneMonth"; + public static final String TWO_MONTH = "TwoMonth"; + public static final String TWO_WEEK = "TwoWeek"; + public static final String ONE_WEEK = "OneWeek"; + private static final String AAF_BATCH_RANGE = "aaf_batch_range."; + public final Map> ranges; + private final Map intervalDates; + private static final Date now = new Date(); + public final Range approveDelete ; + + private Range delRange; + + public ExpireRange(final Access access) { + ranges = new HashMap<>(); + intervalDates = new HashMap<>(); + int i=0; + approveDelete = new Range(DELETE,0,0,0,-1,0, Calendar.DAY_OF_YEAR,-100); + String prop = access.getProperty(AAF_BATCH_RANGE + i,null); + if(prop==null && i==0) { + List lcred = getRangeList("cred"); + List lur = getRangeList("ur"); + List lx509 = getRangeList("x509"); + + + /* + Range(Name, ReportingLevel, PeopleInterval, AppInterval, Start(Type,Qty) End(Type,Qty) ) + Interval of -1 Means "only once" + Interval of 0 means none + Interval > 0 means only X number of Days. + */ + delRange = new Range(DELETE,0,0,0,-1,0,Calendar.WEEK_OF_MONTH,-2); + lur.add(delRange); + lcred.add(delRange); + lx509.add(delRange); + + lcred.add(new Range(ONE_WEEK ,3,-1,1,0,0,Calendar.WEEK_OF_MONTH,1)); + lcred.add(new Range(TWO_WEEK ,2,-1,-1,Calendar.WEEK_OF_MONTH,1,Calendar.WEEK_OF_MONTH,2)); + lcred.add(new Range(ONE_MONTH,1,7,7,Calendar.WEEK_OF_MONTH,2,Calendar.MONTH,1)); + lcred.add(new Range(TWO_MONTH,1,-1,-1,Calendar.MONTH,1,Calendar.MONTH,2)); + + lur.add( new Range(ONE_MONTH,1,-1,-1,0,0,Calendar.MONTH,1)); + lx509.add(new Range(ONE_MONTH,1,-1,-1,Calendar.WEEK_OF_MONTH,2,Calendar.MONTH,1)); + } + } + + public Range newFutureRange() { + return new Range("Approval",7,7,1,0,0,Calendar.MONTH,1); + } + + public Set names() { + Set names = new HashSet<>(); for(List lr : ranges.values()) { - for(Range r : lr) { - names.add(r.name); - } + for(Range r : lr) { + names.add(r.name); + } + } + + return names; + } + + private synchronized List getRangeList(final String key) { + List rv = ranges.get(key); + if(rv==null) { + rv = new ArrayList<>(); + ranges.put(key, rv); + } + return rv; + + + } + + public class Range { + private final String name; + private final int reportingLevel; + private final int peopleInterval; // in Days + private final int appInterval; // in Days + private final Date start; + private final Date end; + private final Date lowerValid; + + public Range( + final String name, final int reportingLevel, + final int peopleInterval, final int appInterval, + final int startGCType, final int startQty, + final int endGCType,final int endQty) { + this.name = name; + this.reportingLevel = reportingLevel; + this.peopleInterval = peopleInterval; + this.appInterval = appInterval; + Calendar gc = new GregorianCalendar(); + if(startGCType<0) { + gc.set(Calendar.YEAR, 1); + } else { + gc.setTime(now); + gc.add(startGCType, startQty); + } + start = gc.getTime(); + + if(endGCType<0) { + gc.set(Calendar.YEAR, 1); + } else { + gc.setTime(now); + gc.add(endGCType, endQty); + } + end = gc.getTime(); + + + if(endGCType<0) { + gc.set(Calendar.YEAR, -1); + } else { + gc.setTime(now); + gc.add(endGCType, endQty * -1); + } + lowerValid = gc.getTime(); + + } + + public String name() { + return name; } - return names; - } - - private synchronized List getRangeList(final String key) { - List rv = ranges.get(key); - if(rv==null) { - rv = new ArrayList<>(); - ranges.put(key, rv); - } - return rv; - } - - public static class Range { - private final String name; - private final int reportingLevel; - private final int interval; // in Days - private final Date start; - private final Date end; - - public Range( - final String name, final int reportingLevel, final int interval, - final int startGCType, final int startQty, - final int endGCType,final int endQty) { - this.name = name; - this.reportingLevel = reportingLevel; - this.interval = interval; - GregorianCalendar gc = new GregorianCalendar(); - if(startGCType<0) { - gc.set(GregorianCalendar.YEAR, 1); - } else { - gc.setTime(now); - gc.add(startGCType, startQty); - } - start = gc.getTime(); - - if(endGCType<0) { - gc.set(GregorianCalendar.YEAR, 1); - } else { - gc.setTime(now); - gc.add(endGCType, endQty); - } - end = gc.getTime(); - } - - public String name() { - return name; - } - - public int reportingLevel() { - return reportingLevel; - } - - public Date getStart() { - return start; - } - - public Date getEnd() { - return end; - } - - public boolean inRange(final Date date) { - if(date==null) { - return false; - } else { - return date.getTime()>=start.getTime() && date.before(end); - } - } - - public boolean shouldContact(final Date lastContact) { - if(reportingLevel<=0) { - return false; - } else if(lastContact==null) { - return true; - } else if(interval==0) { - return lastContact.before(start); - } else { - GregorianCalendar gc = new GregorianCalendar(); - gc.setTime(now); - gc.add(GregorianCalendar.DAY_OF_WEEK, interval); - return lastContact.before(gc.getTime()); - } - } - } - - public Range getRange(final String key, final Date date) { - Range rv = null; - if(date!=null) { - List lr = ranges.get(key); - if(lr==null) { - return null; - } else { - for(Range r : lr) { - if(r.inRange(date)) { - rv = r; - break; - } - } - } - } - return rv; - } - + public int reportingLevel() { + return reportingLevel; + } + + public boolean needsContact(Date lnd, Identity identity) { + final int interval; + if(identity==null || identity.isPerson()) { + interval = peopleInterval; + } else { + interval = appInterval; + } + if(interval == 0) { + return false; + } else if(interval < 0) { // "-1 = only once " + return (lnd==null || lnd.before(lowerValid)); + } else { + Date rv = intervalDates.get(interval); + if(rv==null) { + GregorianCalendar gc = new GregorianCalendar(); + gc.setTime(now); + gc.add(Calendar.DAY_OF_YEAR, -1*interval); + rv = gc.getTime(); + intervalDates.put(interval, rv); + } + return rv.after(lnd); + } + } + + public Date getStart() { + return start; + } + + public Date getEnd() { + return end; + } + + public boolean inRange(final Date date) { + if(date==null) { + return false; + } else { + return date.getTime()>=start.getTime() && date.before(end); + } + } + + } + + public Range getRange(final String key, final Date date) { + Range rv = null; + if(date!=null) { + List lr = ranges.get(key); + if(lr==null) { + return null; + } else { + for(Range r : lr) { + if(r.inRange(date)) { + rv = r; + break; + } + } + } + } + return rv; + } + + public Date now() { + return now; + } + }