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/OrganizationResource.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/services/OrganizationResource.java b/securis/src/main/java/net/curisit/securis/services/OrganizationResource.java
index e13bd7b..915895a 100644
--- a/securis/src/main/java/net/curisit/securis/services/OrganizationResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/OrganizationResource.java
@@ -25,7 +25,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.Organization;
import net.curisit.securis.db.User;
import net.curisit.securis.security.BasicSecurityContext;
@@ -146,7 +146,7 @@
parentOrg = em.find(Organization.class, org.getParentOrgId());
if (parentOrg == null) {
log.error("Organization parent with id {} not found in DB", org.getParentOrgId());
- return Response.status(Status.NOT_FOUND).header(SecurisErrorHandler.HEADER_ERROR_MESSAGE, "Organization's parent not found with ID: " + org.getParentOrgId()).build();
+ return Response.status(Status.NOT_FOUND).header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER, "Organization's parent not found with ID: " + org.getParentOrgId()).build();
}
}
List<User> users = null;
@@ -157,7 +157,7 @@
User user = em.find(User.class, username);
if (user == null) {
log.error("Organization user with id {} not found in DB", username);
- return Response.status(Status.NOT_FOUND).header(SecurisErrorHandler.HEADER_ERROR_MESSAGE, "Organization's user not found with ID: " + username).build();
+ return Response.status(Status.NOT_FOUND).header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER, "Organization's user not found with ID: " + username).build();
}
users.add(user);
}
@@ -186,18 +186,18 @@
Organization currentOrg = em.find(Organization.class, Integer.parseInt(orgid));
if (currentOrg == null) {
log.error("Organization with id {} not found in DB", orgid);
- return Response.status(Status.NOT_FOUND).header(SecurisErrorHandler.HEADER_ERROR_MESSAGE, "Organization not found with ID: " + orgid).build();
+ return Response.status(Status.NOT_FOUND).header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER, "Organization not found with ID: " + orgid).build();
}
Organization parentOrg = null;
if (org.getParentOrgId() != null) {
parentOrg = em.find(Organization.class, org.getParentOrgId());
if (parentOrg == null) {
log.error("Organization parent with id {} not found in DB", org.getParentOrgId());
- return Response.status(Status.NOT_FOUND).header(SecurisErrorHandler.HEADER_ERROR_MESSAGE, "Organization's parent not found with ID: " + org.getParentOrgId()).build();
+ return Response.status(Status.NOT_FOUND).header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER, "Organization's parent not found with ID: " + org.getParentOrgId()).build();
}
if (isCyclicalRelationship(currentOrg.getId(), parentOrg)) {
log.error("Organization parent generate a cyclical relationship, parent id {}, current id: {}", org.getParentOrgId(), currentOrg.getId());
- return Response.status(Status.FORBIDDEN).header(SecurisErrorHandler.HEADER_ERROR_MESSAGE, "Cyclical relationships are not allowed, please change the parent organization, current Parent: " + parentOrg.getName()).build();
+ return Response.status(Status.FORBIDDEN).header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER, "Cyclical relationships are not allowed, please change the parent organization, current Parent: " + parentOrg.getName()).build();
}
}
@@ -209,7 +209,7 @@
User user = em.find(User.class, username);
if (user == null) {
log.error("Organization user with id '{}' not found in DB", username);
- return Response.status(Status.NOT_FOUND).header(SecurisErrorHandler.HEADER_ERROR_MESSAGE, "Organization's user not found with ID: " + username).build();
+ return Response.status(Status.NOT_FOUND).header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER, "Organization's user not found with ID: " + username).build();
}
users.add(user);
}
@@ -238,11 +238,11 @@
Organization org = em.find(Organization.class, Integer.parseInt(orgid));
if (org == null) {
log.error("Organization with id {} can not be deleted, It was not found in DB", orgid);
- return Response.status(Status.NOT_FOUND).header(SecurisErrorHandler.HEADER_ERROR_MESSAGE, "Organization was not found, ID: " + orgid).build();
+ return Response.status(Status.NOT_FOUND).header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER, "Organization was not found, ID: " + orgid).build();
}
if (org.getChildOrganizations() != null && org.getChildOrganizations().size() > 0) {
log.error("Organization has children and can not be deleted, ID: " + orgid);
- return Response.status(Status.FORBIDDEN).header(SecurisErrorHandler.HEADER_ERROR_MESSAGE, "Organization has children and can not be deleted, ID: " + orgid).build();
+ return Response.status(Status.FORBIDDEN).header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER, "Organization has children and can not be deleted, ID: " + orgid).build();
}
em.remove(org);
--
Gitblit v1.3.2