diff options
9 files changed, 10 insertions, 27 deletions
@@ -28,12 +28,7 @@ meetings: repeats: 'weekly' time: '14:00 UTC' repositories: - - 'aaf-authz' - - 'aaf/cadi' - - 'aaf/luaplugin' - - 'aaf/oom' - - 'aaf/sms' - - 'aaf/sshsm' + - 'aaf/authz' committers: - <<: *onap_aaf_ptl - name: 'Kiran Kamineni' @@ -46,15 +41,5 @@ committers: company: 'ATT' id: 'sg481n' timezone: 'America/Dallas' - - name: 'Girish Havaldar' - email: 'hg0071052@techmahindra.com' - company: 'Techmahindra' - id: 'giri' - timezone: 'India/Bangalore' - - name: 'Huabing Zhao' - email: 'zhaohuabing@gmail.com' - company: 'ZTE' - id: 'Huabing_Zhao' - timezone: 'China/Chengdu' tsc: approval: 'https://lists.onap.org/pipermail/onap-tsc' diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Analyze.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Analyze.java index 5780c603..d7d97ad8 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Analyze.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Analyze.java @@ -391,8 +391,7 @@ public class Analyze extends Batch { return; } // Just let expired UserRoles sit until deleted - if(futureRange.inRange(ur.expires())) { - if(!mur.containsKey(ur.user() + '|' + ur.role())) { + if(futureRange.inRange(ur.expires())&&(!mur.containsKey(ur.user() + '|' + ur.role()))) { // Cannot just delete owners, unless there is at least one left. Process later if ("owner".equals(ur.rname())) { Set<UserRole> urs = owners.get(ur.role()); @@ -410,8 +409,7 @@ public class Analyze extends Batch { } } } - } - } + } } catch (OrganizationException e) { noAvg.error().log(e); } diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Notify.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Notify.java index 5ad6163f..54cb7378 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Notify.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Notify.java @@ -290,7 +290,7 @@ import org.onap.aaf.misc.env.util.Chrono; Pending p; tt = trans.start("Notify for Pending", Trans.SUB); - List<String> idList = new ArrayList<String>(); + List<String> idList = new ArrayList<>(); String id; try { for(Entry<String, Pending> es : mpending.entrySet()) { diff --git a/auth/auth-core/src/main/java/org/onap/aaf/auth/org/OrganizationFactory.java b/auth/auth-core/src/main/java/org/onap/aaf/auth/org/OrganizationFactory.java index 4f2ba4f2..2ada75d2 100644 --- a/auth/auth-core/src/main/java/org/onap/aaf/auth/org/OrganizationFactory.java +++ b/auth/auth-core/src/main/java/org/onap/aaf/auth/org/OrganizationFactory.java @@ -142,7 +142,7 @@ public class OrganizationFactory { return org; } - public static Organization get(AuthzTrans trans) throws OrganizationException { + public static Organization get(AuthzTrans trans){ String domain = FQI.reverseDomain(trans.user()); Organization org = orgs.get(domain); if (org==null) { diff --git a/auth/auth-core/src/main/java/org/onap/aaf/auth/rserv/TypedCode.java b/auth/auth-core/src/main/java/org/onap/aaf/auth/rserv/TypedCode.java index 1a66cf7d..6f1372f3 100644 --- a/auth/auth-core/src/main/java/org/onap/aaf/auth/rserv/TypedCode.java +++ b/auth/auth-core/src/main/java/org/onap/aaf/auth/rserv/TypedCode.java @@ -128,7 +128,7 @@ public class TypedCode<TRANS extends Trans> extends Content<TRANS> { return type.y.y.add(new Pair<String,Object>(tag,"version".equals(tag)?new Version(value):value)); } - public Pair<String, Pair<HttpCode<TRANS, ?>, List<Pair<String, Object>>>> prep(TRANS trans, String compare) throws IOException, ServletException { + public Pair<String, Pair<HttpCode<TRANS, ?>, List<Pair<String, Object>>>> prep(TRANS trans, String compare){ Pair<String, Pair<HttpCode<TRANS,?>, List<Pair<String, Object>>>> c,rv=null; if (types.size()==1 && "".equals((c=types.get(0)).x)) { // if there are no checks for type, skip rv = c; diff --git a/auth/auth-fs/src/main/java/org/onap/aaf/auth/fs/AAF_FS.java b/auth/auth-fs/src/main/java/org/onap/aaf/auth/fs/AAF_FS.java index df05da93..cee06dd2 100644 --- a/auth/auth-fs/src/main/java/org/onap/aaf/auth/fs/AAF_FS.java +++ b/auth/auth-fs/src/main/java/org/onap/aaf/auth/fs/AAF_FS.java @@ -49,7 +49,7 @@ import org.onap.aaf.misc.env.APIException; public class AAF_FS extends AbsService<AuthzEnv, AuthzTrans> { - public AAF_FS(final AuthzEnv env) throws APIException, IOException, CadiException { + public AAF_FS(final AuthzEnv env) throws IOException, CadiException { super(env.access(),env); try { /////////////////////// diff --git a/auth/auth-hello/src/main/java/org/onap/aaf/auth/hello/API_Hello.java b/auth/auth-hello/src/main/java/org/onap/aaf/auth/hello/API_Hello.java index 7fef0ba2..814dff27 100644 --- a/auth/auth-hello/src/main/java/org/onap/aaf/auth/hello/API_Hello.java +++ b/auth/auth-hello/src/main/java/org/onap/aaf/auth/hello/API_Hello.java @@ -56,7 +56,7 @@ public class API_Hello { * @param facade * @throws Exception */ - public static void init(final AAF_Hello oauthHello) throws Exception { + public static void init(final AAF_Hello oauthHello){ //////// // Simple "GET" API /////// diff --git a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java index b481ff9a..0ad14c84 100644 --- a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java +++ b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java @@ -170,7 +170,7 @@ public class AAF_Locate extends AbsService<AuthzEnv, AuthzTrans> { // Add other Supported APIs here as created } - public void routeAll(HttpMethods meth, String path, API api, LocateCode code) throws Exception { + public void routeAll(HttpMethods meth, String path, API api, LocateCode code){ route(env,meth,path,code,""); // this will always match } diff --git a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/service/LocateServiceImpl.java b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/service/LocateServiceImpl.java index e080e7ee..1ace384e 100644 --- a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/service/LocateServiceImpl.java +++ b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/service/LocateServiceImpl.java @@ -47,7 +47,7 @@ public class LocateServiceImpl<IN,OUT,ERROR> private ConfigDAO configDAO; private boolean permToRegister; - public LocateServiceImpl(AuthzTrans trans, AAF_Locate locate, Mapper<IN,OUT,Endpoints,MgmtEndpoints,Configuration,ERROR> mapper) throws APIException { + public LocateServiceImpl(AuthzTrans trans, AAF_Locate locate, Mapper<IN,OUT,Endpoints,MgmtEndpoints,Configuration,ERROR> mapper){ this.mapper = mapper; this.locateDAO = locate.locateDAO; this.configDAO = locate.configDAO; |