X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=rapp-manager-models%2Fsrc%2Fmain%2Fjava%2Fcom%2Foransc%2Frappmanager%2Fmodels%2Fcache%2FRappCacheService.java;h=cdc42c696bf652eed43a56667ba0c968c2fa60c4;hb=fc63eb0da4e4426fbfbecdd4f95bec68ca3ceded;hp=ea34ae3193e10248e053516a23fa60494726d943;hpb=cc47a6f5ed71a062df5fa94aadc5d1eb87cd3258;p=nonrtric%2Fplt%2Frappmanager.git

diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/cache/RappCacheService.java b/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/cache/RappCacheService.java
index ea34ae3..cdc42c6 100755
--- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/cache/RappCacheService.java
+++ b/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/cache/RappCacheService.java
@@ -32,12 +32,12 @@ import org.springframework.stereotype.Service;
 @RequiredArgsConstructor
 public class RappCacheService {
 
-    private final String RAPP_CACHE = "rapp-cache";
+    private static final String RAPP_CACHE = "rapp-cache";
     private final CacheManager cacheManager;
 
     public Collection<Rapp> getAllRapp() {
         Cache cache = cacheManager.getCache(RAPP_CACHE);
-        if (cache != null) {
+        if(cache != null) {
             Map<String, Rapp> nativeCache = (Map<String, Rapp>) cache.getNativeCache();
             return nativeCache.values();
         }
@@ -45,8 +45,7 @@ public class RappCacheService {
     }
 
     public Optional<Rapp> getRapp(String rappId) {
-        final Cache cache = cacheManager.getCache(RAPP_CACHE);
-        return Optional.ofNullable(cache.get(rappId, Rapp.class));
+        return Optional.ofNullable(cacheManager.getCache(RAPP_CACHE)).map(cache -> cache.get(rappId, Rapp.class));
     }
 
     public void putRapp(Rapp rapp) {