Merge "Function.java-sonar fix"

[aaf/authz.git] / auth / auth-cass / src / main / java / org / onap / aaf / auth / dao / cached / CachedPermDAO.java

diff --git a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cached/CachedPermDAO.java b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cached/CachedPermDAO.java
index a18e6a6..28b8c4b 100644 (file)
--- a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cached/CachedPermDAO.java
+++ b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cached/CachedPermDAO.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.
@@ -40,25 +40,19 @@ public class CachedPermDAO extends CachedDAO<AuthzTrans,PermDAO, PermDAO.Data> {
 
     public Result<List<Data>> readNS(AuthzTrans trans, final String ns) {
         DAOGetter getter = new DAOGetter(trans,dao()) {
+        @Override
             public Result<List<Data>> call() {
                 return dao.readNS(trans, ns);
             }
         };
-        
+
         Result<List<Data>> lurd = get(trans, ns, getter);
-        if(lurd.isOKhasData()) {
+        if (lurd.isOKhasData()) {
             return lurd;
         } else {
-            
+
         }
-//        if(getter.result==null) {
-//            if(lurd==null) {
-                return Result.err(Status.ERR_PermissionNotFound,"No Permission found - " + lurd.details);
-//            } else {
-//                return Result.ok(lurd);
-//            }
-//        }
-//        return getter.result;
+        return Result.err(Status.ERR_PermissionNotFound,"No Permission found - " + lurd.details);
     }
 
     public Result<List<Data>> readChildren(AuthzTrans trans, final String ns, final String type) {
@@ -66,7 +60,7 @@ public class CachedPermDAO extends CachedDAO<AuthzTrans,PermDAO, PermDAO.Data> {
     }
 
     /**
-     * 
+     *
      * @param trans
      * @param ns
      * @param type
@@ -74,22 +68,23 @@ public class CachedPermDAO extends CachedDAO<AuthzTrans,PermDAO, PermDAO.Data> {
      */
     public Result<List<Data>> readByType(AuthzTrans trans, final String ns, final String type) {
         DAOGetter getter = new DAOGetter(trans,dao()) {
+        @Override
             public Result<List<Data>> call() {
                 return dao.readByType(trans, ns, type);
             }
         };
-        
+
         // Note: Can reuse index1 here, because there is no name collision versus response
         Result<List<Data>> lurd = get(trans, ns+'|'+type, getter);
-        if(lurd.isOK() && lurd.isEmpty()) {
+        if (lurd.isOK() && lurd.isEmpty()) {
             return Result.err(Status.ERR_PermissionNotFound,"No Permission found");
         }
         return lurd;
     }
-    
+
     /**
      * Add desciption to this permission
-     * 
+     *
      * @param trans
      * @param ns
      * @param type
@@ -98,15 +93,15 @@ public class CachedPermDAO extends CachedDAO<AuthzTrans,PermDAO, PermDAO.Data> {
      * @param description
      * @return
      */
-    public Result<Void> addDescription(AuthzTrans trans, String ns, String type, 
+    public Result<Void> addDescription(AuthzTrans trans, String ns, String type,
             String instance, String action, String description) {
         //TODO Invalidate?
         return dao().addDescription(trans, ns, type, instance, action, description);
     }
-    
+
     public Result<Void> addRole(AuthzTrans trans, PermDAO.Data perm, RoleDAO.Data role) {
         Result<Void> rv = dao().addRole(trans,perm,role.encode());
-        if(trans.debug().isLoggable())
+        if (trans.debug().isLoggable())
             trans.debug().log("Adding",role.encode(),"to", perm, "with CachedPermDAO.addRole");
         invalidate(trans,perm);
         return rv;
@@ -114,7 +109,7 @@ public class CachedPermDAO extends CachedDAO<AuthzTrans,PermDAO, PermDAO.Data> {
 
     public Result<Void> delRole(AuthzTrans trans, Data perm, RoleDAO.Data role) {
         Result<Void> rv = dao().delRole(trans,perm,role.encode());
-        if(trans.debug().isLoggable())
+        if (trans.debug().isLoggable())
             trans.debug().log("Removing",role.encode(),"from", perm, "with CachedPermDAO.delRole");
         invalidate(trans,perm);
         return rv;