From 71340cf50ea2c0fc9cfd0670052c4b4fcabe3db6 Mon Sep 17 00:00:00 2001 From: Instrumental Date: Fri, 30 Nov 2018 14:21:02 -0600 Subject: [PATCH] Change Batch Packaging Issue-ID: AAF-654 Change-Id: Iaa1eab5d43717e7ffe51933511c9b232a5a1d770 Signed-off-by: Instrumental --- .../java/org/onap/aaf/auth/{ => batch}/Batch.java | 2 +- .../onap/aaf/auth/{ => batch}/BatchException.java | 2 +- .../onap/aaf/auth/{ => batch}/BatchPrincipal.java | 2 +- .../org/onap/aaf/auth/{ => batch}/CassBatch.java | 2 +- .../onap/aaf/auth/{ => batch}/actions/Action.java | 2 +- .../aaf/auth/{ => batch}/actions/ActionDAO.java | 2 +- .../auth/{ => batch}/actions/ActionPuntDAO.java | 2 +- .../aaf/auth/{ => batch}/actions/CacheTouch.java | 2 +- .../aaf/auth/{ => batch}/actions/CredDelete.java | 2 +- .../aaf/auth/{ => batch}/actions/CredPrint.java | 2 +- .../aaf/auth/{ => batch}/actions/CredPunt.java | 2 +- .../onap/aaf/auth/{ => batch}/actions/Email.java | 2 +- .../aaf/auth/{ => batch}/actions/EmailPrint.java | 2 +- .../aaf/auth/{ => batch}/actions/FuturePrint.java | 4 +-- .../org/onap/aaf/auth/{ => batch}/actions/Key.java | 2 +- .../onap/aaf/auth/{ => batch}/actions/Message.java | 2 +- .../aaf/auth/{ => batch}/actions/NSACreate.java | 4 +-- .../aaf/auth/{ => batch}/actions/NSADelete.java | 4 +-- .../aaf/auth/{ => batch}/actions/NSDescUpdate.java | 4 +-- .../aaf/auth/{ => batch}/actions/PermCreate.java | 4 +-- .../aaf/auth/{ => batch}/actions/PermDelete.java | 4 +-- .../aaf/auth/{ => batch}/actions/PermModify.java | 6 ++-- .../aaf/auth/{ => batch}/actions/RoleCreate.java | 4 +-- .../aaf/auth/{ => batch}/actions/RoleDelete.java | 4 +-- .../aaf/auth/{ => batch}/actions/RoleModify.java | 6 ++-- .../onap/aaf/auth/{ => batch}/actions/URAdd.java | 4 +-- .../aaf/auth/{ => batch}/actions/URDelete.java | 4 +-- .../auth/{ => batch}/actions/URFutureApprove.java | 6 ++-- .../{ => batch}/actions/URFutureApproveExec.java | 8 ++--- .../auth/{ => batch}/actions/URFuturePrint.java | 4 +-- .../aaf/auth/{ => batch}/actions/URModify.java | 4 +-- .../onap/aaf/auth/{ => batch}/actions/URPrint.java | 4 +-- .../onap/aaf/auth/{ => batch}/actions/URPunt.java | 4 +-- .../aaf/auth/{ => batch}/helpers/Approval.java | 2 +- .../aaf/auth/{ => batch}/helpers/Approver.java | 4 +-- .../aaf/auth/{ => batch}/helpers/CQLBatch.java | 2 +- .../aaf/auth/{ => batch}/helpers/CacheChange.java | 2 +- .../onap/aaf/auth/{ => batch}/helpers/Creator.java | 2 +- .../onap/aaf/auth/{ => batch}/helpers/Cred.java | 2 +- .../onap/aaf/auth/batch/helpers}/ExpireRange.java | 2 +- .../onap/aaf/auth/{ => batch}/helpers/Future.java | 2 +- .../onap/aaf/auth/{ => batch}/helpers/History.java | 2 +- .../auth/{ => batch}/helpers/InputIterator.java | 2 +- .../onap/aaf/auth/{ => batch}/helpers/Loader.java | 2 +- .../onap/aaf/auth/{ => batch}/helpers/MiscID.java | 4 +-- .../aaf/auth/{ => batch}/helpers/MonthData.java | 2 +- .../org/onap/aaf/auth/{ => batch}/helpers/NS.java | 2 +- .../aaf/auth/{ => batch}/helpers/Notification.java | 4 +-- .../aaf/auth/{ => batch}/helpers/NsAttrib.java | 2 +- .../onap/aaf/auth/{ => batch}/helpers/Perm.java | 2 +- .../onap/aaf/auth/{ => batch}/helpers/Role.java | 2 +- .../aaf/auth/{ => batch}/helpers/UserRole.java | 8 +++-- .../onap/aaf/auth/{ => batch}/helpers/Visitor.java | 2 +- .../onap/aaf/auth/{ => batch}/helpers/X509.java | 2 +- .../aaf/auth/{ => batch}/reports/Expiring.java | 18 +++++----- .../aaf/auth/{ => batch}/update/ExpiringOrig.java | 42 +++++++++++----------- .../aaf/auth/{ => batch}/update/ExpiringP2.java | 16 ++++----- .../auth/{ => batch}/update/NotifyApprovals.java | 16 ++++----- .../{ => batch}/update/NotifyCredExpiring.java | 22 ++++++------ .../onap/aaf/auth/{ => batch}/update/Remove.java | 16 ++++----- .../onap/aaf/auth/{ => batch}/update/Upload.java | 4 +-- .../{ => batch}/actions/test/JU_ActionDAO.java | 4 +-- .../{ => batch}/actions/test/JU_CredPrintTest.java | 4 +-- .../auth/{ => batch}/actions/test/JU_Email.java | 6 ++-- .../{ => batch}/actions/test/JU_EmailPrint.java | 4 +-- .../actions/test/JU_FuturePrintTest.java | 6 ++-- .../auth/{ => batch}/actions/test/JU_Message.java | 4 +-- .../actions/test/JU_URFuturePrintTest.java | 6 ++-- .../{ => batch}/actions/test/JU_URPrintTest.java | 6 ++-- .../{ => batch}/helpers/creators/RowCreator.java | 2 +- .../auth/{ => batch}/helpers/test/JU_Approval.java | 6 ++-- .../auth/{ => batch}/helpers/test/JU_Approver.java | 6 ++-- .../{ => batch}/helpers/test/JU_CacheChange.java | 4 +-- .../auth/{ => batch}/helpers/test/JU_Creator.java | 4 +-- .../aaf/auth/{ => batch}/helpers/test/JU_Cred.java | 8 ++--- .../auth/batch/helpers}/test/JU_ExpireRange.java | 4 +-- .../auth/{ => batch}/helpers/test/JU_Future.java | 8 ++--- .../auth/{ => batch}/helpers/test/JU_History.java | 4 +-- .../{ => batch}/helpers/test/JU_InputIterator.java | 4 +-- .../auth/{ => batch}/helpers/test/JU_MiscID.java | 6 ++-- .../{ => batch}/helpers/test/JU_MonthData.java | 6 ++-- .../aaf/auth/{ => batch}/helpers/test/JU_NS.java | 10 +++--- .../auth/{ => batch}/helpers/test/JU_NsAttrib.java | 6 ++-- .../aaf/auth/{ => batch}/helpers/test/JU_Perm.java | 4 +-- .../aaf/auth/{ => batch}/helpers/test/JU_Role.java | 6 ++-- .../auth/{ => batch}/helpers/test/JU_UserRole.java | 10 +++--- .../onap/aaf/auth/{ => batch}/test/JU_Batch.java | 4 +-- .../auth/{ => batch}/test/JU_BatchException.java | 4 +-- .../auth/{ => batch}/test/JU_BatchPrincipal.java | 4 +-- .../aaf/auth/{ => batch}/test/JU_CassBatch.java | 4 +-- .../test}/JU_NotificationTest.java | 10 +++--- 91 files changed, 235 insertions(+), 229 deletions(-) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/Batch.java (99%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/BatchException.java (97%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/BatchPrincipal.java (97%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/CassBatch.java (98%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/actions/Action.java (96%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/actions/ActionDAO.java (98%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/actions/ActionPuntDAO.java (98%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/actions/CacheTouch.java (97%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/actions/CredDelete.java (98%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/actions/CredPrint.java (97%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/actions/CredPunt.java (98%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/actions/Email.java (99%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/actions/EmailPrint.java (98%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/actions/FuturePrint.java (94%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/actions/Key.java (96%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/actions/Message.java (97%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/actions/NSACreate.java (95%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/actions/NSADelete.java (95%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/actions/NSDescUpdate.java (96%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/actions/PermCreate.java (96%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/actions/PermDelete.java (96%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/actions/PermModify.java (97%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/actions/RoleCreate.java (96%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/actions/RoleDelete.java (96%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/actions/RoleModify.java (97%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/actions/URAdd.java (95%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/actions/URDelete.java (96%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/actions/URFutureApprove.java (96%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/actions/URFutureApproveExec.java (95%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/actions/URFuturePrint.java (93%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/actions/URModify.java (97%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/actions/URPrint.java (94%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/actions/URPunt.java (96%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/helpers/Approval.java (99%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/helpers/Approver.java (95%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/helpers/CQLBatch.java (97%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/helpers/CacheChange.java (97%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/helpers/Creator.java (97%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/helpers/Cred.java (99%) rename auth/{auth-core/src/main/java/org/onap/aaf/auth/org => auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers}/ExpireRange.java (99%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/helpers/Future.java (99%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/helpers/History.java (99%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/helpers/InputIterator.java (98%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/helpers/Loader.java (96%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/helpers/MiscID.java (98%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/helpers/MonthData.java (98%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/helpers/NS.java (99%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/helpers/Notification.java (98%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/helpers/NsAttrib.java (98%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/helpers/Perm.java (99%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/helpers/Role.java (99%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/helpers/UserRole.java (97%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/helpers/Visitor.java (96%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/helpers/X509.java (98%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/reports/Expiring.java (95%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/update/ExpiringOrig.java (95%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/update/ExpiringP2.java (93%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/update/NotifyApprovals.java (97%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/update/NotifyCredExpiring.java (97%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/update/Remove.java (90%) rename auth/auth-batch/src/main/java/org/onap/aaf/auth/{ => batch}/update/Upload.java (99%) rename auth/auth-batch/src/test/java/org/onap/aaf/auth/{ => batch}/actions/test/JU_ActionDAO.java (96%) rename auth/auth-batch/src/test/java/org/onap/aaf/auth/{ => batch}/actions/test/JU_CredPrintTest.java (95%) rename auth/auth-batch/src/test/java/org/onap/aaf/auth/{ => batch}/actions/test/JU_Email.java (96%) rename auth/auth-batch/src/test/java/org/onap/aaf/auth/{ => batch}/actions/test/JU_EmailPrint.java (96%) rename auth/auth-batch/src/test/java/org/onap/aaf/auth/{ => batch}/actions/test/JU_FuturePrintTest.java (92%) rename auth/auth-batch/src/test/java/org/onap/aaf/auth/{ => batch}/actions/test/JU_Message.java (94%) rename auth/auth-batch/src/test/java/org/onap/aaf/auth/{ => batch}/actions/test/JU_URFuturePrintTest.java (92%) rename auth/auth-batch/src/test/java/org/onap/aaf/auth/{ => batch}/actions/test/JU_URPrintTest.java (92%) rename auth/auth-batch/src/test/java/org/onap/aaf/auth/{ => batch}/helpers/creators/RowCreator.java (99%) rename auth/auth-batch/src/test/java/org/onap/aaf/auth/{ => batch}/helpers/test/JU_Approval.java (97%) rename auth/auth-batch/src/test/java/org/onap/aaf/auth/{ => batch}/helpers/test/JU_Approver.java (92%) rename auth/auth-batch/src/test/java/org/onap/aaf/auth/{ => batch}/helpers/test/JU_CacheChange.java (95%) rename auth/auth-batch/src/test/java/org/onap/aaf/auth/{ => batch}/helpers/test/JU_Creator.java (95%) rename auth/auth-batch/src/test/java/org/onap/aaf/auth/{ => batch}/helpers/test/JU_Cred.java (95%) rename auth/{auth-core/src/test/java/org/onap/aaf/auth/org => auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers}/test/JU_ExpireRange.java (95%) rename auth/auth-batch/src/test/java/org/onap/aaf/auth/{ => batch}/helpers/test/JU_Future.java (96%) rename auth/auth-batch/src/test/java/org/onap/aaf/auth/{ => batch}/helpers/test/JU_History.java (95%) rename auth/auth-batch/src/test/java/org/onap/aaf/auth/{ => batch}/helpers/test/JU_InputIterator.java (95%) rename auth/auth-batch/src/test/java/org/onap/aaf/auth/{ => batch}/helpers/test/JU_MiscID.java (95%) rename auth/auth-batch/src/test/java/org/onap/aaf/auth/{ => batch}/helpers/test/JU_MonthData.java (94%) rename auth/auth-batch/src/test/java/org/onap/aaf/auth/{ => batch}/helpers/test/JU_NS.java (95%) rename auth/auth-batch/src/test/java/org/onap/aaf/auth/{ => batch}/helpers/test/JU_NsAttrib.java (90%) rename auth/auth-batch/src/test/java/org/onap/aaf/auth/{ => batch}/helpers/test/JU_Perm.java (96%) rename auth/auth-batch/src/test/java/org/onap/aaf/auth/{ => batch}/helpers/test/JU_Role.java (94%) rename auth/auth-batch/src/test/java/org/onap/aaf/auth/{ => batch}/helpers/test/JU_UserRole.java (94%) rename auth/auth-batch/src/test/java/org/onap/aaf/auth/{ => batch}/test/JU_Batch.java (97%) rename auth/auth-batch/src/test/java/org/onap/aaf/auth/{ => batch}/test/JU_BatchException.java (95%) rename auth/auth-batch/src/test/java/org/onap/aaf/auth/{ => batch}/test/JU_BatchPrincipal.java (94%) rename auth/auth-batch/src/test/java/org/onap/aaf/auth/{ => batch}/test/JU_CassBatch.java (96%) rename auth/auth-batch/src/test/java/org/onap/aaf/auth/{helpers => batch/test}/JU_NotificationTest.java (88%) 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 similarity index 99% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/Batch.java rename to 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 similarity index 97% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/BatchException.java rename to 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 similarity index 97% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/BatchPrincipal.java rename to 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 similarity index 98% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/CassBatch.java rename to 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 similarity index 96% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/Action.java rename to 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 similarity index 98% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/ActionDAO.java rename to 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 similarity index 98% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/ActionPuntDAO.java rename to 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 similarity index 97% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/CacheTouch.java rename to 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 similarity index 98% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/CredDelete.java rename to 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 similarity index 97% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/CredPrint.java rename to 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 similarity index 98% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/CredPunt.java rename to 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 similarity index 99% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/Email.java rename to 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 similarity index 98% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/EmailPrint.java rename to 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 similarity index 94% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/FuturePrint.java rename to 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 similarity index 96% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/Key.java rename to 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 { 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 similarity index 97% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/Message.java rename to 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 similarity index 95% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/NSACreate.java rename to 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 similarity index 95% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/NSADelete.java rename to 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 similarity index 96% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/NSDescUpdate.java rename to 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 similarity index 96% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/PermCreate.java rename to 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 similarity index 96% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/PermDelete.java rename to 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 similarity index 97% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/PermModify.java rename to 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 similarity index 96% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/RoleCreate.java rename to 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 similarity index 96% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/RoleDelete.java rename to 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 similarity index 97% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/RoleModify.java rename to 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 similarity index 95% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URAdd.java rename to 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 similarity index 96% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URDelete.java rename to 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 similarity index 96% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URFutureApprove.java rename to 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 similarity index 95% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URFutureApproveExec.java rename to 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 similarity index 93% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URFuturePrint.java rename to 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 similarity index 97% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URModify.java rename to 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 similarity index 94% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URPrint.java rename to 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 similarity index 96% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/URPunt.java rename to 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 similarity index 99% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Approval.java rename to 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 similarity index 95% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Approver.java rename to 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 similarity index 97% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/CQLBatch.java rename to 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 similarity index 97% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/CacheChange.java rename to 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 similarity index 97% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Creator.java rename to 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 similarity index 99% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Cred.java rename to 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-core/src/main/java/org/onap/aaf/auth/org/ExpireRange.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/ExpireRange.java similarity index 99% rename from auth/auth-core/src/main/java/org/onap/aaf/auth/org/ExpireRange.java rename to auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/ExpireRange.java index c21b2bef..f6a25e7f 100644 --- a/auth/auth-core/src/main/java/org/onap/aaf/auth/org/ExpireRange.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/ExpireRange.java @@ -18,7 +18,7 @@ * ============LICENSE_END==================================================== */ -package org.onap.aaf.auth.org; +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/Future.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Future.java similarity index 99% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Future.java rename to 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 similarity index 99% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/History.java rename to 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 similarity index 98% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/InputIterator.java rename to 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 similarity index 96% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Loader.java rename to 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 { 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 similarity index 98% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/MiscID.java rename to 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 similarity index 98% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/MonthData.java rename to 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 similarity index 99% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/NS.java rename to 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 similarity index 98% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Notification.java rename to 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 similarity index 98% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/NsAttrib.java rename to 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 similarity index 99% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Perm.java rename to 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 similarity index 99% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Role.java rename to 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 similarity index 97% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/UserRole.java rename to 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 creator) { + load(trans,session,creator,null,new DataLoadVisitor()); + } + public static void load(Trans trans, Session session, Creator creator, Visitor 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 similarity index 96% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Visitor.java rename to 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 { 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 similarity index 98% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/X509.java rename to 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 similarity index 95% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/reports/Expiring.java rename to 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 similarity index 95% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/update/ExpiringOrig.java rename to 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 similarity index 93% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/update/ExpiringP2.java rename to 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 similarity index 97% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/update/NotifyApprovals.java rename to 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 similarity index 97% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/update/NotifyCredExpiring.java rename to 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 similarity index 90% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/update/Remove.java rename to 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 similarity index 99% rename from auth/auth-batch/src/main/java/org/onap/aaf/auth/update/Upload.java rename to 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; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_ActionDAO.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_ActionDAO.java similarity index 96% rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_ActionDAO.java rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_ActionDAO.java index 254a6adf..9376da4b 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_ActionDAO.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_ActionDAO.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.actions.test; +package org.onap.aaf.auth.batch.actions.test; import static org.junit.Assert.*; import org.junit.After; @@ -27,7 +27,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.aaf.auth.actions.ActionDAO; +import org.onap.aaf.auth.batch.actions.ActionDAO; import org.onap.aaf.auth.env.AuthzTrans; import org.onap.aaf.auth.layer.Result; import org.onap.aaf.misc.env.APIException; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_CredPrintTest.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_CredPrintTest.java similarity index 95% rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_CredPrintTest.java rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_CredPrintTest.java index 2e6ad09c..ebb307c2 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_CredPrintTest.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_CredPrintTest.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.actions.test; +package org.onap.aaf.auth.batch.actions.test; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.when; @@ -28,7 +28,7 @@ import static org.mockito.MockitoAnnotations.initMocks; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; -import org.onap.aaf.auth.actions.CredPrint; +import org.onap.aaf.auth.batch.actions.CredPrint; import org.onap.aaf.auth.dao.cass.CredDAO; import org.onap.aaf.auth.dao.cass.CredDAO.Data; import org.onap.aaf.auth.env.AuthzTrans; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_Email.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_Email.java similarity index 96% rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_Email.java rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_Email.java index d3d4719e..3a170679 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_Email.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_Email.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.actions.test; +package org.onap.aaf.auth.batch.actions.test; import static org.junit.Assert.*; import org.junit.After; @@ -28,8 +28,8 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.aaf.auth.actions.Email; -import org.onap.aaf.auth.actions.Message; +import org.onap.aaf.auth.batch.actions.Email; +import org.onap.aaf.auth.batch.actions.Message; import org.onap.aaf.auth.env.AuthzTrans; import org.onap.aaf.auth.org.Organization.Identity; import org.onap.aaf.auth.org.Organization; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_EmailPrint.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_EmailPrint.java similarity index 96% rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_EmailPrint.java rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_EmailPrint.java index fe87219b..64d02ee3 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_EmailPrint.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_EmailPrint.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.actions.test; +package org.onap.aaf.auth.batch.actions.test; import static org.junit.Assert.*; import org.junit.After; @@ -27,7 +27,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.aaf.auth.actions.EmailPrint; +import org.onap.aaf.auth.batch.actions.EmailPrint; import org.onap.aaf.auth.env.AuthzTrans; import org.onap.aaf.auth.org.Organization; import org.onap.aaf.cadi.client.Future; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_FuturePrintTest.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_FuturePrintTest.java similarity index 92% rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_FuturePrintTest.java rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_FuturePrintTest.java index 121bf48f..00542a2f 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_FuturePrintTest.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_FuturePrintTest.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.actions.test; +package org.onap.aaf.auth.batch.actions.test; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.when; @@ -31,9 +31,9 @@ import java.util.UUID; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; -import org.onap.aaf.auth.actions.FuturePrint; +import org.onap.aaf.auth.batch.actions.FuturePrint; +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.LogTarget; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_Message.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_Message.java similarity index 94% rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_Message.java rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_Message.java index ada1dbae..86bab83e 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_Message.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_Message.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.actions.test; +package org.onap.aaf.auth.batch.actions.test; import static org.junit.Assert.*; import org.junit.After; @@ -27,7 +27,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.aaf.auth.actions.Message; +import org.onap.aaf.auth.batch.actions.Message; import static org.mockito.Mockito.*; import org.junit.Test; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_URFuturePrintTest.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_URFuturePrintTest.java similarity index 92% rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_URFuturePrintTest.java rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_URFuturePrintTest.java index 95406425..9f569d65 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_URFuturePrintTest.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_URFuturePrintTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END==================================================== * */ -package org.onap.aaf.auth.actions.test; +package org.onap.aaf.auth.batch.actions.test; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.when; @@ -29,9 +29,9 @@ import java.util.Calendar; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; -import org.onap.aaf.auth.actions.URFuturePrint; +import org.onap.aaf.auth.batch.actions.URFuturePrint; +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.LogTarget; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_URPrintTest.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_URPrintTest.java similarity index 92% rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_URPrintTest.java rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_URPrintTest.java index 1e99ec66..8a037ece 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/actions/test/JU_URPrintTest.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/actions/test/JU_URPrintTest.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.actions.test; +package org.onap.aaf.auth.batch.actions.test; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.when; @@ -30,9 +30,9 @@ import java.util.Calendar; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; -import org.onap.aaf.auth.actions.URPrint; +import org.onap.aaf.auth.batch.actions.URPrint; +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.LogTarget; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/creators/RowCreator.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/creators/RowCreator.java similarity index 99% rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/creators/RowCreator.java rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/creators/RowCreator.java index 078c383b..661105d3 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/creators/RowCreator.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/creators/RowCreator.java @@ -18,7 +18,7 @@ * ============LICENSE_END==================================================== * */ -package org.onap.aaf.auth.helpers.creators; +package org.onap.aaf.auth.batch.helpers.creators; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Approval.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Approval.java similarity index 97% rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Approval.java rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Approval.java index 6020dcc0..44c72763 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Approval.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Approval.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers.test; +package org.onap.aaf.auth.batch.helpers.test; import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.any; @@ -33,10 +33,10 @@ import java.util.UUID; import org.junit.Before; import org.junit.Test; +import org.onap.aaf.auth.batch.helpers.Approval; +import org.onap.aaf.auth.batch.helpers.creators.RowCreator; import org.onap.aaf.auth.dao.cass.ApprovalDAO; import org.onap.aaf.auth.env.AuthzTrans; -import org.onap.aaf.auth.helpers.Approval; -import org.onap.aaf.auth.helpers.creators.RowCreator; import org.onap.aaf.auth.layer.Result; import org.onap.aaf.misc.env.LogTarget; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Approver.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Approver.java similarity index 92% rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Approver.java rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Approver.java index b4ae1213..bd498f58 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Approver.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Approver.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers.test; +package org.onap.aaf.auth.batch.helpers.test; import static org.junit.Assert.*; import org.junit.After; @@ -27,8 +27,8 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.aaf.auth.actions.Message; -import org.onap.aaf.auth.helpers.Approver; +import org.onap.aaf.auth.batch.actions.Message; +import org.onap.aaf.auth.batch.helpers.Approver; import org.onap.aaf.auth.org.Organization; import static org.mockito.Mockito.*; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_CacheChange.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_CacheChange.java similarity index 95% rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_CacheChange.java rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_CacheChange.java index fc934e6c..27d2d3cc 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_CacheChange.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_CacheChange.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers.test; +package org.onap.aaf.auth.batch.helpers.test; import static org.junit.Assert.*; import org.junit.After; @@ -27,7 +27,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.aaf.auth.helpers.CacheChange; +import org.onap.aaf.auth.batch.helpers.CacheChange; import junit.framework.Assert; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Creator.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Creator.java similarity index 95% rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Creator.java rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Creator.java index ad4d2022..2a266f54 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Creator.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Creator.java @@ -20,7 +20,7 @@ */ -package org.onap.aaf.auth.helpers.test; +package org.onap.aaf.auth.batch.helpers.test; import static org.junit.Assert.*; import org.junit.After; @@ -28,7 +28,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.aaf.auth.helpers.Creator; +import org.onap.aaf.auth.batch.helpers.Creator; import com.datastax.driver.core.Row; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Cred.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Cred.java similarity index 95% rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Cred.java rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Cred.java index 35a63059..20831c66 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Cred.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Cred.java @@ -20,7 +20,7 @@ */ -package org.onap.aaf.auth.helpers.test; +package org.onap.aaf.auth.batch.helpers.test; import static org.junit.Assert.*; import org.junit.After; @@ -28,10 +28,10 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; +import org.onap.aaf.auth.batch.helpers.Cred; +import org.onap.aaf.auth.batch.helpers.Cred.CredCount; +import org.onap.aaf.auth.batch.helpers.Cred.Instance; import org.onap.aaf.auth.common.Define; -import org.onap.aaf.auth.helpers.Cred; -import org.onap.aaf.auth.helpers.Cred.CredCount; -import org.onap.aaf.auth.helpers.Cred.Instance; import org.onap.aaf.cadi.CadiException; import org.onap.aaf.cadi.PropAccess; import org.onap.aaf.cadi.config.Config; diff --git a/auth/auth-core/src/test/java/org/onap/aaf/auth/org/test/JU_ExpireRange.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_ExpireRange.java similarity index 95% rename from auth/auth-core/src/test/java/org/onap/aaf/auth/org/test/JU_ExpireRange.java rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_ExpireRange.java index c42cf53d..4ed167e9 100644 --- a/auth/auth-core/src/test/java/org/onap/aaf/auth/org/test/JU_ExpireRange.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_ExpireRange.java @@ -18,7 +18,7 @@ * ============LICENSE_END==================================================== */ -package org.onap.aaf.auth.org.test; +package org.onap.aaf.auth.batch.helpers.test; import static org.junit.Assert.*; @@ -26,7 +26,7 @@ import java.util.GregorianCalendar; import java.util.Set; import org.junit.Test; -import org.onap.aaf.auth.org.ExpireRange; +import org.onap.aaf.auth.batch.helpers.ExpireRange; import org.onap.aaf.cadi.PropAccess; public class JU_ExpireRange { diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Future.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Future.java similarity index 96% rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Future.java rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Future.java index fe3d5d95..91950c66 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Future.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Future.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers.test; +package org.onap.aaf.auth.batch.helpers.test; import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.any; @@ -34,11 +34,11 @@ import java.util.UUID; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.onap.aaf.auth.batch.helpers.Creator; +import org.onap.aaf.auth.batch.helpers.Future; +import org.onap.aaf.auth.batch.helpers.creators.RowCreator; import org.onap.aaf.auth.dao.cass.FutureDAO; import org.onap.aaf.auth.env.AuthzTrans; -import org.onap.aaf.auth.helpers.Creator; -import org.onap.aaf.auth.helpers.Future; -import org.onap.aaf.auth.helpers.creators.RowCreator; import org.onap.aaf.auth.layer.Result; import org.onap.aaf.misc.env.Env; import org.onap.aaf.misc.env.LogTarget; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_History.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_History.java similarity index 95% rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_History.java rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_History.java index 3346f229..beaaad31 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_History.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_History.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers.test; +package org.onap.aaf.auth.batch.helpers.test; import static org.junit.Assert.*; import org.junit.After; @@ -27,7 +27,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.aaf.auth.helpers.History; +import org.onap.aaf.auth.batch.helpers.History; import junit.framework.Assert; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_InputIterator.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_InputIterator.java similarity index 95% rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_InputIterator.java rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_InputIterator.java index 07fd65f0..f30ad3cc 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_InputIterator.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_InputIterator.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers.test; +package org.onap.aaf.auth.batch.helpers.test; import static org.junit.Assert.*; import org.junit.After; @@ -27,7 +27,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.aaf.auth.helpers.InputIterator; +import org.onap.aaf.auth.batch.helpers.InputIterator; import static org.mockito.Mockito.*; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_MiscID.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_MiscID.java similarity index 95% rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_MiscID.java rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_MiscID.java index 6f44b391..d8a2682c 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_MiscID.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_MiscID.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers.test; +package org.onap.aaf.auth.batch.helpers.test; import static org.junit.Assert.*; import org.junit.After; @@ -27,8 +27,8 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.aaf.auth.BatchException; -import org.onap.aaf.auth.helpers.MiscID; +import org.onap.aaf.auth.batch.BatchException; +import org.onap.aaf.auth.batch.helpers.MiscID; import com.datastax.driver.core.Row; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_MonthData.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_MonthData.java similarity index 94% rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_MonthData.java rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_MonthData.java index 97b6c56b..d9d9d018 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_MonthData.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_MonthData.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers.test; +package org.onap.aaf.auth.batch.helpers.test; import static org.junit.Assert.*; import org.junit.After; @@ -27,8 +27,8 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.aaf.auth.helpers.MonthData; -import org.onap.aaf.auth.helpers.MonthData.Row; +import org.onap.aaf.auth.batch.helpers.MonthData; +import org.onap.aaf.auth.batch.helpers.MonthData.Row; import junit.framework.Assert; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_NS.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_NS.java similarity index 95% rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_NS.java rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_NS.java index b69f8873..1208ba92 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_NS.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_NS.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers.test; +package org.onap.aaf.auth.batch.helpers.test; import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.any; @@ -30,10 +30,10 @@ import java.util.ArrayList; import org.junit.Before; import org.junit.Test; -import org.onap.aaf.auth.helpers.Creator; -import org.onap.aaf.auth.helpers.NS; -import org.onap.aaf.auth.helpers.NS.NSSplit; -import org.onap.aaf.auth.helpers.creators.RowCreator; +import org.onap.aaf.auth.batch.helpers.Creator; +import org.onap.aaf.auth.batch.helpers.NS; +import org.onap.aaf.auth.batch.helpers.NS.NSSplit; +import org.onap.aaf.auth.batch.helpers.creators.RowCreator; import org.onap.aaf.misc.env.Env; import org.onap.aaf.misc.env.LogTarget; import org.onap.aaf.misc.env.TimeTaken; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_NsAttrib.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_NsAttrib.java similarity index 90% rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_NsAttrib.java rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_NsAttrib.java index acf9b478..6df877fe 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_NsAttrib.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_NsAttrib.java @@ -19,12 +19,12 @@ * */ -package org.onap.aaf.auth.helpers.test; +package org.onap.aaf.auth.batch.helpers.test; import org.junit.Before; import org.junit.Test; -import org.onap.aaf.auth.helpers.NsAttrib; -import org.onap.aaf.auth.helpers.creators.RowCreator; +import org.onap.aaf.auth.batch.helpers.NsAttrib; +import org.onap.aaf.auth.batch.helpers.creators.RowCreator; import junit.framework.Assert; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Perm.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Perm.java similarity index 96% rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Perm.java rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Perm.java index 0ccc77a2..10cbd359 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Perm.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Perm.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers.test; +package org.onap.aaf.auth.batch.helpers.test; import static org.junit.Assert.*; import org.junit.After; @@ -27,7 +27,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.aaf.auth.helpers.Perm; +import org.onap.aaf.auth.batch.helpers.Perm; import junit.framework.Assert; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Role.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Role.java similarity index 94% rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Role.java rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Role.java index 3fd9f870..250c7a10 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Role.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_Role.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers.test; +package org.onap.aaf.auth.batch.helpers.test; import static org.junit.Assert.*; import org.junit.After; @@ -27,8 +27,8 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.aaf.auth.helpers.Perm; -import org.onap.aaf.auth.helpers.Role; +import org.onap.aaf.auth.batch.helpers.Perm; +import org.onap.aaf.auth.batch.helpers.Role; import junit.framework.Assert; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_UserRole.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_UserRole.java similarity index 94% rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_UserRole.java rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_UserRole.java index b20f9ded..6b7011c6 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_UserRole.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_UserRole.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.helpers.test; +package org.onap.aaf.auth.batch.helpers.test; import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.any; @@ -33,12 +33,12 @@ import java.util.List; import org.junit.Before; import org.junit.Test; -import org.onap.aaf.auth.actions.URDelete; +import org.onap.aaf.auth.batch.actions.URDelete; +import org.onap.aaf.auth.batch.helpers.Creator; +import org.onap.aaf.auth.batch.helpers.UserRole; +import org.onap.aaf.auth.batch.helpers.creators.RowCreator; import org.onap.aaf.auth.dao.cass.UserRoleDAO; import org.onap.aaf.auth.env.AuthzTrans; -import org.onap.aaf.auth.helpers.Creator; -import org.onap.aaf.auth.helpers.UserRole; -import org.onap.aaf.auth.helpers.creators.RowCreator; import org.onap.aaf.misc.env.Env; import org.onap.aaf.misc.env.LogTarget; import org.onap.aaf.misc.env.TimeTaken; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_Batch.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_Batch.java similarity index 97% rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_Batch.java rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_Batch.java index 5394c323..1ef6f3b8 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_Batch.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_Batch.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.test; +package org.onap.aaf.auth.batch.test; import static org.junit.Assert.*; import org.junit.After; @@ -27,7 +27,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.aaf.auth.Batch; +import org.onap.aaf.auth.batch.Batch; import org.onap.aaf.auth.env.AuthzEnv; import org.onap.aaf.auth.env.AuthzTrans; import org.onap.aaf.auth.org.Organization; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_BatchException.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_BatchException.java similarity index 95% rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_BatchException.java rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_BatchException.java index c56a76c8..47a7c278 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_BatchException.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_BatchException.java @@ -20,7 +20,7 @@ */ -package org.onap.aaf.auth.test; +package org.onap.aaf.auth.batch.test; import static org.junit.Assert.*; import org.junit.After; @@ -28,7 +28,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.aaf.auth.BatchException; +import org.onap.aaf.auth.batch.BatchException; import static org.mockito.Mockito.*; import org.junit.Test; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_BatchPrincipal.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_BatchPrincipal.java similarity index 94% rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_BatchPrincipal.java rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_BatchPrincipal.java index 6186df95..4e5ad675 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_BatchPrincipal.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_BatchPrincipal.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.test; +package org.onap.aaf.auth.batch.test; import static org.junit.Assert.*; import org.junit.After; @@ -27,7 +27,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.aaf.auth.BatchPrincipal; +import org.onap.aaf.auth.batch.BatchPrincipal; import junit.framework.Assert; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_CassBatch.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_CassBatch.java similarity index 96% rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_CassBatch.java rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_CassBatch.java index d1934a42..dfb30819 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/test/JU_CassBatch.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_CassBatch.java @@ -19,7 +19,7 @@ * */ -package org.onap.aaf.auth.test; +package org.onap.aaf.auth.batch.test; import static org.junit.Assert.*; import org.junit.After; @@ -27,7 +27,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.aaf.auth.CassBatch; +import org.onap.aaf.auth.batch.CassBatch; import org.onap.aaf.auth.env.AuthzTrans; import org.onap.aaf.auth.org.OrganizationException; import org.onap.aaf.misc.env.APIException; diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/JU_NotificationTest.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_NotificationTest.java similarity index 88% rename from auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/JU_NotificationTest.java rename to auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_NotificationTest.java index d3a1258d..79e4168e 100644 --- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/JU_NotificationTest.java +++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/test/JU_NotificationTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END==================================================== * */ -package org.onap.aaf.auth.helpers; +package org.onap.aaf.auth.batch.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -29,10 +29,12 @@ import static org.mockito.MockitoAnnotations.initMocks; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; -import org.onap.aaf.auth.actions.Message; +import org.onap.aaf.auth.batch.actions.Message; +import org.onap.aaf.auth.batch.helpers.Creator; +import org.onap.aaf.auth.batch.helpers.Notification; +import org.onap.aaf.auth.batch.helpers.Notification.TYPE; +import org.onap.aaf.auth.batch.helpers.creators.RowCreator; import org.onap.aaf.auth.env.AuthzTrans; -import org.onap.aaf.auth.helpers.Notification.TYPE; -import org.onap.aaf.auth.helpers.creators.RowCreator; import org.onap.aaf.misc.env.Env; import org.onap.aaf.misc.env.LogTarget; import org.onap.aaf.misc.env.TimeTaken; -- 2.16.6