X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=rapp-manager-application%2Fsrc%2Fmain%2Fjava%2Fcom%2Foransc%2Frappmanager%2Frest%2FRappController.java;h=287e2972f314ffa6a34e7f569c454d42c10ac6d8;hb=b5c6c711f527ccf4a288457fb7168cbbf7399f24;hp=7510a5c08a37732cd666787935997e2aa1946384;hpb=6ab517a1fe9ea8bd69645a9bcb70839a436e8ea4;p=nonrtric%2Fplt%2Frappmanager.git

diff --git a/rapp-manager-application/src/main/java/com/oransc/rappmanager/rest/RappController.java b/rapp-manager-application/src/main/java/com/oransc/rappmanager/rest/RappController.java
index 7510a5c..287e297 100755
--- a/rapp-manager-application/src/main/java/com/oransc/rappmanager/rest/RappController.java
+++ b/rapp-manager-application/src/main/java/com/oransc/rappmanager/rest/RappController.java
@@ -108,14 +108,10 @@ public class RappController {
     }
 
     @DeleteMapping("{rapp_id}")
-    public ResponseEntity<Object> deleteRapp(@PathVariable("rapp_id") String rappId) {
+    public ResponseEntity<String> deleteRapp(@PathVariable("rapp_id") String rappId) {
         // @formatter:off
         return rappCacheService.getRapp(rappId)
-               .filter(rapp -> rapp.getRappInstances().isEmpty() && rapp.getState().equals(RappState.COMMISSIONED))
-               .map(rapp -> {
-                   rappCacheService.deleteRapp(rapp);
-                   return ResponseEntity.ok().build();
-               })
+               .map(rappService::deleteRapp)
                .orElseThrow(() -> new RappHandlerException(HttpStatus.NOT_FOUND,
                        String.format(RAPP_NOT_FOUND, rappId)));
         // @formatter:on