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%2FCachedPermDAO.java;h=28b8c4b4954f1774ff5f8902bdfa4bf69d88d2fc;hb=43ee275875f09ec439a2d0aa182c79773c63f018;hp=4cb7cf2ec94b81c5f3ffbf23b5756a44b8f5880c;hpb=ceda6e8bc270202bcb24340b86617110289c902e;p=aaf%2Fauthz.git

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 4cb7cf2e..28b8c4b4 100644
--- 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.
@@ -34,91 +34,86 @@ import org.onap.aaf.auth.layer.Result;
 
 public class CachedPermDAO extends CachedDAO<AuthzTrans,PermDAO, PermDAO.Data> {
 
-	public CachedPermDAO(PermDAO dao, CIDAO<AuthzTrans> info, long expiresIn) {
-		super(dao, info, PermDAO.CACHE_SEG, expiresIn);
-	}
-
-	public Result<List<Data>> readNS(AuthzTrans trans, final String ns) {
-		DAOGetter getter = new DAOGetter(trans,dao()) {
-			public Result<List<Data>> call() {
-				return dao.readNS(trans, ns);
-			}
-		};
-		
-		Result<List<Data>> lurd = get(trans, ns, getter);
-		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;
-	}
-
-	public Result<List<Data>> readChildren(AuthzTrans trans, final String ns, final String type) {
-		return dao().readChildren(trans,ns,type);
-	}
-
-	/**
-	 * 
-	 * @param trans
-	 * @param ns
-	 * @param type
-	 * @return
-	 */
-	public Result<List<Data>> readByType(AuthzTrans trans, final String ns, final String type) {
-		DAOGetter getter = new DAOGetter(trans,dao()) {
-			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()) {
-			return Result.err(Status.ERR_PermissionNotFound,"No Permission found");
-		}
-		return lurd;
-	}
-	
-	/**
-	 * Add desciption to this permission
-	 * 
-	 * @param trans
-	 * @param ns
-	 * @param type
-	 * @param instance
-	 * @param action
-	 * @param description
-	 * @return
-	 */
-	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())
-			trans.debug().log("Adding",role.encode(),"to", perm, "with CachedPermDAO.addRole");
-		invalidate(trans,perm);
-		return rv;
-	}
-
-	public Result<Void> delRole(AuthzTrans trans, Data perm, RoleDAO.Data role) {
-		Result<Void> rv = dao().delRole(trans,perm,role.encode());
-		if(trans.debug().isLoggable())
-			trans.debug().log("Removing",role.encode(),"from", perm, "with CachedPermDAO.delRole");
-		invalidate(trans,perm);
-		return rv;
-	}
+    public CachedPermDAO(PermDAO dao, CIDAO<AuthzTrans> info, long expiresIn) {
+        super(dao, info, PermDAO.CACHE_SEG, expiresIn);
+    }
+
+    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()) {
+            return lurd;
+        } else {
+
+        }
+        return Result.err(Status.ERR_PermissionNotFound,"No Permission found - " + lurd.details);
+    }
+
+    public Result<List<Data>> readChildren(AuthzTrans trans, final String ns, final String type) {
+        return dao().readChildren(trans,ns,type);
+    }
+
+    /**
+     *
+     * @param trans
+     * @param ns
+     * @param type
+     * @return
+     */
+    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()) {
+            return Result.err(Status.ERR_PermissionNotFound,"No Permission found");
+        }
+        return lurd;
+    }
+
+    /**
+     * Add desciption to this permission
+     *
+     * @param trans
+     * @param ns
+     * @param type
+     * @param instance
+     * @param action
+     * @param description
+     * @return
+     */
+    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())
+            trans.debug().log("Adding",role.encode(),"to", perm, "with CachedPermDAO.addRole");
+        invalidate(trans,perm);
+        return rv;
+    }
+
+    public Result<Void> delRole(AuthzTrans trans, Data perm, RoleDAO.Data role) {
+        Result<Void> rv = dao().delRole(trans,perm,role.encode());
+        if (trans.debug().isLoggable())
+            trans.debug().log("Removing",role.encode(),"from", perm, "with CachedPermDAO.delRole");
+        invalidate(trans,perm);
+        return rv;
+    }
 
 
 }