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=ec7d7b2b7d6c8c105face7ead6d4f20015eac1a2;hb=a071d6befe8d38a5e589dffbbf1dc3904ff3aa79;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..ec7d7b2 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,7 @@ 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.Optional; import lombok.RequiredArgsConstructor; import org.springframework.cache.Cache; @@ -32,7 +31,6 @@ public class RappCacheService { private final String RAPP_CACHE = "rapp-cache"; private final CacheManager cacheManager; - private final RappStateMachine rappStateMachine; public Cache getAllRapp() { return cacheManager.getCache(RAPP_CACHE); @@ -40,9 +38,7 @@ public class RappCacheService { public Optional getRapp(String rappId) { final Cache cache = cacheManager.getCache(RAPP_CACHE); - Optional rappOptional = Optional.ofNullable(cache.get(rappId, Rapp.class)); - rappOptional.ifPresent(rapp -> rapp.setState(rappStateMachine.getRappState(rapp.getRappId()))); - return rappOptional; + return Optional.ofNullable(cache.get(rappId, Rapp.class)); } public void putRapp(Rapp rapp) {