From b83a0ba903b56562751963c106b4c20352c26087 Mon Sep 17 00:00:00 2001
From: Roberto Sánchez <roberto.sanchez@curisit.net>
Date: Tue, 21 Jan 2014 10:43:29 +0000
Subject: [PATCH] #396 feature - Refactoring error management
---
securis/src/main/java/net/curisit/securis/services/ApplicationResource.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/services/ApplicationResource.java b/securis/src/main/java/net/curisit/securis/services/ApplicationResource.java
index c324e7d..8b4f6fe 100644
--- a/securis/src/main/java/net/curisit/securis/services/ApplicationResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/ApplicationResource.java
@@ -23,7 +23,7 @@
import javax.ws.rs.core.Response.Status;
import net.curisit.integrity.commons.Utils;
-import net.curisit.securis.SecurisErrorHandler;
+import net.curisit.securis.DefaultExceptionHandler;
import net.curisit.securis.db.Application;
import net.curisit.securis.utils.TokenHelper;
@@ -88,7 +88,8 @@
Application app = em.find(Application.class, Integer.parseInt(appid));
if (app == null) {
log.error("Application with id {} not found in DB", appid);
- return Response.status(Status.NOT_FOUND).header(SecurisErrorHandler.HEADER_ERROR_MESSAGE, "Application not found with ID: " + appid).build();
+
+ return Response.status(Status.NOT_FOUND).header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER, "Application not found with ID: " + appid).build();
}
return Response.ok(app).build();
}
@@ -121,7 +122,7 @@
Application currentapp = em.find(Application.class, Integer.parseInt(appid));
if (currentapp == null) {
log.error("Application with id {} not found in DB", appid);
- return Response.status(Status.NOT_FOUND).header(SecurisErrorHandler.HEADER_ERROR_MESSAGE, "Application not found with ID: " + appid).build();
+ return Response.status(Status.NOT_FOUND).header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER, "Application not found with ID: " + appid).build();
}
currentapp.setName(app.getName());
currentapp.setDescription(app.getDescription());
@@ -141,11 +142,11 @@
Application app = em.find(Application.class, Integer.parseInt(appid));
if (app == null) {
log.error("Application with id {} can not be deleted, It was not found in DB", appid);
- return Response.status(Status.NOT_FOUND).header(SecurisErrorHandler.HEADER_ERROR_MESSAGE, "Application not found with ID: " + appid).build();
+ return Response.status(Status.NOT_FOUND).header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER, "Application not found with ID: " + appid).build();
}
if (app.getLicenseTypes() != null && app.getLicenseTypes().size() > 0) {
- return Response.status(Status.FORBIDDEN).header(SecurisErrorHandler.HEADER_ERROR_MESSAGE, "Application can not be deleted becasue has assigned one or more License types, ID: " + appid).build();
+ return Response.status(Status.FORBIDDEN).header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER, "Application can not be deleted becasue has assigned one or more License types, ID: " + appid).build();
}
em.remove(app);
--
Gitblit v1.3.2