xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #2469 Refined deletion of adhoc subs." into development

Browse source 
Former-commit-id: 1d85220363 [formerly 2ff6d9a5e793e7673ddf8d5e5c5b25cf3235e12e]
Former-commit-id: 1b7b6f0134
This commit is contained in:
Richard Peter 2013-10-29 12:18:55 -05:00 • committed by Gerrit Code Review
commit c27c764c61
1 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/adhoc/AdhocSubscriptionCleaner.java
View file

@ -52,6 +52,7 @@ import com.raytheon.uf.edex.database.purge.PurgeRuleSet;
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Oct 11, 2013 2460 dhladky Initial creation * Oct 11, 2013 2460 dhladky Initial creation
* Oct 23, 2013 2469 dhladky Refined the time check and accommodation for lack of purge rules.
* *
* </pre> * </pre>
* *
@ -63,6 +64,8 @@ public class AdhocSubscriptionCleaner {
private static final IUFStatusHandler statusHandler = UFStatus private static final IUFStatusHandler statusHandler = UFStatus
.getHandler(AdhocSubscriptionCleaner.class); .getHandler(AdhocSubscriptionCleaner.class);
private static final String DEFAULT_RULE = "00-12:00:00";
public AdhocSubscriptionCleaner() { public AdhocSubscriptionCleaner() {
@ -150,17 +153,29 @@ public class AdhocSubscriptionCleaner {
if (purgeRuleSet != null) { if (purgeRuleSet != null) {
List<PurgeRule> rules = purgeRuleSet.getRules(); List<PurgeRule> rules = purgeRuleSet.getRules();
// if no rules exist, create a default, 12 hours
if (rules.isEmpty()) {
rules = new ArrayList<PurgeRule>();
PurgeRule rule = new PurgeRule();
rule.setPeriod(DEFAULT_RULE);
rules.add(rule);
}
// Go over all of the purge rules for each sub // Go over all of the purge rules for each sub
for (PurgeRule rule: rules) { for (PurgeRule rule : rules) {
// use current system date/time // use a valid rule
long timeCheck = TimeUtil.newDate().getTime(); if (rule.getPeriodInMillis() != 0) {
Date expireDate = new Date(timeCheck + rule.getPeriodInMillis()); // use current system date/time
Date compareTime = TimeUtil.newDate();
// check rule against creation time of this sub Date expireDate = new Date(adhoc.getTime()
if (adhoc.getTime().getEnd().before(expireDate)) { .getStart().getTime()
if (!subsToDelete.contains(adhoc)) { + rule.getPeriodInMillis());
subsToDelete.add(adhoc);
if (expireDate.before(compareTime)) {
if (!subsToDelete.contains(adhoc)) {
subsToDelete.add(adhoc);
break;
}
} }
} }
} }