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%2FCachedUserRoleDAO.java;h=c1aa9017450ad6d270dca2835861dcffc2e80bfc;hb=7e966914050e66219689001ff4ab601a49eef0ac;hp=100c81d510ebcb2fe866958902d249ca908607aa;hpb=f85f0889b3b0e5e9694afab4dd01a4a97a155188;p=aaf%2Fauthz.git

diff --git a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cached/CachedUserRoleDAO.java b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cached/CachedUserRoleDAO.java
index 100c81d5..c1aa9017 100644
--- a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cached/CachedUserRoleDAO.java
+++ b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cached/CachedUserRoleDAO.java
@@ -34,82 +34,82 @@ import org.onap.aaf.auth.layer.Result;
 import org.onap.aaf.misc.env.Slot;
 
 public class CachedUserRoleDAO extends CachedDAO<AuthzTrans,UserRoleDAO, UserRoleDAO.Data> {
-	private Slot transURSlot;
+    private Slot transURSlot;
 
-	public CachedUserRoleDAO(UserRoleDAO dao, CIDAO<AuthzTrans> info, long expiresIn) {
-		super(dao, info, UserRoleDAO.CACHE_SEG, expiresIn);
-		transURSlot = dao.transURSlot;
-	}
+    public CachedUserRoleDAO(UserRoleDAO dao, CIDAO<AuthzTrans> info, long expiresIn) {
+        super(dao, info, UserRoleDAO.CACHE_SEG, expiresIn);
+        transURSlot = dao.transURSlot;
+    }
 
-	/**
-	 * Special Case.  
-	 * User Roles by User are very likely to be called many times in a Transaction, to validate "May User do..."
-	 * Pull result, and make accessible by the Trans, which is always keyed by User.
-	 * @param trans
-	 * @param user
-	 * @return
-	 */
-	public Result<List<Data>> readByUser(AuthzTrans trans, final String user) {
-		DAOGetter getter = new DAOGetter(trans,dao()) {
-			public Result<List<Data>> call() {
-				// If the call is for THIS user, and it exists, get from TRANS, add to TRANS if not.
-				if(user!=null && user.equals(trans.user())) {
-					Result<List<Data>> transLD = trans.get(transURSlot,null);
-					if(transLD==null ) {
-						transLD = dao.readByUser(trans, user);
-					}
-					return transLD;
-				} else {
-					return dao.readByUser(trans, user);
-				}
-			}
-		};
-		Result<List<Data>> lurd = get(trans, user, getter);
-		if(lurd.isOK() && lurd.isEmpty()) {
-			return Result.err(Status.ERR_UserRoleNotFound,"UserRole not found for [%s]",user);
-		}
-		return lurd;
-	}
+    /**
+     * Special Case.  
+     * User Roles by User are very likely to be called many times in a Transaction, to validate "May User do..."
+     * Pull result, and make accessible by the Trans, which is always keyed by User.
+     * @param trans
+     * @param user
+     * @return
+     */
+    public Result<List<Data>> readByUser(AuthzTrans trans, final String user) {
+        DAOGetter getter = new DAOGetter(trans,dao()) {
+            public Result<List<Data>> call() {
+                // If the call is for THIS user, and it exists, get from TRANS, add to TRANS if not.
+                if (user!=null && user.equals(trans.user())) {
+                    Result<List<Data>> transLD = trans.get(transURSlot,null);
+                    if (transLD==null ) {
+                        transLD = dao.readByUser(trans, user);
+                    }
+                    return transLD;
+                } else {
+                    return dao.readByUser(trans, user);
+                }
+            }
+        };
+        Result<List<Data>> lurd = get(trans, user, getter);
+        if (lurd.isOK() && lurd.isEmpty()) {
+            return Result.err(Status.ERR_UserRoleNotFound,"UserRole not found for [%s]",user);
+        }
+        return lurd;
+    }
 
-	
-	public Result<List<Data>> readByRole(AuthzTrans trans, final String role) {
-		DAOGetter getter = new DAOGetter(trans,dao()) {
-			public Result<List<Data>> call() {
-				return dao.readByRole(trans, role);
-			}
-		};
-		Result<List<Data>> lurd = get(trans, role, getter);
-		if(lurd.isOK() && lurd.isEmpty()) {
-			return Result.err(Status.ERR_UserRoleNotFound,"UserRole not found for [%s]",role);
-		}
-		return lurd;
-	}
+    
+    public Result<List<Data>> readByRole(AuthzTrans trans, final String role) {
+        DAOGetter getter = new DAOGetter(trans,dao()) {
+            public Result<List<Data>> call() {
+                return dao.readByRole(trans, role);
+            }
+        };
+        Result<List<Data>> lurd = get(trans, role, getter);
+        if (lurd.isOK() && lurd.isEmpty()) {
+            return Result.err(Status.ERR_UserRoleNotFound,"UserRole not found for [%s]",role);
+        }
+        return lurd;
+    }
 
-	public Result<List<UserRoleDAO.Data>> readUserInRole(final AuthzTrans trans, final String user, final String role) {
-		DAOGetter getter = new DAOGetter(trans,dao()) {
-			public Result<List<Data>> call() {
-				if(user.equals(trans.user())) {
-					Result<List<Data>> rrbu = readByUser(trans, user);
-					if(rrbu.isOK()) {
-						List<Data> ld = new ArrayList<>(1);
-						for(Data d : rrbu.value) {
-							if(d.role.equals(role)) {
-								ld.add(d);
-								break;
-							}
-						}
-						return Result.ok(ld).emptyList(ld.isEmpty());
-					} else {
-						return rrbu;
-					}
-				}
-				return dao.readByUserRole(trans, user, role);
-			}
-		};
-		Result<List<Data>> lurd = get(trans, keyFromObjs(user,role), getter);
-		if(lurd.isOK() && lurd.isEmpty()) {
-			return Result.err(Status.ERR_UserRoleNotFound,"UserRole not found for role [%s] and user [%s]",role,user);
-		}
-		return lurd;
-	}
+    public Result<List<UserRoleDAO.Data>> readUserInRole(final AuthzTrans trans, final String user, final String role) {
+        DAOGetter getter = new DAOGetter(trans,dao()) {
+            public Result<List<Data>> call() {
+                if (user.equals(trans.user())) {
+                    Result<List<Data>> rrbu = readByUser(trans, user);
+                    if (rrbu.isOK()) {
+                        List<Data> ld = new ArrayList<>(1);
+                        for (Data d : rrbu.value) {
+                            if (d.role.equals(role)) {
+                                ld.add(d);
+                                break;
+                            }
+                        }
+                        return Result.ok(ld).emptyList(ld.isEmpty());
+                    } else {
+                        return rrbu;
+                    }
+                }
+                return dao.readByUserRole(trans, user, role);
+            }
+        };
+        Result<List<Data>> lurd = get(trans, keyFromObjs(user,role), getter);
+        if (lurd.isOK() && lurd.isEmpty()) {
+            return Result.err(Status.ERR_UserRoleNotFound,"UserRole not found for role [%s] and user [%s]",role,user);
+        }
+        return lurd;
+    }
 }