summaryrefslogtreecommitdiffstats
path: root/auth/auth-core/src
diff options
context:
space:
mode:
authorInstrumental <jonathan.gathman@att.com>2018-11-28 06:53:55 -0600
committerInstrumental <jonathan.gathman@att.com>2018-11-28 06:54:02 -0600
commita6baa197a8a0333bc90e03a135441cacb7a133b9 (patch)
tree400a407aa0da79aca7fa3c4b2c8364267cab5eb1 /auth/auth-core/src
parent4c93571c67abd90c6da8b4ed0d5b93e1fe25887d (diff)
Expire, Remove Batch, restore
Issue-ID: AAF-641 Change-Id: I3d36005d59eb466141154fb729d48d5e2763fa9d Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'auth/auth-core/src')
-rw-r--r--auth/auth-core/src/main/java/org/onap/aaf/auth/org/EmailWarnings.java1
-rw-r--r--auth/auth-core/src/main/java/org/onap/aaf/auth/org/ExpireRange.java178
-rw-r--r--auth/auth-core/src/test/java/org/onap/aaf/auth/org/test/JU_ExpireRange.java71
3 files changed, 249 insertions, 1 deletions
diff --git a/auth/auth-core/src/main/java/org/onap/aaf/auth/org/EmailWarnings.java b/auth/auth-core/src/main/java/org/onap/aaf/auth/org/EmailWarnings.java
index 8360ffcb..7084fbd8 100644
--- a/auth/auth-core/src/main/java/org/onap/aaf/auth/org/EmailWarnings.java
+++ b/auth/auth-core/src/main/java/org/onap/aaf/auth/org/EmailWarnings.java
@@ -29,5 +29,4 @@ public interface EmailWarnings
public long roleEmailInterval();
public long apprEmailInterval();
public long emailUrgentWarning();
-
}
diff --git a/auth/auth-core/src/main/java/org/onap/aaf/auth/org/ExpireRange.java b/auth/auth-core/src/main/java/org/onap/aaf/auth/org/ExpireRange.java
new file mode 100644
index 00000000..c21b2bef
--- /dev/null
+++ b/auth/auth-core/src/main/java/org/onap/aaf/auth/org/ExpireRange.java
@@ -0,0 +1,178 @@
+/**
+ * ============LICENSE_START====================================================
+ * org.onap.aaf
+ * ===========================================================================
+ * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+ * ===========================================================================
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END====================================================
+ */
+
+package org.onap.aaf.auth.org;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.onap.aaf.cadi.Access;
+
+public class ExpireRange {
+ private static final String AAF_BATCH_RANGE = "aaf_batch_range.";
+ public Map<String,List<Range>> ranges;
+ public final Date now;
+
+ public ExpireRange(final Access access) {
+ now = new Date();
+ ranges = new HashMap<>();
+ int i=0;
+ String prop = access.getProperty(AAF_BATCH_RANGE + i,null);
+ if(prop==null) {
+ if(i==0) {
+ List<Range> lcred = getRangeList("cred");
+ List<Range> lur = getRangeList("ur");
+ List<Range> lx509 = getRangeList("x509");
+
+ Range del = new Range("Delete",0,0,-1,0,GregorianCalendar.WEEK_OF_MONTH,-2);
+ lur.add(del);
+ lcred.add(del);
+ lx509.add(del);
+
+ 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("OneMonth",1,7,GregorianCalendar.WEEK_OF_MONTH,2,GregorianCalendar.MONTH,1));
+ lcred.add(new Range("TwoMonth",1,0,GregorianCalendar.MONTH,1,GregorianCalendar.MONTH,2));
+
+ lur.add(new Range("OneMonth",1,7,GregorianCalendar.WEEK_OF_MONTH,2,GregorianCalendar.MONTH,1));
+
+ lx509.add(new Range("OneMonth",1,7,GregorianCalendar.WEEK_OF_MONTH,2,GregorianCalendar.MONTH,1));
+ }
+ }
+ }
+
+ public Set<String> names() {
+ Set<String> names = new HashSet<>();
+ for(List<Range> lr : ranges.values()) {
+ for(Range r : lr) {
+ names.add(r.name);
+ }
+ }
+
+ return names;
+ }
+
+ private synchronized List<Range> getRangeList(final String key) {
+ List<Range> 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 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;
+ }
+
+ private 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<Range> lr = ranges.get(key);
+ if(lr==null) {
+ return null;
+ } else {
+ for(Range r : lr) {
+ if(r.inRange(date)) {
+ rv = r;
+ break;
+ }
+ }
+ }
+ }
+ return rv;
+ }
+
+
+}
diff --git a/auth/auth-core/src/test/java/org/onap/aaf/auth/org/test/JU_ExpireRange.java b/auth/auth-core/src/test/java/org/onap/aaf/auth/org/test/JU_ExpireRange.java
new file mode 100644
index 00000000..c42cf53d
--- /dev/null
+++ b/auth/auth-core/src/test/java/org/onap/aaf/auth/org/test/JU_ExpireRange.java
@@ -0,0 +1,71 @@
+/**
+ * ============LICENSE_START====================================================
+ * org.onap.aaf
+ * ===========================================================================
+ * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+ * ===========================================================================
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END====================================================
+ */
+
+package org.onap.aaf.auth.org.test;
+
+import static org.junit.Assert.*;
+
+import java.util.GregorianCalendar;
+import java.util.Set;
+
+import org.junit.Test;
+import org.onap.aaf.auth.org.ExpireRange;
+import org.onap.aaf.cadi.PropAccess;
+
+public class JU_ExpireRange {
+ @Test
+ public void test() {
+ ExpireRange expRange = new ExpireRange(new PropAccess());
+
+ Set<String> names=expRange.names();
+ assertTrue(names.contains("OneMonth"));
+ assertTrue(names.contains("CredOneWeek"));
+ assertTrue(names.contains("Delete"));
+ assertFalse(names.contains(null));
+ assertFalse(names.contains("bogus"));
+
+ ExpireRange.Range r;
+ GregorianCalendar gc = new GregorianCalendar();
+ 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());
+ assertNotNull(r);
+ assertEquals("Delete",r.name());
+ assertFalse(r.shouldContact(null));
+ }
+
+ // Test 1 week prior
+ gc.setTime(expRange.now);
+ gc.add(GregorianCalendar.WEEK_OF_MONTH,-1);
+ for(String rs : all) {
+ r = expRange.getRange(rs, gc.getTime());
+ assertNull(r);
+ }
+
+ // Test Today
+ r = expRange.getRange("cred", expRange.now);
+ assertNotNull(r);
+ }
+
+}