Commit 5fa4e769 authored by Spiros Koulouzis's avatar Spiros Koulouzis

added null check

parent 0c872925
...@@ -89,6 +89,9 @@ public class ConfigurationService { ...@@ -89,6 +89,9 @@ public class ConfigurationService {
@PostAuthorize("(returnObject.owner == authentication.name) or (hasRole('ROLE_ADMIN'))") @PostAuthorize("(returnObject.owner == authentication.name) or (hasRole('ROLE_ADMIN'))")
public ConfigurationRepresentation delete(String id) { public ConfigurationRepresentation delete(String id) {
ConfigurationRepresentation tr = dao.findOne(id); ConfigurationRepresentation tr = dao.findOne(id);
if(tr == null){
throw new NotFoundException();
}
dao.delete(tr); dao.delete(tr);
return tr; return tr;
} }
......
...@@ -250,6 +250,7 @@ public class ProvisionService { ...@@ -250,6 +250,7 @@ public class ProvisionService {
parameters.add(topology); parameters.add(topology);
Set<String> ids = plan.getLoweLevelPlanIDs(); Set<String> ids = plan.getLoweLevelPlanIDs();
if (ids != null) {
for (String lowID : ids) { for (String lowID : ids) {
PlanResponse lowPlan = planService.getDao().findOne(lowID); PlanResponse lowPlan = planService.getDao().findOne(lowID);
topology = new MessageParameter(); topology = new MessageParameter();
...@@ -263,6 +264,7 @@ public class ProvisionService { ...@@ -263,6 +264,7 @@ public class ProvisionService {
topology.setAttributes(attributes); topology.setAttributes(attributes);
parameters.add(topology); parameters.add(topology);
} }
}
return parameters; return parameters;
} }
......
...@@ -135,11 +135,16 @@ public class ConfigurationController { ...@@ -135,11 +135,16 @@ public class ConfigurationController {
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE) @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
@RolesAllowed({UserService.USER, UserService.ADMIN}) @RolesAllowed({UserService.USER, UserService.ADMIN})
@StatusCodes({ @StatusCodes({
@ResponseCode(code = 200, condition = "Successful delete") @ResponseCode(code = 200, condition = "Successful delete"),
@ResponseCode(code = 404, condition = "Object not found")
}) })
public @ResponseBody public @ResponseBody
String delete(@PathVariable("id") String id) { String delete(@PathVariable("id") String id) {
try {
configurationService.delete(id); configurationService.delete(id);
} catch (NotFoundException ex) {
throw ex;
}
return "Deleted : " + id; return "Deleted : " + id;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment