diff options
author | 2018-11-30 14:21:02 -0600 | |
---|---|---|
committer | 2018-11-30 14:21:04 -0600 | |
commit | 71340cf50ea2c0fc9cfd0670052c4b4fcabe3db6 (patch) | |
tree | 422fad3ecba6077ae969a065a877787e48619d6f /auth/auth-batch/src/main/java/org | |
parent | c2445ee11b66efebdd5efe92fddf9526926c736e (diff) |
Change Batch Packaging
Issue-ID: AAF-654
Change-Id: Iaa1eab5d43717e7ffe51933511c9b232a5a1d770
Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'auth/auth-batch/src/main/java/org')
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/Batch.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/Batch.java) | 2 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/BatchException.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/BatchException.java) | 2 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/BatchPrincipal.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/BatchPrincipal.java) | 2 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/CassBatch.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/CassBatch.java) | 2 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/Action.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/Action.java) | 2 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/ActionDAO.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/ActionDAO.java) | 2 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/ActionPuntDAO.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/ActionPuntDAO.java) | 2 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/CacheTouch.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/CacheTouch.java) | 2 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/CredDelete.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/CredDelete.java) | 2 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/CredPrint.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/CredPrint.java) | 2 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/CredPunt.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/CredPunt.java) | 2 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/Email.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/Email.java) | 2 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/EmailPrint.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/EmailPrint.java) | 2 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/FuturePrint.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/FuturePrint.java) | 4 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/Key.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/Key.java) | 2 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/Message.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/Message.java) | 2 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/NSACreate.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/NSACreate.java) | 4 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/NSADelete.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/NSADelete.java) | 4 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/NSDescUpdate.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/NSDescUpdate.java) | 4 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/PermCreate.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/PermCreate.java) | 4 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/PermDelete.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/PermDelete.java) | 4 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/PermModify.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/PermModify.java) | 6 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/RoleCreate.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/RoleCreate.java) | 4 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/RoleDelete.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/RoleDelete.java) | 4 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/RoleModify.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/RoleModify.java) | 6 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URAdd.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URAdd.java) | 4 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URDelete.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URDelete.java) | 4 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URFutureApprove.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URFutureApprove.java) | 6 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URFutureApproveExec.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URFutureApproveExec.java) | 8 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URFuturePrint.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URFuturePrint.java) | 4 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URModify.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URModify.java) | 4 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URPrint.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URPrint.java) | 4 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URPunt.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URPunt.java) | 4 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Approval.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Approval.java) | 2 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Approver.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Approver.java) | 4 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/CQLBatch.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/CQLBatch.java) | 2 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/CacheChange.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/CacheChange.java) | 2 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Creator.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Creator.java) | 2 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Cred.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Cred.java) | 2 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/ExpireRange.java | 178 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Future.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Future.java) | 2 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/History.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/History.java) | 2 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/InputIterator.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/InputIterator.java) | 2 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Loader.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Loader.java) | 2 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/MiscID.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/MiscID.java) | 4 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/MonthData.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/MonthData.java) | 2 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/NS.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/NS.java) | 2 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Notification.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Notification.java) | 4 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/NsAttrib.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/NsAttrib.java) | 2 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Perm.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Perm.java) | 2 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Role.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Role.java) | 2 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/UserRole.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/UserRole.java) | 8 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Visitor.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Visitor.java) | 2 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/X509.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/X509.java) | 2 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Expiring.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/reports/Expiring.java) | 18 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/ExpiringOrig.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/update/ExpiringOrig.java) | 42 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/ExpiringP2.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/update/ExpiringP2.java) | 16 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/NotifyApprovals.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/update/NotifyApprovals.java) | 16 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/NotifyCredExpiring.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/update/NotifyCredExpiring.java) | 22 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/Remove.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/update/Remove.java) | 16 | ||||
-rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/Upload.java (renamed from auth/auth-batch/src/main/java/org/onap/aaf/auth/update/Upload.java) | 4 |
61 files changed, 329 insertions, 147 deletions
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/Batch.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/Batch.java index 5a19ab38..3d742167 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/Batch.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/Batch.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth; +package org.onap.aaf.auth.batch; import java.io.File; import java.io.FileInputStream; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/BatchException.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/BatchException.java index 15bec4e4..dbb2dc31 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/BatchException.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/BatchException.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth; +package org.onap.aaf.auth.batch; public class BatchException extends Exception { diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/BatchPrincipal.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/BatchPrincipal.java index 66431c8a..0bc58add 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/BatchPrincipal.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/BatchPrincipal.java @@ -18,7 +18,7 @@ * ============LICENSE_END==================================================== * */ -package org.onap.aaf.auth; +package org.onap.aaf.auth.batch; import org.onap.aaf.cadi.principal.TaggedPrincipal; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/CassBatch.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/CassBatch.java index 4ebb3a94..1fc16e4e 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/CassBatch.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/CassBatch.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth; +package org.onap.aaf.auth.batch; import java.io.IOException; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/Action.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/Action.java index 54e2ee2d..544d049d 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/Action.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/Action.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.actions; +package org.onap.aaf.auth.batch.actions; import org.onap.aaf.auth.env.AuthzTrans; import org.onap.aaf.auth.layer.Result; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/ActionDAO.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/ActionDAO.java index 5275cf93..416a13ce 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/ActionDAO.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/ActionDAO.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.actions; +package org.onap.aaf.auth.batch.actions; import java.io.IOException; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/ActionPuntDAO.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/ActionPuntDAO.java index ed032c95..37abbaf4 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/ActionPuntDAO.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/ActionPuntDAO.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.actions; +package org.onap.aaf.auth.batch.actions; import java.io.IOException; import java.util.Date; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/CacheTouch.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/CacheTouch.java index 269edc77..a4f4dcf3 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/CacheTouch.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/CacheTouch.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.actions; +package org.onap.aaf.auth.batch.actions; import java.io.IOException; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/CredDelete.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/CredDelete.java index ceb0453b..61da6094 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/CredDelete.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/CredDelete.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.actions; +package org.onap.aaf.auth.batch.actions; import java.io.IOException; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/CredPrint.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/CredPrint.java index 658ef8b5..9780f2ba 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/CredPrint.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/CredPrint.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.actions; +package org.onap.aaf.auth.batch.actions; import org.onap.aaf.auth.dao.cass.CredDAO; import org.onap.aaf.auth.env.AuthzTrans; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/CredPunt.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/CredPunt.java index 33151d9f..ef6bb94e 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/CredPunt.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/CredPunt.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.actions; +package org.onap.aaf.auth.batch.actions; import java.io.IOException; import java.util.Date; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/Email.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/Email.java index f40eeb58..461d3fc7 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/Email.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/Email.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.actions; +package org.onap.aaf.auth.batch.actions; import java.io.PrintStream; import java.util.ArrayList; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/EmailPrint.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/EmailPrint.java index 141e382f..3ab481f5 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/EmailPrint.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/EmailPrint.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.actions; +package org.onap.aaf.auth.batch.actions; import java.io.PrintStream; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/FuturePrint.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/FuturePrint.java index eda96629..f95e9222 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/FuturePrint.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/FuturePrint.java @@ -19,10 +19,10 @@ * */ -package org.onap.aaf.auth.actions; +package org.onap.aaf.auth.batch.actions; +import org.onap.aaf.auth.batch.helpers.Future; import org.onap.aaf.auth.env.AuthzTrans; -import org.onap.aaf.auth.helpers.Future; import org.onap.aaf.auth.layer.Result; import org.onap.aaf.misc.env.util.Chrono; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/Key.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/Key.java index ee2e8c3b..fb43a425 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/Key.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/Key.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.actions; +package org.onap.aaf.auth.batch.actions; public interface Key<HELPER> { public String key(HELPER H); diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/Message.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/Message.java index f1eadb20..8bef131c 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/Message.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/Message.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.actions; +package org.onap.aaf.auth.batch.actions; import java.util.ArrayList; import java.util.List; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/NSACreate.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/NSACreate.java index 58a8c4b8..567bccfc 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/NSACreate.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/NSACreate.java @@ -19,12 +19,12 @@ * */ -package org.onap.aaf.auth.actions; +package org.onap.aaf.auth.batch.actions; import java.io.IOException; +import org.onap.aaf.auth.batch.helpers.NsAttrib; import org.onap.aaf.auth.env.AuthzTrans; -import org.onap.aaf.auth.helpers.NsAttrib; import org.onap.aaf.auth.layer.Result; import org.onap.aaf.misc.env.APIException; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/NSADelete.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/NSADelete.java index c8a1c82c..86eff7ea 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/NSADelete.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/NSADelete.java @@ -19,12 +19,12 @@ * */ -package org.onap.aaf.auth.actions; +package org.onap.aaf.auth.batch.actions; import java.io.IOException; +import org.onap.aaf.auth.batch.helpers.NsAttrib; import org.onap.aaf.auth.env.AuthzTrans; -import org.onap.aaf.auth.helpers.NsAttrib; import org.onap.aaf.auth.layer.Result; import org.onap.aaf.misc.env.APIException; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/NSDescUpdate.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/NSDescUpdate.java index d5d93b38..2542e045 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/NSDescUpdate.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/NSDescUpdate.java @@ -19,12 +19,12 @@ * */ -package org.onap.aaf.auth.actions; +package org.onap.aaf.auth.batch.actions; import java.io.IOException; +import org.onap.aaf.auth.batch.helpers.NS; import org.onap.aaf.auth.env.AuthzTrans; -import org.onap.aaf.auth.helpers.NS; import org.onap.aaf.auth.layer.Result; import org.onap.aaf.misc.env.APIException; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/PermCreate.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/PermCreate.java index a6c02f2c..65555704 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/PermCreate.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/PermCreate.java @@ -19,14 +19,14 @@ * */ -package org.onap.aaf.auth.actions; +package org.onap.aaf.auth.batch.actions; import java.io.IOException; +import org.onap.aaf.auth.batch.helpers.Perm; import org.onap.aaf.auth.dao.cass.PermDAO; import org.onap.aaf.auth.dao.cass.PermDAO.Data; import org.onap.aaf.auth.env.AuthzTrans; -import org.onap.aaf.auth.helpers.Perm; import org.onap.aaf.auth.layer.Result; import org.onap.aaf.misc.env.APIException; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/PermDelete.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/PermDelete.java index db549948..b9ae8d56 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/PermDelete.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/PermDelete.java @@ -19,13 +19,13 @@ * */ -package org.onap.aaf.auth.actions; +package org.onap.aaf.auth.batch.actions; import java.io.IOException; +import org.onap.aaf.auth.batch.helpers.Perm; import org.onap.aaf.auth.dao.cass.PermDAO; import org.onap.aaf.auth.env.AuthzTrans; -import org.onap.aaf.auth.helpers.Perm; import org.onap.aaf.auth.layer.Result; import org.onap.aaf.misc.env.APIException; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/PermModify.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/PermModify.java index a3d4bb6d..4b76baf5 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/PermModify.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/PermModify.java @@ -19,18 +19,18 @@ * */ -package org.onap.aaf.auth.actions; +package org.onap.aaf.auth.batch.actions; import java.io.IOException; import java.util.List; +import org.onap.aaf.auth.batch.helpers.Perm; +import org.onap.aaf.auth.batch.helpers.Role; import org.onap.aaf.auth.dao.cass.PermDAO; import org.onap.aaf.auth.dao.cass.RoleDAO; import org.onap.aaf.auth.dao.cass.Status; import org.onap.aaf.auth.dao.cass.PermDAO.Data; import org.onap.aaf.auth.env.AuthzTrans; -import org.onap.aaf.auth.helpers.Perm; -import org.onap.aaf.auth.helpers.Role; import org.onap.aaf.auth.layer.Result; import org.onap.aaf.misc.env.APIException; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/RoleCreate.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/RoleCreate.java index cdbe92b4..512d4a31 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/RoleCreate.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/RoleCreate.java @@ -19,14 +19,14 @@ * */ -package org.onap.aaf.auth.actions; +package org.onap.aaf.auth.batch.actions; import java.io.IOException; +import org.onap.aaf.auth.batch.helpers.Role; import org.onap.aaf.auth.dao.cass.RoleDAO; import org.onap.aaf.auth.dao.cass.RoleDAO.Data; import org.onap.aaf.auth.env.AuthzTrans; -import org.onap.aaf.auth.helpers.Role; import org.onap.aaf.auth.layer.Result; import org.onap.aaf.misc.env.APIException; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/RoleDelete.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/RoleDelete.java index 67491b5b..3e109b2b 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/RoleDelete.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/RoleDelete.java @@ -19,13 +19,13 @@ * */ -package org.onap.aaf.auth.actions; +package org.onap.aaf.auth.batch.actions; import java.io.IOException; +import org.onap.aaf.auth.batch.helpers.Role; import org.onap.aaf.auth.dao.cass.RoleDAO; import org.onap.aaf.auth.env.AuthzTrans; -import org.onap.aaf.auth.helpers.Role; import org.onap.aaf.auth.layer.Result; import org.onap.aaf.misc.env.APIException; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/RoleModify.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/RoleModify.java index 75937ef7..388e6692 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/RoleModify.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/RoleModify.java @@ -19,18 +19,18 @@ * */ -package org.onap.aaf.auth.actions; +package org.onap.aaf.auth.batch.actions; import java.io.IOException; import java.util.List; +import org.onap.aaf.auth.batch.helpers.Perm; +import org.onap.aaf.auth.batch.helpers.Role; import org.onap.aaf.auth.dao.cass.PermDAO; import org.onap.aaf.auth.dao.cass.RoleDAO; import org.onap.aaf.auth.dao.cass.Status; import org.onap.aaf.auth.dao.cass.RoleDAO.Data; import org.onap.aaf.auth.env.AuthzTrans; -import org.onap.aaf.auth.helpers.Perm; -import org.onap.aaf.auth.helpers.Role; import org.onap.aaf.auth.layer.Result; import org.onap.aaf.misc.env.APIException; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URAdd.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URAdd.java index 4538c56b..e0c1bb80 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URAdd.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URAdd.java @@ -19,14 +19,14 @@ * */ -package org.onap.aaf.auth.actions; +package org.onap.aaf.auth.batch.actions; import java.io.IOException; +import org.onap.aaf.auth.batch.helpers.UserRole; import org.onap.aaf.auth.dao.cass.UserRoleDAO; import org.onap.aaf.auth.dao.cass.UserRoleDAO.Data; import org.onap.aaf.auth.env.AuthzTrans; -import org.onap.aaf.auth.helpers.UserRole; import org.onap.aaf.auth.layer.Result; import org.onap.aaf.misc.env.APIException; import org.onap.aaf.misc.env.util.Chrono; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URDelete.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URDelete.java index cf519f6f..00208ad9 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URDelete.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URDelete.java @@ -19,12 +19,12 @@ * */ -package org.onap.aaf.auth.actions; +package org.onap.aaf.auth.batch.actions; import java.io.IOException; +import org.onap.aaf.auth.batch.helpers.UserRole; import org.onap.aaf.auth.env.AuthzTrans; -import org.onap.aaf.auth.helpers.UserRole; import org.onap.aaf.auth.layer.Result; import org.onap.aaf.misc.env.APIException; import org.onap.aaf.misc.env.util.Chrono; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URFutureApprove.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URFutureApprove.java index 63d4ef7c..a228a8ca 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URFutureApprove.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URFutureApprove.java @@ -19,20 +19,20 @@ * */ -package org.onap.aaf.auth.actions; +package org.onap.aaf.auth.batch.actions; import java.io.IOException; import java.util.Date; import java.util.GregorianCalendar; +import org.onap.aaf.auth.batch.helpers.Approval; +import org.onap.aaf.auth.batch.helpers.UserRole; import org.onap.aaf.auth.dao.cass.FutureDAO; import org.onap.aaf.auth.dao.cass.NsDAO; import org.onap.aaf.auth.dao.hl.Function; import org.onap.aaf.auth.dao.hl.Question; import org.onap.aaf.auth.dao.hl.Function.FUTURE_OP; import org.onap.aaf.auth.env.AuthzTrans; -import org.onap.aaf.auth.helpers.Approval; -import org.onap.aaf.auth.helpers.UserRole; import org.onap.aaf.auth.layer.Result; import org.onap.aaf.auth.org.Organization.Expiration; import org.onap.aaf.misc.env.APIException; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URFutureApproveExec.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URFutureApproveExec.java index 75bbd813..631a8115 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URFutureApproveExec.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URFutureApproveExec.java @@ -19,12 +19,15 @@ * */ -package org.onap.aaf.auth.actions; +package org.onap.aaf.auth.batch.actions; import java.io.IOException; import java.util.ArrayList; import java.util.List; +import org.onap.aaf.auth.batch.helpers.Approval; +import org.onap.aaf.auth.batch.helpers.Future; +import org.onap.aaf.auth.batch.helpers.UserRole; import org.onap.aaf.auth.dao.cass.ApprovalDAO; import org.onap.aaf.auth.dao.cass.UserRoleDAO; import org.onap.aaf.auth.dao.cass.ApprovalDAO.Data; @@ -32,9 +35,6 @@ import org.onap.aaf.auth.dao.hl.Function.FUTURE_OP; import org.onap.aaf.auth.dao.hl.Function.Lookup; import org.onap.aaf.auth.dao.hl.Function.OP_STATUS; import org.onap.aaf.auth.env.AuthzTrans; -import org.onap.aaf.auth.helpers.Approval; -import org.onap.aaf.auth.helpers.Future; -import org.onap.aaf.auth.helpers.UserRole; import org.onap.aaf.auth.layer.Result; import org.onap.aaf.misc.env.APIException; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URFuturePrint.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URFuturePrint.java index b749c648..bf6ead36 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URFuturePrint.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URFuturePrint.java @@ -19,10 +19,10 @@ * */ -package org.onap.aaf.auth.actions; +package org.onap.aaf.auth.batch.actions; +import org.onap.aaf.auth.batch.helpers.UserRole; import org.onap.aaf.auth.env.AuthzTrans; -import org.onap.aaf.auth.helpers.UserRole; import org.onap.aaf.auth.layer.Result; import org.onap.aaf.misc.env.util.Chrono; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URModify.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URModify.java index 12460c97..a17c4fd2 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URModify.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URModify.java @@ -19,16 +19,16 @@ * */ -package org.onap.aaf.auth.actions; +package org.onap.aaf.auth.batch.actions; import java.io.IOException; import java.util.List; +import org.onap.aaf.auth.batch.helpers.UserRole; import org.onap.aaf.auth.dao.cass.Status; import org.onap.aaf.auth.dao.cass.UserRoleDAO; import org.onap.aaf.auth.dao.cass.UserRoleDAO.Data; import org.onap.aaf.auth.env.AuthzTrans; -import org.onap.aaf.auth.helpers.UserRole; import org.onap.aaf.auth.layer.Result; import org.onap.aaf.misc.env.APIException; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URPrint.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URPrint.java index be464d42..12eb115a 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URPrint.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URPrint.java @@ -19,10 +19,10 @@ * */ -package org.onap.aaf.auth.actions; +package org.onap.aaf.auth.batch.actions; +import org.onap.aaf.auth.batch.helpers.UserRole; import org.onap.aaf.auth.env.AuthzTrans; -import org.onap.aaf.auth.helpers.UserRole; import org.onap.aaf.auth.layer.Result; import org.onap.aaf.misc.env.util.Chrono; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URPunt.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URPunt.java index 6371ebb5..18705fb8 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URPunt.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/actions/URPunt.java @@ -19,16 +19,16 @@ * */ -package org.onap.aaf.auth.actions; +package org.onap.aaf.auth.batch.actions; import java.io.IOException; import java.util.Date; import java.util.List; +import org.onap.aaf.auth.batch.helpers.UserRole; import org.onap.aaf.auth.dao.cass.UserRoleDAO; import org.onap.aaf.auth.dao.cass.UserRoleDAO.Data; import org.onap.aaf.auth.env.AuthzTrans; -import org.onap.aaf.auth.helpers.UserRole; import org.onap.aaf.auth.layer.Result; import org.onap.aaf.misc.env.APIException; import org.onap.aaf.misc.env.util.Chrono; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Approval.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Approval.java index a4c4efbc..fb3aefbe 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Approval.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Approval.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers; +package org.onap.aaf.auth.batch.helpers; import java.util.ArrayList; import java.util.Date; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Approver.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Approver.java index 977964f1..6e27495f 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Approver.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Approver.java @@ -19,12 +19,12 @@ * */ -package org.onap.aaf.auth.helpers; +package org.onap.aaf.auth.batch.helpers; import java.util.HashMap; import java.util.Map; -import org.onap.aaf.auth.actions.Message; +import org.onap.aaf.auth.batch.actions.Message; import org.onap.aaf.auth.org.Organization; public class Approver { diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/CQLBatch.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/CQLBatch.java index e4d487d6..5df5dcdc 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/CQLBatch.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/CQLBatch.java @@ -18,7 +18,7 @@ * ============LICENSE_END==================================================== */ -package org.onap.aaf.auth.helpers; +package org.onap.aaf.auth.batch.helpers; import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Session; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/CacheChange.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/CacheChange.java index 1407bdd0..a4cfcbec 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/CacheChange.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/CacheChange.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers; +package org.onap.aaf.auth.batch.helpers; import java.util.ArrayList; import java.util.List; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Creator.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Creator.java index a3eb8363..152c6331 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Creator.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Creator.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers; +package org.onap.aaf.auth.batch.helpers; import com.datastax.driver.core.Row; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Cred.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Cred.java index ec609488..979cdf0b 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Cred.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Cred.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers; +package org.onap.aaf.auth.batch.helpers; import java.util.ArrayList; import java.util.Date; 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 new file mode 100644 index 00000000..f6a25e7f --- /dev/null +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/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.batch.helpers; + +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-batch/src/main/java/org/onap/aaf/auth/helpers/Future.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Future.java index 8a11479e..ac4a1323 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Future.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Future.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers; +package org.onap.aaf.auth.batch.helpers; import java.nio.ByteBuffer; import java.util.ArrayList; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/History.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/History.java index cffb55a5..a172738c 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/History.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/History.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers; +package org.onap.aaf.auth.batch.helpers; import java.nio.ByteBuffer; import java.util.Iterator; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/InputIterator.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/InputIterator.java index 5fb3e5dc..04d9a019 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/InputIterator.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/InputIterator.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers; +package org.onap.aaf.auth.batch.helpers; import java.io.BufferedReader; import java.io.IOException; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Loader.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Loader.java index 1ec64b7b..ea533b8b 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Loader.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Loader.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers; +package org.onap.aaf.auth.batch.helpers; public interface Loader<T> { public void exec(T t); diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/MiscID.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/MiscID.java index 8eecb656..45875a20 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/MiscID.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/MiscID.java @@ -19,12 +19,12 @@ * */ -package org.onap.aaf.auth.helpers; +package org.onap.aaf.auth.batch.helpers; import java.util.Map; import java.util.TreeMap; -import org.onap.aaf.auth.BatchException; +import org.onap.aaf.auth.batch.BatchException; import org.onap.aaf.misc.env.Env; import org.onap.aaf.misc.env.TimeTaken; import org.onap.aaf.misc.env.Trans; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/MonthData.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/MonthData.java index e15a6bc2..35ad6a10 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/MonthData.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/MonthData.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers; +package org.onap.aaf.auth.batch.helpers; import java.io.BufferedReader; import java.io.File; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/NS.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/NS.java index 5692d116..3df72e12 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/NS.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/NS.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers; +package org.onap.aaf.auth.batch.helpers; import java.util.Iterator; import java.util.Map; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Notification.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Notification.java index b178c377..5c7a8269 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Notification.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Notification.java @@ -19,14 +19,14 @@ * */ -package org.onap.aaf.auth.helpers; +package org.onap.aaf.auth.batch.helpers; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.TreeMap; -import org.onap.aaf.auth.actions.Message; +import org.onap.aaf.auth.batch.actions.Message; import org.onap.aaf.auth.env.AuthzTrans; import org.onap.aaf.auth.org.Organization; import org.onap.aaf.misc.env.Env; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/NsAttrib.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/NsAttrib.java index a3354f38..c8419d50 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/NsAttrib.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/NsAttrib.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers; +package org.onap.aaf.auth.batch.helpers; import java.util.ArrayList; import java.util.List; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Perm.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Perm.java index ee588f31..21bd71ee 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Perm.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Perm.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers; +package org.onap.aaf.auth.batch.helpers; import java.util.ArrayList; import java.util.Iterator; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Role.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Role.java index 04a5dceb..4b4a2551 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Role.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Role.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers; +package org.onap.aaf.auth.batch.helpers; import java.util.ArrayList; import java.util.HashSet; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/UserRole.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/UserRole.java index d9e6bed3..30069d64 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/UserRole.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/UserRole.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers; +package org.onap.aaf.auth.batch.helpers; import java.io.PrintStream; import java.util.ArrayList; @@ -29,7 +29,7 @@ import java.util.List; import java.util.SortedMap; import java.util.TreeMap; -import org.onap.aaf.auth.actions.URDelete; +import org.onap.aaf.auth.batch.actions.URDelete; import org.onap.aaf.auth.dao.cass.UserRoleDAO; import org.onap.aaf.auth.dao.cass.UserRoleDAO.Data; import org.onap.aaf.auth.env.AuthzTrans; @@ -106,6 +106,10 @@ public class UserRole implements Cloneable, CacheChange.Data { return byRole; } + public static void load(Trans trans, Session session, Creator<UserRole> creator) { + load(trans,session,creator,null,new DataLoadVisitor()); + } + public static void load(Trans trans, Session session, Creator<UserRole> creator, Visitor<UserRole> visitor ) { load(trans,session,creator,null,visitor); } diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Visitor.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Visitor.java index 1eb9ffec..a59064ee 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Visitor.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Visitor.java @@ -18,7 +18,7 @@ * ============LICENSE_END==================================================== */ -package org.onap.aaf.auth.helpers; +package org.onap.aaf.auth.batch.helpers; public interface Visitor<T> { void visit(T t); diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/X509.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/X509.java index 95fe3c0e..8bdcd100 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/X509.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/X509.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers; +package org.onap.aaf.auth.batch.helpers; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/reports/Expiring.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Expiring.java index 289da58e..1a7db055 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/reports/Expiring.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Expiring.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.reports; +package org.onap.aaf.auth.batch.reports; import java.io.File; import java.io.FileNotFoundException; @@ -35,16 +35,16 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; -import org.onap.aaf.auth.Batch; +import org.onap.aaf.auth.batch.Batch; +import org.onap.aaf.auth.batch.helpers.Cred; +import org.onap.aaf.auth.batch.helpers.ExpireRange; +import org.onap.aaf.auth.batch.helpers.UserRole; +import org.onap.aaf.auth.batch.helpers.Visitor; +import org.onap.aaf.auth.batch.helpers.X509; +import org.onap.aaf.auth.batch.helpers.Cred.Instance; +import org.onap.aaf.auth.batch.helpers.ExpireRange.Range; import org.onap.aaf.auth.dao.cass.CredDAO; import org.onap.aaf.auth.env.AuthzTrans; -import org.onap.aaf.auth.helpers.Cred; -import org.onap.aaf.auth.helpers.Cred.Instance; -import org.onap.aaf.auth.helpers.UserRole; -import org.onap.aaf.auth.helpers.Visitor; -import org.onap.aaf.auth.helpers.X509; -import org.onap.aaf.auth.org.ExpireRange; -import org.onap.aaf.auth.org.ExpireRange.Range; import org.onap.aaf.auth.org.OrganizationException; import org.onap.aaf.cadi.configure.Factory; import org.onap.aaf.cadi.util.CSV; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/update/ExpiringOrig.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/ExpiringOrig.java index 36d08b7a..7b6487a0 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/update/ExpiringOrig.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/ExpiringOrig.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.update; +package org.onap.aaf.auth.batch.update; import java.io.BufferedReader; import java.io.File; @@ -32,32 +32,32 @@ import java.util.GregorianCalendar; import java.util.List; import java.util.UUID; -import org.onap.aaf.auth.Batch; -import org.onap.aaf.auth.BatchPrincipal; -import org.onap.aaf.auth.actions.Action; -import org.onap.aaf.auth.actions.ActionDAO; -import org.onap.aaf.auth.actions.CacheTouch; -import org.onap.aaf.auth.actions.CredDelete; -import org.onap.aaf.auth.actions.CredPrint; -import org.onap.aaf.auth.actions.Email; -import org.onap.aaf.auth.actions.Message; -import org.onap.aaf.auth.actions.URDelete; -import org.onap.aaf.auth.actions.URFutureApprove; -import org.onap.aaf.auth.actions.URFutureApproveExec; -import org.onap.aaf.auth.actions.URPrint; +import org.onap.aaf.auth.batch.Batch; +import org.onap.aaf.auth.batch.BatchPrincipal; +import org.onap.aaf.auth.batch.actions.Action; +import org.onap.aaf.auth.batch.actions.ActionDAO; +import org.onap.aaf.auth.batch.actions.CacheTouch; +import org.onap.aaf.auth.batch.actions.CredDelete; +import org.onap.aaf.auth.batch.actions.CredPrint; +import org.onap.aaf.auth.batch.actions.Email; +import org.onap.aaf.auth.batch.actions.Message; +import org.onap.aaf.auth.batch.actions.URDelete; +import org.onap.aaf.auth.batch.actions.URFutureApprove; +import org.onap.aaf.auth.batch.actions.URFutureApproveExec; +import org.onap.aaf.auth.batch.actions.URPrint; +import org.onap.aaf.auth.batch.helpers.Approval; +import org.onap.aaf.auth.batch.helpers.Cred; +import org.onap.aaf.auth.batch.helpers.Future; +import org.onap.aaf.auth.batch.helpers.NS; +import org.onap.aaf.auth.batch.helpers.Role; +import org.onap.aaf.auth.batch.helpers.UserRole; +import org.onap.aaf.auth.batch.helpers.Cred.Instance; import org.onap.aaf.auth.dao.cass.ApprovalDAO; import org.onap.aaf.auth.dao.cass.CredDAO; import org.onap.aaf.auth.dao.cass.FutureDAO; import org.onap.aaf.auth.dao.hl.Function.FUTURE_OP; import org.onap.aaf.auth.dao.hl.Function.OP_STATUS; import org.onap.aaf.auth.env.AuthzTrans; -import org.onap.aaf.auth.helpers.Approval; -import org.onap.aaf.auth.helpers.Cred; -import org.onap.aaf.auth.helpers.Future; -import org.onap.aaf.auth.helpers.NS; -import org.onap.aaf.auth.helpers.Role; -import org.onap.aaf.auth.helpers.UserRole; -import org.onap.aaf.auth.helpers.Cred.Instance; import org.onap.aaf.auth.layer.Result; import org.onap.aaf.auth.org.OrganizationException; import org.onap.aaf.auth.org.Organization.Identity; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/update/ExpiringP2.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/ExpiringP2.java index dae62573..a75f0a1c 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/update/ExpiringP2.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/ExpiringP2.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.update; +package org.onap.aaf.auth.batch.update; import java.io.BufferedReader; import java.io.File; @@ -30,14 +30,14 @@ import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; -import org.onap.aaf.auth.Batch; -import org.onap.aaf.auth.BatchPrincipal; -import org.onap.aaf.auth.actions.Action; -import org.onap.aaf.auth.actions.ActionDAO; -import org.onap.aaf.auth.actions.CacheTouch; -import org.onap.aaf.auth.actions.URDelete; +import org.onap.aaf.auth.batch.Batch; +import org.onap.aaf.auth.batch.BatchPrincipal; +import org.onap.aaf.auth.batch.actions.Action; +import org.onap.aaf.auth.batch.actions.ActionDAO; +import org.onap.aaf.auth.batch.actions.CacheTouch; +import org.onap.aaf.auth.batch.actions.URDelete; +import org.onap.aaf.auth.batch.helpers.UserRole; import org.onap.aaf.auth.env.AuthzTrans; -import org.onap.aaf.auth.helpers.UserRole; import org.onap.aaf.auth.org.OrganizationException; import org.onap.aaf.cadi.util.Split; import org.onap.aaf.misc.env.APIException; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/update/NotifyApprovals.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/NotifyApprovals.java index 50c6dc21..c88eecde 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/update/NotifyApprovals.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/NotifyApprovals.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.update; +package org.onap.aaf.auth.batch.update; import java.io.FileOutputStream; import java.io.IOException; @@ -30,18 +30,18 @@ import java.util.GregorianCalendar; import java.util.List; import java.util.Map.Entry; -import org.onap.aaf.auth.Batch; -import org.onap.aaf.auth.BatchPrincipal; -import org.onap.aaf.auth.actions.Email; -import org.onap.aaf.auth.actions.EmailPrint; -import org.onap.aaf.auth.actions.Message; +import org.onap.aaf.auth.batch.Batch; +import org.onap.aaf.auth.batch.BatchPrincipal; +import org.onap.aaf.auth.batch.actions.Email; +import org.onap.aaf.auth.batch.actions.EmailPrint; +import org.onap.aaf.auth.batch.actions.Message; +import org.onap.aaf.auth.batch.helpers.Approval; +import org.onap.aaf.auth.batch.helpers.Future; import org.onap.aaf.auth.dao.CassAccess; import org.onap.aaf.auth.dao.cass.ApprovalDAO; import org.onap.aaf.auth.dao.cass.FutureDAO; import org.onap.aaf.auth.dao.cass.HistoryDAO; import org.onap.aaf.auth.env.AuthzTrans; -import org.onap.aaf.auth.helpers.Approval; -import org.onap.aaf.auth.helpers.Future; import org.onap.aaf.auth.org.Organization; import org.onap.aaf.auth.org.OrganizationException; import org.onap.aaf.auth.org.OrganizationFactory; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/update/NotifyCredExpiring.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/NotifyCredExpiring.java index 848b54e8..ab7525b6 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/update/NotifyCredExpiring.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/NotifyCredExpiring.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.update; +package org.onap.aaf.auth.batch.update; import java.io.File; import java.io.FileOutputStream; @@ -38,19 +38,19 @@ import java.util.Map.Entry; import java.util.Set; import java.util.TreeMap; -import org.onap.aaf.auth.Batch; -import org.onap.aaf.auth.BatchPrincipal; -import org.onap.aaf.auth.actions.Email; -import org.onap.aaf.auth.actions.EmailPrint; -import org.onap.aaf.auth.actions.Message; +import org.onap.aaf.auth.batch.Batch; +import org.onap.aaf.auth.batch.BatchPrincipal; +import org.onap.aaf.auth.batch.actions.Email; +import org.onap.aaf.auth.batch.actions.EmailPrint; +import org.onap.aaf.auth.batch.actions.Message; +import org.onap.aaf.auth.batch.helpers.Cred; +import org.onap.aaf.auth.batch.helpers.NS; +import org.onap.aaf.auth.batch.helpers.Notification; +import org.onap.aaf.auth.batch.helpers.UserRole; +import org.onap.aaf.auth.batch.helpers.Notification.TYPE; import org.onap.aaf.auth.dao.cass.CredDAO; import org.onap.aaf.auth.dao.hl.Question; import org.onap.aaf.auth.env.AuthzTrans; -import org.onap.aaf.auth.helpers.Cred; -import org.onap.aaf.auth.helpers.NS; -import org.onap.aaf.auth.helpers.Notification; -import org.onap.aaf.auth.helpers.Notification.TYPE; -import org.onap.aaf.auth.helpers.UserRole; import org.onap.aaf.auth.layer.Result; import org.onap.aaf.auth.org.EmailWarnings; import org.onap.aaf.auth.org.Organization; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/update/Remove.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/Remove.java index d35cfd34..a884006c 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/update/Remove.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/Remove.java @@ -19,20 +19,20 @@ * */ -package org.onap.aaf.auth.update; +package org.onap.aaf.auth.batch.update; import java.io.File; import java.io.IOException; import java.util.List; -import org.onap.aaf.auth.Batch; -import org.onap.aaf.auth.BatchPrincipal; -import org.onap.aaf.auth.actions.CacheTouch; +import org.onap.aaf.auth.batch.Batch; +import org.onap.aaf.auth.batch.BatchPrincipal; +import org.onap.aaf.auth.batch.actions.CacheTouch; +import org.onap.aaf.auth.batch.helpers.CQLBatch; +import org.onap.aaf.auth.batch.helpers.Cred; +import org.onap.aaf.auth.batch.helpers.UserRole; +import org.onap.aaf.auth.batch.helpers.X509; import org.onap.aaf.auth.env.AuthzTrans; -import org.onap.aaf.auth.helpers.CQLBatch; -import org.onap.aaf.auth.helpers.Cred; -import org.onap.aaf.auth.helpers.UserRole; -import org.onap.aaf.auth.helpers.X509; import org.onap.aaf.auth.org.OrganizationException; import org.onap.aaf.cadi.CadiException; import org.onap.aaf.cadi.client.Holder; diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/update/Upload.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/Upload.java index a670f37d..76472b5f 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/update/Upload.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/Upload.java @@ -18,7 +18,7 @@ * ============LICENSE_END==================================================== */ -package org.onap.aaf.auth.update; +package org.onap.aaf.auth.batch.update; import java.io.BufferedReader; import java.io.File; @@ -27,7 +27,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.onap.aaf.auth.Batch; +import org.onap.aaf.auth.batch.Batch; import org.onap.aaf.auth.env.AuthzTrans; import org.onap.aaf.auth.org.OrganizationException; import org.onap.aaf.misc.env.APIException; |