Code Review
/
nonrtric
/
plt
/
rappmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add proper error messages on delete rApp response
[nonrtric/plt/rappmanager.git]
/
rapp-manager-application
/
src
/
main
/
java
/
com
/
oransc
/
rappmanager
/
rest
/
RappController.java
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
(executable)
--- 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}")
}
@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)
// @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
.orElseThrow(() -> new RappHandlerException(HttpStatus.NOT_FOUND,
String.format(RAPP_NOT_FOUND, rappId)));
// @formatter:on