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

added null check

parent 0c872925
......@@ -89,6 +89,9 @@ public class ConfigurationService {
@PostAuthorize("(returnObject.owner == authentication.name) or (hasRole('ROLE_ADMIN'))")
public ConfigurationRepresentation delete(String id) {
ConfigurationRepresentation tr = dao.findOne(id);
if(tr == null){
throw new NotFoundException();
}
dao.delete(tr);
return tr;
}
......
......@@ -250,18 +250,20 @@ public class ProvisionService {
parameters.add(topology);
Set<String> ids = plan.getLoweLevelPlanIDs();
for (String lowID : ids) {
PlanResponse lowPlan = planService.getDao().findOne(lowID);
topology = new MessageParameter();
topology.setName("topology");
String value = Converter.map2YmlString(lowPlan.getKeyValue());
value = value.replaceAll("\\uff0E", ".");
topology.setValue(value);
attributes = new HashMap<>();
attributes.put("level", String.valueOf(lowPlan.getLevel()));
attributes.put("filename", FilenameUtils.removeExtension(lowPlan.getName()));
topology.setAttributes(attributes);
parameters.add(topology);
if (ids != null) {
for (String lowID : ids) {
PlanResponse lowPlan = planService.getDao().findOne(lowID);
topology = new MessageParameter();
topology.setName("topology");
String value = Converter.map2YmlString(lowPlan.getKeyValue());
value = value.replaceAll("\\uff0E", ".");
topology.setValue(value);
attributes = new HashMap<>();
attributes.put("level", String.valueOf(lowPlan.getLevel()));
attributes.put("filename", FilenameUtils.removeExtension(lowPlan.getName()));
topology.setAttributes(attributes);
parameters.add(topology);
}
}
return parameters;
}
......
......@@ -135,11 +135,16 @@ public class ConfigurationController {
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
@RolesAllowed({UserService.USER, UserService.ADMIN})
@StatusCodes({
@ResponseCode(code = 200, condition = "Successful delete")
@ResponseCode(code = 200, condition = "Successful delete"),
@ResponseCode(code = 404, condition = "Object not found")
})
public @ResponseBody
String delete(@PathVariable("id") String id) {
configurationService.delete(id);
try {
configurationService.delete(id);
} catch (NotFoundException ex) {
throw ex;
}
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