- return rappCacheService.getRapp(rappId).map(rapp -> Pair.of(rapp, rapp.getRappInstances()))
- .filter(rappPair -> rappPair.getRight().containsKey(rappInstanceId) && rappPair.getRight()
- .get(rappInstanceId)
- .getState()
- .equals(RappInstanceState.UNDEPLOYED))
- .map(rappPair -> {
- rappInstanceStateMachine.deleteRappInstance(
- rappPair.getLeft().getRappInstances().get(rappInstanceId));
- rappPair.getLeft().getRappInstances().remove(rappInstanceId);
- return ResponseEntity.noContent().build();
- }).orElseThrow(() -> new RappHandlerException(HttpStatus.NOT_FOUND,
- String.format(RAPP_INSTANCE_NOT_FOUND, rappId)));
+ return rappCacheService.getRapp(rappId).filter(rApp -> rApp.getRappInstances().containsKey(rappInstanceId))
+ .map(rApp -> rappService.deleteRappInstance(rApp, rappInstanceId)).orElseThrow(
+ () -> new RappHandlerException(HttpStatus.NOT_FOUND,
+ String.format(RAPP_INSTANCE_NOT_FOUND, rappId)));