diff options
Diffstat (limited to 'auth/auth-batch')
5 files changed, 10 insertions, 10 deletions
diff --git a/auth/auth-batch/pom.xml b/auth/auth-batch/pom.xml index 8892358d..a30ccaa7 100644 --- a/auth/auth-batch/pom.xml +++ b/auth/auth-batch/pom.xml @@ -29,7 +29,7 @@ <relativePath>../pom.xml</relativePath> </parent> - <artifactId>auth-batch</artifactId> + <artifactId>aaf-auth-batch</artifactId> <name>AAF Auth Batch</name> <description>Batch Processing for AAF Auth</description> <packaging>jar</packaging> 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.java index 2a55af76..7826eb68 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.java @@ -145,7 +145,7 @@ public abstract class Batch { } } - protected abstract void run(AuthzTrans trans); + protected abstract void run(AuthzTrans trans); protected abstract void _close(AuthzTrans trans); public String[] args() { 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/BatchPrincipal.java index 6ca79018..5403e3a5 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/BatchPrincipal.java @@ -26,7 +26,7 @@ public class BatchPrincipal extends TaggedPrincipal { private final String name; public BatchPrincipal(final String name) { - this.name = name; + this.name = "batch:"+name; } @Override @@ -36,6 +36,6 @@ public class BatchPrincipal extends TaggedPrincipal { @Override public String tag() { - return "Batch"; + return "Btch"; } } 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/helpers/Approval.java index 0bd9397c..7963b022 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/helpers/Approval.java @@ -45,10 +45,10 @@ public class Approval implements CacheChange.Data { public static final String RE_VALIDATE_ADMIN = "Re-Validate as Administrator for AAF Namespace '"; public static final String RE_VALIDATE_OWNER = "Re-Validate Ownership for AAF Namespace '"; - public static TreeMap<String,List<Approval>> byApprover = new TreeMap<String,List<Approval>>(); - public static TreeMap<String,List<Approval>> byUser = new TreeMap<String,List<Approval>>(); - public static TreeMap<UUID,List<Approval>> byTicket = new TreeMap<UUID,List<Approval>>(); - private final static CacheChange<Approval> cache = new CacheChange<Approval>(); + public static TreeMap<String,List<Approval>> byApprover = new TreeMap<>(); + public static TreeMap<String,List<Approval>> byUser = new TreeMap<>(); + public static TreeMap<UUID,List<Approval>> byTicket = new TreeMap<>(); + private final static CacheChange<Approval> cache = new CacheChange<>(); public final ApprovalDAO.Data add; private String role; 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/test/JU_BatchPrincipal.java index cc30890c..e3cd359f 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/test/JU_BatchPrincipal.java @@ -41,8 +41,8 @@ public class JU_BatchPrincipal { @Test public void testBatchPrincipal() { bPrincipal = new BatchPrincipal("name"); - bPrincipal.getName(); - Assert.assertEquals("Batch", bPrincipal.tag()); + Assert.assertEquals("batch:name", bPrincipal.getName()); + Assert.assertEquals("Btch", bPrincipal.tag()); } } |