diff options
16 files changed, 18 insertions, 18 deletions
diff --git a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/AAFcli.java b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/AAFcli.java index 2efbff73..ab41eb85 100644 --- a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/AAFcli.java +++ b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/AAFcli.java @@ -94,11 +94,11 @@ public class AAFcli { } // Create when only have Access - public AAFcli(Access access, Writer wtr, HMangr hman, SecurityInfoC<HttpURLConnection> si, SecuritySetter<HttpURLConnection> ss) throws APIException { + public AAFcli(Access access, Writer wtr, HMangr hman, SecurityInfoC<HttpURLConnection> si, SecuritySetter<HttpURLConnection> ss) throws APIException, CadiException { this(access,new AuthzEnv(access.getProperties()),wtr,hman, si,ss); } - public AAFcli(Access access, AuthzEnv env, Writer wtr, HMangr hman, SecurityInfoC<HttpURLConnection> si, SecuritySetter<HttpURLConnection> ss) throws APIException { + public AAFcli(Access access, AuthzEnv env, Writer wtr, HMangr hman, SecurityInfoC<HttpURLConnection> si, SecuritySetter<HttpURLConnection> ss) throws APIException, CadiException { this.env = env; this.access = access; this.ss = ss; @@ -112,7 +112,6 @@ public class AAFcli { close = true; } - /* * Create Cmd Tree */ diff --git a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/JU_AAFCli.java b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/JU_AAFCli.java index 4acd5a85..d9da835d 100644 --- a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/JU_AAFCli.java +++ b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/JU_AAFCli.java @@ -184,7 +184,7 @@ public class JU_AAFCli { assertTrue(cli.eval("Some random string @#&*& to check complete 100 coverage")); } - public static AAFcli getAAfCli() throws APIException, LocatorException, GeneralSecurityException, IOException { + public static AAFcli getAAfCli() throws APIException, LocatorException, GeneralSecurityException, IOException, CadiException { final AuthzEnv env = new AuthzEnv(System.getProperties()); String aafUrl = "https://DME2RESOLVE"; SecurityInfoC<HttpURLConnection> si = mock(SecurityInfoC.class); diff --git a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/JU_BaseCmd.java b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/JU_BaseCmd.java index c071d95a..79a3dd53 100644 --- a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/JU_BaseCmd.java +++ b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/JU_BaseCmd.java @@ -54,7 +54,7 @@ public class JU_BaseCmd { private static BaseCmd bCmd; @BeforeClass - public static void setUp() throws APIException, LocatorException, GeneralSecurityException, IOException { + public static void setUp() throws APIException, LocatorException, GeneralSecurityException, IOException, CadiException { cli = JU_AAFCli.getAAfCli(); bCmd = new BaseCmd<>(cli, "testString"); } diff --git a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/JU_Cmd.java b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/JU_Cmd.java index 13394a30..3566555d 100644 --- a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/JU_Cmd.java +++ b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/JU_Cmd.java @@ -94,7 +94,7 @@ public class JU_Cmd { } @Before - public void setUp() throws APIException, LocatorException, GeneralSecurityException, IOException { + public void setUp() throws APIException, LocatorException, GeneralSecurityException, IOException, CadiException { cli = JU_AAFCli.getAAfCli(); Param[] param = new Param[] {new Param("name",true)}; diff --git a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/JU_Help.java b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/JU_Help.java index bc1f4cc4..50da3e37 100644 --- a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/JU_Help.java +++ b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/JU_Help.java @@ -84,7 +84,7 @@ public class JU_Help { private static List<Cmd> cmds; @Before - public void setUp() throws APIException, LocatorException, GeneralSecurityException, IOException { + public void setUp() throws APIException, LocatorException, GeneralSecurityException, IOException, CadiException { cli = JU_AAFCli.getAAfCli(); cmds = new ArrayList<>(); Param[] param = new Param[] {new Param("name",true)}; diff --git a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/JU_Version.java b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/JU_Version.java index 884f5405..c0ac0f21 100644 --- a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/JU_Version.java +++ b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/JU_Version.java @@ -50,7 +50,7 @@ public class JU_Version { private static Version version; @BeforeClass - public static void setUp() throws APIException, LocatorException, GeneralSecurityException, IOException { + public static void setUp() throws APIException, LocatorException, GeneralSecurityException, IOException, CadiException { cli = JU_AAFCli.getAAfCli(); version = new Version(cli); } diff --git a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/mgmt/JU_Log.java b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/mgmt/JU_Log.java index 7ef9c9a5..77518d44 100644 --- a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/mgmt/JU_Log.java +++ b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/mgmt/JU_Log.java @@ -66,7 +66,7 @@ public class JU_Log { AAFcli aafcli; @Before - public void setUp() throws APIException, LocatorException { + public void setUp() throws APIException, LocatorException, CadiException { prop = new PropAccess(); aEnv = new AuthzEnv(); wtr = mock(Writer.class); diff --git a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/mgmt/JU_SessClear.java b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/mgmt/JU_SessClear.java index 1618e787..91d22187 100644 --- a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/mgmt/JU_SessClear.java +++ b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/mgmt/JU_SessClear.java @@ -66,7 +66,7 @@ public class JU_SessClear { AAFcli aafcli; @Before - public void setUp() throws LocatorException, APIException { + public void setUp() throws LocatorException, APIException, CadiException { prop = new PropAccess(); aEnv = new AuthzEnv(); wtr = mock(Writer.class); diff --git a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/ns/JU_Delete.java b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/ns/JU_Delete.java index 04fd64fe..e0a1128d 100644 --- a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/ns/JU_Delete.java +++ b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/ns/JU_Delete.java @@ -64,7 +64,7 @@ public class JU_Delete { AAFcli aafcli; @Before - public void setUp() throws APIException, LocatorException, GeneralSecurityException, IOException { + public void setUp() throws APIException, LocatorException, GeneralSecurityException, IOException, CadiException { prop = new PropAccess(); aEnv = new AuthzEnv(); wtr = mock(Writer.class); diff --git a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/ns/JU_List.java b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/ns/JU_List.java index 1926249f..3edce8de 100644 --- a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/ns/JU_List.java +++ b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/ns/JU_List.java @@ -27,6 +27,7 @@ import java.util.ArrayList; import org.onap.aaf.auth.cmd.ns.List; import org.onap.aaf.auth.cmd.ns.NS; import org.onap.aaf.auth.env.AuthzEnv; +import org.onap.aaf.cadi.CadiException; import org.onap.aaf.cadi.Locator; import org.onap.aaf.cadi.LocatorException; import org.onap.aaf.cadi.PropAccess; @@ -95,7 +96,7 @@ public class JU_List { @Before - public void setUp() throws APIException, LocatorException { + public void setUp() throws APIException, LocatorException, CadiException { PropAccess prop = new PropAccess(); AuthzEnv aEnv = new AuthzEnv(); Writer wtr = mock(Writer.class); diff --git a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/ns/JU_ListUsers.java b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/ns/JU_ListUsers.java index e44a8219..909e852e 100644 --- a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/ns/JU_ListUsers.java +++ b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/ns/JU_ListUsers.java @@ -32,6 +32,7 @@ import org.onap.aaf.auth.cmd.ns.List; import org.onap.aaf.auth.cmd.ns.ListUsers; import org.onap.aaf.auth.cmd.ns.NS; import org.onap.aaf.auth.cmd.test.JU_AAFCli; +import org.onap.aaf.cadi.CadiException; import org.onap.aaf.cadi.LocatorException; import org.onap.aaf.misc.env.APIException; @@ -57,7 +58,7 @@ public class JU_ListUsers { ListUsers lUsers; @Before - public void setUp() throws APIException, LocatorException, GeneralSecurityException, IOException { + public void setUp() throws APIException, LocatorException, GeneralSecurityException, IOException, CadiException { cli = JU_AAFCli.getAAfCli(); ns = new NS(cli); list = new List(ns); diff --git a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/ns/JU_ListUsersContact.java b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/ns/JU_ListUsersContact.java index 14dcbe67..ad48ce34 100644 --- a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/ns/JU_ListUsersContact.java +++ b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/ns/JU_ListUsersContact.java @@ -67,7 +67,7 @@ public class JU_ListUsersContact { ListUsersContact lUContact; @Before - public void setUp() throws LocatorException, APIException { + public void setUp() throws LocatorException, APIException, CadiException { prop = new PropAccess(); aEnv = new AuthzEnv(); wtr = mock(Writer.class); diff --git a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/role/JU_List.java b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/role/JU_List.java index 781f7741..0c85fc3c 100644 --- a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/role/JU_List.java +++ b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/role/JU_List.java @@ -104,7 +104,7 @@ public class JU_List { } @Before - public void setUp() throws APIException, LocatorException, GeneralSecurityException, IOException{ + public void setUp() throws APIException, LocatorException, GeneralSecurityException, IOException, CadiException{ prop = new PropAccess(); aEnv = new AuthzEnv(); wtr = mock(Writer.class); diff --git a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/user/JU_Cred.java b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/user/JU_Cred.java index 9432cbca..eaf8f8ca 100644 --- a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/user/JU_Cred.java +++ b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/user/JU_Cred.java @@ -69,7 +69,7 @@ public class JU_Cred { AAFcli aafcli; @Before - public void setUp() throws FileNotFoundException, APIException, LocatorException { + public void setUp() throws FileNotFoundException, APIException, LocatorException, CadiException { prop = new PropAccess(); aEnv = new AuthzEnv(); wtr = mock(Writer.class); diff --git a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/user/JU_Delg.java b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/user/JU_Delg.java index 3c78841b..28d48501 100644 --- a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/user/JU_Delg.java +++ b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/user/JU_Delg.java @@ -68,7 +68,7 @@ public class JU_Delg { AAFcli aafcli; @Before - public void setUp() throws FileNotFoundException, APIException, LocatorException { + public void setUp() throws FileNotFoundException, APIException, LocatorException, CadiException { prop = new PropAccess(); aEnv = new AuthzEnv(); wtr = mock(Writer.class); diff --git a/auth/auth-service/src/main/java/org/onap/aaf/auth/service/mapper/Mapper_2_0.java b/auth/auth-service/src/main/java/org/onap/aaf/auth/service/mapper/Mapper_2_0.java index 8b96172f..0fa58972 100644 --- a/auth/auth-service/src/main/java/org/onap/aaf/auth/service/mapper/Mapper_2_0.java +++ b/auth/auth-service/src/main/java/org/onap/aaf/auth/service/mapper/Mapper_2_0.java @@ -522,7 +522,6 @@ public class Mapper_2_0 implements Mapper<Nss, Perms, Pkey, Roles, Users, UserRo if(ok.length()>0) { return Result.err(Status.ERR_BadData,ok); } - } else { to.type=0; } |