- .filter(rapp -> rapp.getRappInstances().isEmpty() && rapp.getState().equals(RappState.COMMISSIONED))
- .map(rapp -> {
- rappCacheService.deleteRapp(rapp);
- return ResponseEntity.ok().build();
- })
- .orElse(ResponseEntity.notFound().build());
+ .map(rappService::deleteRapp)
+ .orElseThrow(() -> new RappHandlerException(HttpStatus.NOT_FOUND,
+ String.format(RAPP_NOT_FOUND, rappId)));