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=13d74c8f25a1bfde183f6719b9a8f6a5559c2e3b;hb=889a9891f6df5bbb26a760cfb106be947e87aa5c;hp=b06cbce92697b2c8c5d38a8618b5579b0c128b7e;hpb=59ffb7d529245c3bd0233dbf6cb0ae9fe9ccb856;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 b06cbce9..13d74c8f 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
@@ -34,14 +34,17 @@ import java.util.Set;
 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<String,List<Range>> ranges;
-	public final Date now;
-	public String rangeOneMonth = "OneMonth";
+	public static final Date now = new Date();
+
 	private Range delRange;
 	
 	public ExpireRange(final Access access) {
-		now = new Date();
 		ranges = new HashMap<>();
 		int i=0;
 		String prop = access.getProperty(AAF_BATCH_RANGE + i,null);
@@ -55,17 +58,21 @@ public class ExpireRange {
 				lcred.add(delRange);
 				lx509.add(delRange);
 				
-				lcred.add(new Range("CredOneWeek",3,1,0,0,GregorianCalendar.WEEK_OF_MONTH,1));
-				lcred.add(new Range("CredTwoWeek",2,1,GregorianCalendar.WEEK_OF_MONTH,1,GregorianCalendar.WEEK_OF_MONTH,2));
-				lcred.add(new Range(rangeOneMonth,1,7,GregorianCalendar.WEEK_OF_MONTH,2,GregorianCalendar.MONTH,1));
-				lcred.add(new Range("TwoMonth",1,0,GregorianCalendar.MONTH,1,GregorianCalendar.MONTH,2));
+				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(rangeOneMonth,1,7,GregorianCalendar.WEEK_OF_MONTH,2,GregorianCalendar.MONTH,1));
+				lur.add(new Range(ONE_MONTH,1,7,GregorianCalendar.WEEK_OF_MONTH,2,GregorianCalendar.MONTH,1));
 				
-				lx509.add(new Range(rangeOneMonth,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<String> names() {
 		Set<String> names = new HashSet<>();
         for(List<Range> lr : ranges.values()) {
@@ -86,7 +93,7 @@ public class ExpireRange {
 		return rv;
 	}
 	
-	public class Range {
+	public static class Range {
 		private final String name;
 		private final int reportingLevel;
 		private final int interval; // in Days
@@ -134,7 +141,7 @@ public class ExpireRange {
 			return end;
 		}
 		
-		private boolean inRange(final Date date) {
+		public boolean inRange(final Date date) {
 			if(date==null) {
 				return false;
 			} else {