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/LicenseResource.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/services/LicenseResource.java b/securis/src/main/java/net/curisit/securis/services/LicenseResource.java
index 0e25467..0722d55 100644
--- a/securis/src/main/java/net/curisit/securis/services/LicenseResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/LicenseResource.java
@@ -24,7 +24,7 @@
import net.curisit.integrity.commons.Utils;
import net.curisit.integrity.exception.CurisException;
-import net.curisit.securis.SecurisErrorHandler;
+import net.curisit.securis.DefaultExceptionHandler;
import net.curisit.securis.db.License;
import net.curisit.securis.db.Pack;
import net.curisit.securis.db.User;
@@ -111,7 +111,7 @@
pack = em.find(Pack.class, lic.getPackId());
if (pack == null) {
log.error("License pack with id {} not found in DB", lic.getPackId());
- return Response.status(Status.NOT_FOUND).header(SecurisErrorHandler.HEADER_ERROR_MESSAGE, "License's pack not found with ID: " + lic.getPackId()).build();
+ return Response.status(Status.NOT_FOUND).header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER, "License's pack not found with ID: " + lic.getPackId()).build();
}
}
@@ -121,7 +121,7 @@
} catch (CurisException ex) {
String createdByUsername = lic.getCreatedById();
log.error("License created by user with id {} not found in DB", createdByUsername);
- return Response.status(Status.NOT_FOUND).header(SecurisErrorHandler.HEADER_ERROR_MESSAGE, "License's created by user not found with ID: " + createdByUsername).build();
+ return Response.status(Status.NOT_FOUND).header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER, "License's created by user not found with ID: " + createdByUsername).build();
}
try {
@@ -130,7 +130,7 @@
} catch (CurisException ex) {
String canceledByUsername = lic.getCreatedById();
log.error("License canceled by user with id {} not found in DB", canceledByUsername);
- return Response.status(Status.NOT_FOUND).header(SecurisErrorHandler.HEADER_ERROR_MESSAGE, "License's canceled by user not found with ID: " + canceledByUsername).build();
+ return Response.status(Status.NOT_FOUND).header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER, "License's canceled by user not found with ID: " + canceledByUsername).build();
}
lic.setCreationTimestamp(new Date());
@@ -166,7 +166,7 @@
pack = em.find(Pack.class, lic.getPackId());
if (pack == null) {
log.error("License pack with id {} not found in DB", lic.getPackId());
- return Response.status(Status.NOT_FOUND).header(SecurisErrorHandler.HEADER_ERROR_MESSAGE, "License's pack not found with ID: " + lic.getPackId()).build();
+ return Response.status(Status.NOT_FOUND).header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER, "License's pack not found with ID: " + lic.getPackId()).build();
}
}
User createdBy = null;
@@ -175,7 +175,7 @@
} catch (CurisException ex) {
String createdByUsername = lic.getCreatedById();
log.error("License created by user with id {} not found in DB", createdByUsername);
- return Response.status(Status.NOT_FOUND).header(SecurisErrorHandler.HEADER_ERROR_MESSAGE, "License's created by user not found with ID: " + createdByUsername).build();
+ return Response.status(Status.NOT_FOUND).header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER, "License's created by user not found with ID: " + createdByUsername).build();
}
User canceledBy = null;
@@ -184,7 +184,7 @@
} catch (CurisException ex) {
String canceledByUsername = lic.getCreatedById();
log.error("License canceled by user with id {} not found in DB", canceledByUsername);
- return Response.status(Status.NOT_FOUND).header(SecurisErrorHandler.HEADER_ERROR_MESSAGE, "License's canceled by user not found with ID: " + canceledByUsername).build();
+ return Response.status(Status.NOT_FOUND).header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER, "License's canceled by user not found with ID: " + canceledByUsername).build();
}
lic.setCreatedBy(createdBy);
@@ -206,7 +206,7 @@
License org = em.find(License.class, Integer.parseInt(licId));
if (org == null) {
log.error("License with id {} can not be deleted, It was not found in DB", licId);
- return Response.status(Status.NOT_FOUND).header(SecurisErrorHandler.HEADER_ERROR_MESSAGE, "License was not found, ID: " + licId).build();
+ return Response.status(Status.NOT_FOUND).header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER, "License was not found, ID: " + licId).build();
}
em.remove(org);
--
Gitblit v1.3.2