X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-cass%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fdao%2Fcached%2FCachedRoleDAO.java;h=0c1fa4ccee004b9d1cac5c59f6a0cd36a92f03e6;hb=c1a12263c510ab8b36f1bc118e8e0bf2fafcbac8;hp=1d8e6709fa39dcb8b32d9e57e619230cc4ad57e9;hpb=4b5a7d721d994a49057e9bfb403c7bff1b376660;p=aaf%2Fauthz.git diff --git a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cached/CachedRoleDAO.java b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cached/CachedRoleDAO.java index 1d8e6709..0c1fa4cc 100644 --- a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cached/CachedRoleDAO.java +++ b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cached/CachedRoleDAO.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -39,13 +39,14 @@ public class CachedRoleDAO extends CachedDAO { public Result> readNS(AuthzTrans trans, final String ns) { DAOGetter getter = new DAOGetter(trans,dao()) { + @Override public Result> call() { return dao.readNS(trans, ns); } }; - + Result> lurd = get(trans, ns, getter); - if(lurd.isOK() && lurd.isEmpty()) { + if (lurd.isOK() && lurd.isEmpty()) { return Result.err(Status.ERR_RoleNotFound,"No Role found"); } return lurd; @@ -53,13 +54,14 @@ public class CachedRoleDAO extends CachedDAO { public Result> readName(AuthzTrans trans, final String name) { DAOGetter getter = new DAOGetter(trans,dao()) { + @Override public Result> call() { return dao().readName(trans, name); } }; - + Result> lurd = get(trans, name, getter); - if(lurd.isOK() && lurd.isEmpty()) { + if (lurd.isOK() && lurd.isEmpty()) { return Result.err(Status.ERR_RoleNotFound,"No Role found"); } return lurd; @@ -74,7 +76,7 @@ public class CachedRoleDAO extends CachedDAO { public Result addPerm(AuthzTrans trans, RoleDAO.Data rd, PermDAO.Data perm) { Result rv = dao().addPerm(trans,rd,perm); - if(trans.debug().isLoggable()) + if (trans.debug().isLoggable()) trans.debug().log("Adding",perm,"to", rd, "with CachedRoleDAO.addPerm"); invalidate(trans, rd); return rv; @@ -82,15 +84,15 @@ public class CachedRoleDAO extends CachedDAO { public Result delPerm(AuthzTrans trans, RoleDAO.Data rd, PermDAO.Data perm) { Result rv = dao().delPerm(trans,rd,perm); - if(trans.debug().isLoggable()) + if (trans.debug().isLoggable()) trans.debug().log("Removing",perm,"from", rd, "with CachedRoleDAO.addPerm"); invalidate(trans, rd); return rv; } - + /** * Add description to this role - * + * * @param trans * @param ns * @param name