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=fbc481ba674204cd9972c5c53563110fd0a1a1be;hp=ec7d7b2b7d6c8c105face7ead6d4f20015eac1a2;hpb=a071d6befe8d38a5e589dffbbf1dc3904ff3aa79;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 ec7d7b2..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
@@ -19,6 +19,9 @@
 package com.oransc.rappmanager.models.cache;
 
 import com.oransc.rappmanager.models.rapp.Rapp;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.cache.Cache;
@@ -29,16 +32,20 @@ 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 Cache getAllRapp() {
-        return cacheManager.getCache(RAPP_CACHE);
+    public Collection<Rapp> getAllRapp() {
+        Cache cache = cacheManager.getCache(RAPP_CACHE);
+        if(cache != null) {
+            Map<String, Rapp> nativeCache = (Map<String, Rapp>) cache.getNativeCache();
+            return nativeCache.values();
+        }
+        return List.of();
     }
 
     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) {