-//TODO check if an expected bug was justifying this NPE handling
-// try {
- Optional<Services> service = this.serviceDataStoreOperations.getService(serviceName);
-// } catch (NullPointerException e) {
-// LOG.error("Something wrong when retrieving service '{}' from datastore : ", serviceName, e);
-// return ModelMappingUtils.createDeleteServiceReply(
-// input, ResponseCodes.FINAL_ACK_YES,
-// LogMessages.serviceNotInDS(serviceName), ResponseCodes.RESPONSE_FAILED);
-// }
- if (!service.isPresent()) {
- LOG.warn("serviceDelete: {}", LogMessages.serviceNotInDS(serviceName));
+ Optional<Services> serviceOpt = this.serviceDataStoreOperations.getService(serviceName);
+ Services service;
+ if (serviceOpt.isEmpty()) {
+ LOG.warn(SERVICE_DELETE_MSG, LogMessages.serviceNotInDS(serviceName));