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%2FCachedCredDAO.java;h=b1165c2674afd54667f21c36b9e2a849a480fd9f;hb=bc5f9dec37da59182034c1166a6a9d4150f40847;hp=6bdc22bcf78e750b1eb34537d212157f1f65f0bb;hpb=c14877b3a7409c2b2b64ea24cf56a703d2eddedd;p=aaf%2Fauthz.git

diff --git a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cached/CachedCredDAO.java b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cached/CachedCredDAO.java
index 6bdc22bc..b1165c26 100644
--- a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cached/CachedCredDAO.java
+++ b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cached/CachedCredDAO.java
@@ -3,13 +3,14 @@
  * org.onap.aaf
  * ===========================================================================
  * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 IBM.
  * ===========================================================================
  * 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,10 +35,10 @@ import org.onap.aaf.auth.layer.Result;
 public class CachedCredDAO extends CachedDAO<AuthzTrans, CredDAO, CredDAO.Data> {
     private final ReadID readID;
     private final ReadID readIDBath;
-    
+
     public CachedCredDAO(CredDAO dao, CIDAO<AuthzTrans> info, long expiresIn) {
         super(dao, info, CredDAO.CACHE_SEG, expiresIn);
-        if(FileGetter.isLoaded) {
+        if(FileGetter.isLoaded()) {
             readID = new ReadID() {
                 @Override
                 public Result<List<Data>> read(AuthzTrans trans, final String id) {
@@ -51,11 +52,12 @@ public class CachedCredDAO extends CachedDAO<AuthzTrans, CredDAO, CredDAO.Data>
                 @Override
                 public Result<List<Data>> read(AuthzTrans trans, final String id) {
                     DAOGetter getter = new DAOGetter(trans,dao()) {
+                        @Override
                         public Result<List<CredDAO.Data>> call() {
                             return dao().readID(trans, id);
                         }
                     };
-                    
+
                     Result<List<CredDAO.Data>> lurd = get(trans, id, getter);
                     if (lurd.isOK() && lurd.isEmpty()) {
                         return Result.err(Status.ERR_UserNotFound,"No User Cred found");
@@ -63,16 +65,17 @@ public class CachedCredDAO extends CachedDAO<AuthzTrans, CredDAO, CredDAO.Data>
                     return lurd;
                 }
             };
-            
+
             readIDBath = new ReadID() {
                 @Override
                 public Result<List<Data>> read(AuthzTrans trans, final String id) {
                      DAOGetter getter = new DAOGetter(trans,dao()) {
+                         @Override
                          public Result<List<CredDAO.Data>> call() {
                              return dao().readIDBAth(trans, id);
                          }
                      };
-                     
+
                      Result<List<CredDAO.Data>> lurd = get(trans, id, getter);
                      if (lurd.isOK() && lurd.isEmpty()) {
                          return Result.err(Status.ERR_UserNotFound,"No User Cred found");
@@ -82,18 +85,18 @@ public class CachedCredDAO extends CachedDAO<AuthzTrans, CredDAO, CredDAO.Data>
             };
         }
     }
-    
+
     /**
      * Pass through Cred Lookup
-     * 
+     *
      * Unlike Role and Perm, we don't need or want to cache these elements... Only used for NS Delete.
-     * 
+     *
      * @param trans
      * @param ns
      * @return
      */
     public Result<List<CredDAO.Data>> readNS(AuthzTrans trans, final String ns) {
-        
+
         return dao().readNS(trans, ns);
     }
 
@@ -105,6 +108,7 @@ public class CachedCredDAO extends CachedDAO<AuthzTrans, CredDAO, CredDAO.Data>
         return readIDBath.read(trans,id);
     }
 
+    @FunctionalInterface
     private interface ReadID {
         public Result<List<CredDAO.Data>> read(final AuthzTrans trans, final String id);
     }