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=d2b273c2888b37d5bd15702e8f714dfa237baba3;hpb=347f178c656d82aa0c6d4ab56eb0846a94d7af40;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 d2b273c..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
@@ -18,8 +18,10 @@
 
 package com.oransc.rappmanager.models.cache;
 
-import com.oransc.rappmanager.models.Rapp;
-import com.oransc.rappmanager.models.statemachine.RappStateMachine;
+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;
@@ -30,19 +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;
-    private final RappStateMachine rappStateMachine;
 
-    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);
-        Optional<Rapp> rappOptional = Optional.ofNullable(cache.get(rappId, Rapp.class));
-        rappOptional.ifPresent(rapp -> rapp.setState(rappStateMachine.getRappState(rapp.getRappId())));
-        return rappOptional;
+        return Optional.ofNullable(cacheManager.getCache(RAPP_CACHE)).map(cache -> cache.get(rappId, Rapp.class));
     }
 
     public void putRapp(Rapp rapp) {