From: Instrumental Date: Wed, 19 Sep 2018 14:51:45 +0000 (-0500) Subject: mv posix-jnr X-Git-Tag: 2.1.2~28 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aaf%2Fauthz.git;a=commitdiff_plain;h=6f6c62001939a00135e5be10009535b74cdee615 mv posix-jnr Issue-ID: AAF-509 Change-Id: If8c6d1d437da3d7c2c8b31217772e1d4c1be089c Signed-off-by: Instrumental --- 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 { 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 @@ com.datastax.cassandra cassandra-driver-core + + + + com.github.jnr + jnr-posix + + + + + + com.github.jnr + jnr-posix + 3.0.45 - com.google.guava - guava + com.google.guava + guava 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 @@ org.onap.aaf.authz aaf-auth-deforg - + org.onap.aaf.authz aaf-auth-cass 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 Map of(Object ... tag_value) { + Map rv = new HashMap<>(); + for(int i=0;i T getOnlyElement(List 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 List newArrayList(Collection ... init ) { + List rv = new ArrayList<>(); + for(Collection o : init) { + for(T t : o) { + rv.add(t); + } + } + return rv; + } + + @SuppressWarnings("unchecked") + public static List newArrayList(Object ... init ) { + List 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 Set newHashSet(Object ... init ) { + Set 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 @@ mail 1.4.7 - + org.mockito mockito-all