summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/Perm.java2
-rw-r--r--auth/auth-cass/pom.xml17
-rw-r--r--auth/auth-service/pom.xml2
-rw-r--r--auth/auth-service/src/test/java/org/onap/aaf/authz/service/mapper/JU_Mapper_2_0.java121
-rw-r--r--pom.xml2
5 files changed, 113 insertions, 31 deletions
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/helpers/Perm.java
index ce22724b..ee588f31 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/helpers/Perm.java
@@ -105,7 +105,7 @@ public class Perm implements Comparable<Perm> {
tt = trans.start("Load Perms", Env.SUB);
try {
while (iter.hasNext()) {
- row = iter.next();
+ row = iter.next();
Perm pk = new Perm(
row.getString(0),row.getString(1),row.getString(2),
row.getString(3), row.getString(4), row.getSet(5,String.class));
diff --git a/auth/auth-cass/pom.xml b/auth/auth-cass/pom.xml
index 867313ef..52efd9a0 100644
--- a/auth/auth-cass/pom.xml
+++ b/auth/auth-cass/pom.xml
@@ -95,11 +95,24 @@
<dependency>
<groupId>com.datastax.cassandra</groupId>
<artifactId>cassandra-driver-core</artifactId>
+ <!-- JNR Posix needs bumping up for licence for datastax 3.6.0, remove after this version-->
+ <exclusions>
+ <exclusion>
+ <groupId>com.github.jnr</groupId>
+ <artifactId>jnr-posix</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- JNR Posix needs bumping up for licence for datastax 3.6.0, remove after this version-->
+ <dependency>
+ <groupId>com.github.jnr</groupId>
+ <artifactId>jnr-posix</artifactId>
+ <version>3.0.45</version>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<!-- Cassandra prefers Snappy and LZ4 libs for performance -->
diff --git a/auth/auth-service/pom.xml b/auth/auth-service/pom.xml
index 6ad719b1..baa4d17d 100644
--- a/auth/auth-service/pom.xml
+++ b/auth/auth-service/pom.xml
@@ -64,7 +64,7 @@
<groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-auth-deforg</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-auth-cass</artifactId>
diff --git a/auth/auth-service/src/test/java/org/onap/aaf/authz/service/mapper/JU_Mapper_2_0.java b/auth/auth-service/src/test/java/org/onap/aaf/authz/service/mapper/JU_Mapper_2_0.java
index 31fdde1f..b9f31220 100644
--- a/auth/auth-service/src/test/java/org/onap/aaf/authz/service/mapper/JU_Mapper_2_0.java
+++ b/auth/auth-service/src/test/java/org/onap/aaf/authz/service/mapper/JU_Mapper_2_0.java
@@ -33,42 +33,24 @@ import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.onap.aaf.auth.layer.Result.ERR_BadData;
import static org.onap.aaf.auth.layer.Result.ERR_General;
-import aaf.v2_0.NsRequest;
-import aaf.v2_0.Nss;
-import aaf.v2_0.Nss.Ns;
-import aaf.v2_0.Perm;
-import aaf.v2_0.PermKey;
-import aaf.v2_0.PermRequest;
-import aaf.v2_0.Perms;
-import aaf.v2_0.Pkey;
-import aaf.v2_0.Request;
-import aaf.v2_0.Role;
-import aaf.v2_0.RoleRequest;
-import aaf.v2_0.Roles;
-import aaf.v2_0.UserRole;
-import aaf.v2_0.UserRoleRequest;
-import aaf.v2_0.UserRoles;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
import java.io.IOException;
-import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
-import org.junit.Assert;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -96,12 +78,25 @@ import org.onap.aaf.cadi.CadiException;
import org.onap.aaf.misc.env.APIException;
import org.onap.aaf.misc.env.Env;
import org.onap.aaf.misc.env.TimeTaken;
-import org.onap.aaf.org.DefaultOrg;
+
+import aaf.v2_0.NsRequest;
+import aaf.v2_0.Nss;
+import aaf.v2_0.Nss.Ns;
+import aaf.v2_0.Perm;
+import aaf.v2_0.PermRequest;
+import aaf.v2_0.Perms;
+import aaf.v2_0.Pkey;
+import aaf.v2_0.Request;
+import aaf.v2_0.Role;
+import aaf.v2_0.RoleRequest;
+import aaf.v2_0.Roles;
+import aaf.v2_0.UserRole;
+import aaf.v2_0.UserRoleRequest;
+import aaf.v2_0.UserRoles;
@RunWith(MockitoJUnitRunner.class)
public class JU_Mapper_2_0 {
-
- private static final String USER = "John";
+ private static final String USER = "John";
private Mapper_2_0 mapper;
@Mock
@@ -109,7 +104,7 @@ public class JU_Mapper_2_0 {
@Mock
private AuthzTrans transaction;
@Mock
- private TimeTaken tt;
+ private TimeTaken tt;
@Before
@@ -649,4 +644,78 @@ public class JU_Mapper_2_0 {
return userRole;
}
+ /**
+ * Need to do without Google stuff
+ * @author Instrumental
+ *
+ */
+ public static class ImmutableMap {
+ public static <T,U> Map<T,U> of(Object ... tag_value) {
+ Map<T,U> rv = new HashMap<>();
+ for(int i=0;i<tag_value.length-1;i+=2) {
+ rv.put((T)tag_value[i],(U)tag_value[i+1]);
+ }
+ return rv;
+ }
+
+ }
+
+ /**
+ * Need to do without Google stuff
+ * @author Instrumental
+ *
+ */
+ public static class Iterables {
+ public static <T> T getOnlyElement(List<T> lt) {
+ if(lt.isEmpty()) {
+ return null;
+ } else {
+ return lt.get(0);
+ }
+ }
+ }
+
+ /**
+ * Need to do without Google stuff
+ * @author Instrumental
+ *
+ */
+ public static class Lists {
+ @SuppressWarnings("unchecked")
+ public static <T> List<T> newArrayList(Collection<T> ... init ) {
+ List<T> rv = new ArrayList<>();
+ for(Collection<T> o : init) {
+ for(T t : o) {
+ rv.add(t);
+ }
+ }
+ return rv;
+ }
+
+ @SuppressWarnings("unchecked")
+ public static <T> List<T> newArrayList(Object ... init ) {
+ List<T> rv = new ArrayList<>();
+ for(Object o : init) {
+ rv.add((T)o);
+ }
+ return rv;
+ }
+
+ }
+
+ /**
+ * Need to do without Google stuff
+ * @author Instrumental
+ *
+ */
+ public static class Sets {
+ @SuppressWarnings("unchecked")
+ public static <T> Set<T> newHashSet(Object ... init ) {
+ Set<T> rv = new HashSet<>();
+ for(Object o : init) {
+ rv.add((T)o);
+ }
+ return rv;
+ }
+ }
}
diff --git a/pom.xml b/pom.xml
index 51c64638..e3512d5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -348,7 +348,7 @@
<artifactId>mail</artifactId>
<version>1.4.7</version>
</dependency>
-
+
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>