From e4d5325f31847e5a6d1e4611f2ec08efba446476 Mon Sep 17 00:00:00 2001
From: John Woodlock <john.woodlock@gmail.com>
Date: Wed, 11 Jul 2012 15:31:46 +1000
Subject: [PATCH] ensure all exception mappers return JSON (can revert to
 html/text if resource allows that format

---
 .../api/errorhandling/AccessDeniedExceptionMapper.java         | 3 ++-
 .../api/errorhandling/BadCredentialsExceptionMapper.java       | 3 ++-
 .../api/errorhandling/NoAuthorizationExceptionMapper.java      | 3 ++-
 .../PlatformApiDataValidationExceptionMapper.java              | 3 ++-
 .../api/errorhandling/PlatformDomainRuleExceptionMapper.java   | 3 ++-
 .../errorhandling/PlatformInternalServerExceptionMapper.java   | 3 ++-
 .../errorhandling/PlatformResourceNotFoundExceptionMapper.java | 3 ++-
 .../api/errorhandling/UnAuthenticatedUserExceptionMapper.java  | 3 ++-
 .../api/errorhandling/UnrecognizedPropertyExceptionMapper.java | 3 ++-
 .../errorhandling/UnrecognizedQueryParamExceptionMapper.java   | 3 ++-
 10 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/AccessDeniedExceptionMapper.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/AccessDeniedExceptionMapper.java
index 21373b66d..2fca3558d 100644
--- a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/AccessDeniedExceptionMapper.java
+++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/AccessDeniedExceptionMapper.java
@@ -1,5 +1,6 @@
 package org.mifosng.platform.api.errorhandling;
 
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.ext.ExceptionMapper;
@@ -24,6 +25,6 @@ public class AccessDeniedExceptionMapper implements ExceptionMapper<AccessDenied
 	@Override
 	public Response toResponse(AccessDeniedException exception) {
 		// Status code 403 really reads as: "Authenticated - but not authorized":
-		return Response.status(Status.FORBIDDEN).entity(ApiGlobalErrorResponse.unAuthorized()).build();
+		return Response.status(Status.FORBIDDEN).entity(ApiGlobalErrorResponse.unAuthorized()).type(MediaType.APPLICATION_JSON).build();
 	}
 }
\ No newline at end of file
diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/BadCredentialsExceptionMapper.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/BadCredentialsExceptionMapper.java
index e8e8f09ff..1bbc3695f 100644
--- a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/BadCredentialsExceptionMapper.java
+++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/BadCredentialsExceptionMapper.java
@@ -1,5 +1,6 @@
 package org.mifosng.platform.api.errorhandling;
 
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.ext.ExceptionMapper;
@@ -22,6 +23,6 @@ public class BadCredentialsExceptionMapper implements ExceptionMapper<BadCredent
 
 	@Override
 	public Response toResponse(BadCredentialsException exception) {
-		return Response.status(Status.UNAUTHORIZED).entity(ApiGlobalErrorResponse.unAuthenticated()).build();
+		return Response.status(Status.UNAUTHORIZED).entity(ApiGlobalErrorResponse.unAuthenticated()).type(MediaType.APPLICATION_JSON).build();
 	}
 }
\ No newline at end of file
diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/NoAuthorizationExceptionMapper.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/NoAuthorizationExceptionMapper.java
index ad72f9dfd..89e0e8a9d 100644
--- a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/NoAuthorizationExceptionMapper.java
+++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/NoAuthorizationExceptionMapper.java
@@ -1,5 +1,6 @@
 package org.mifosng.platform.api.errorhandling;
 
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.ext.ExceptionMapper;
@@ -24,6 +25,6 @@ public class NoAuthorizationExceptionMapper implements ExceptionMapper<NoAuthori
 	@Override
 	public Response toResponse(NoAuthorizationException exception) {
 		// Status code 403 really reads as: "Authenticated - but not authorized":
-		return Response.status(Status.FORBIDDEN).entity(ApiGlobalErrorResponse.unAuthorized()).build();
+		return Response.status(Status.FORBIDDEN).entity(ApiGlobalErrorResponse.unAuthorized()).type(MediaType.APPLICATION_JSON).build();
 	}
 }
\ No newline at end of file
diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformApiDataValidationExceptionMapper.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformApiDataValidationExceptionMapper.java
index 12c6e14fc..dbe072ce2 100644
--- a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformApiDataValidationExceptionMapper.java
+++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformApiDataValidationExceptionMapper.java
@@ -1,5 +1,6 @@
 package org.mifosng.platform.api.errorhandling;
 
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.ext.ExceptionMapper;
@@ -26,6 +27,6 @@ public class PlatformApiDataValidationExceptionMapper implements ExceptionMapper
 		ApiGlobalErrorResponse dataIntegrityError = ApiGlobalErrorResponse.badClientRequest(exception.getGlobalisationMessageCode(), 
 									exception.getDefaultUserMessage(), exception.getErrors());
 		
-		return Response.status(Status.BAD_REQUEST).entity(dataIntegrityError).build();
+		return Response.status(Status.BAD_REQUEST).entity(dataIntegrityError).type(MediaType.APPLICATION_JSON).build();
 	}
 }
\ No newline at end of file
diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformDomainRuleExceptionMapper.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformDomainRuleExceptionMapper.java
index e9622eec4..4e9c2e892 100644
--- a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformDomainRuleExceptionMapper.java
+++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformDomainRuleExceptionMapper.java
@@ -1,5 +1,6 @@
 package org.mifosng.platform.api.errorhandling;
 
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.ext.ExceptionMapper;
@@ -25,6 +26,6 @@ public class PlatformDomainRuleExceptionMapper implements ExceptionMapper<Abstra
 		
 		ApiGlobalErrorResponse notFoundErrorResponse = ApiGlobalErrorResponse.domainRuleViolation(exception.getGlobalisationMessageCode(), exception.getDefaultUserMessage(), exception.getDefaultUserMessageArgs());
 		// request understood but not carried out due to it violating some domain/business logic
-		return Response.status(Status.FORBIDDEN).entity(notFoundErrorResponse).build();
+		return Response.status(Status.FORBIDDEN).entity(notFoundErrorResponse).type(MediaType.APPLICATION_JSON).build();
 	}
 }
\ No newline at end of file
diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformInternalServerExceptionMapper.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformInternalServerExceptionMapper.java
index 2d763fa99..d0228a4d8 100644
--- a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformInternalServerExceptionMapper.java
+++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformInternalServerExceptionMapper.java
@@ -1,5 +1,6 @@
 package org.mifosng.platform.api.errorhandling;
 
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.ext.ExceptionMapper;
@@ -24,6 +25,6 @@ public class PlatformInternalServerExceptionMapper implements ExceptionMapper<Pl
 	public Response toResponse(PlatformInternalServerException exception) {
 		
 		ApiGlobalErrorResponse notFoundErrorResponse = ApiGlobalErrorResponse.notFound(exception.getGlobalisationMessageCode(), exception.getDefaultUserMessage(), exception.getDefaultUserMessageArgs());
-		return Response.status(Status.INTERNAL_SERVER_ERROR).entity(notFoundErrorResponse).build();
+		return Response.status(Status.INTERNAL_SERVER_ERROR).entity(notFoundErrorResponse).type(MediaType.APPLICATION_JSON).build();
 	}
 }
\ No newline at end of file
diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformResourceNotFoundExceptionMapper.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformResourceNotFoundExceptionMapper.java
index e9c647330..f87fd3531 100644
--- a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformResourceNotFoundExceptionMapper.java
+++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/PlatformResourceNotFoundExceptionMapper.java
@@ -1,5 +1,6 @@
 package org.mifosng.platform.api.errorhandling;
 
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.ext.ExceptionMapper;
@@ -24,6 +25,6 @@ public class PlatformResourceNotFoundExceptionMapper implements ExceptionMapper<
 	public Response toResponse(AbstractPlatformResourceNotFoundException exception) {
 		
 		ApiGlobalErrorResponse notFoundErrorResponse = ApiGlobalErrorResponse.notFound(exception.getGlobalisationMessageCode(), exception.getDefaultUserMessage(), exception.getDefaultUserMessageArgs());
-		return Response.status(Status.NOT_FOUND).entity(notFoundErrorResponse).build();
+		return Response.status(Status.NOT_FOUND).entity(notFoundErrorResponse).type(MediaType.APPLICATION_JSON).build();
 	}
 }
\ No newline at end of file
diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/UnAuthenticatedUserExceptionMapper.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/UnAuthenticatedUserExceptionMapper.java
index 5f82b515c..a64380727 100644
--- a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/UnAuthenticatedUserExceptionMapper.java
+++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/UnAuthenticatedUserExceptionMapper.java
@@ -1,5 +1,6 @@
 package org.mifosng.platform.api.errorhandling;
 
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.ext.ExceptionMapper;
@@ -21,6 +22,6 @@ public class UnAuthenticatedUserExceptionMapper implements ExceptionMapper<UnAut
 	@Override
 	public Response toResponse(UnAuthenticatedUserException exception) {
 		// Status code 401 really reads as: "Unauthenticated":
-		return Response.status(Status.UNAUTHORIZED).entity(ApiGlobalErrorResponse.unAuthenticated()).build();
+		return Response.status(Status.UNAUTHORIZED).entity(ApiGlobalErrorResponse.unAuthenticated()).type(MediaType.APPLICATION_JSON).build();
 	}
 }
\ No newline at end of file
diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/UnrecognizedPropertyExceptionMapper.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/UnrecognizedPropertyExceptionMapper.java
index b9b6e9166..e3032251e 100644
--- a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/UnrecognizedPropertyExceptionMapper.java
+++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/UnrecognizedPropertyExceptionMapper.java
@@ -3,6 +3,7 @@ package org.mifosng.platform.api.errorhandling;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.ext.ExceptionMapper;
@@ -40,6 +41,6 @@ public class UnrecognizedPropertyExceptionMapper implements ExceptionMapper<Unre
 				"validation.msg.validation.errors.exist",
 				"Validation errors exist.", errors);
 		
-		return Response.status(Status.BAD_REQUEST).entity(invalidParameterError).build();
+		return Response.status(Status.BAD_REQUEST).entity(invalidParameterError).type(MediaType.APPLICATION_JSON).build();
 	}
 }
\ No newline at end of file
diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/UnrecognizedQueryParamExceptionMapper.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/UnrecognizedQueryParamExceptionMapper.java
index df9321fd3..0353d3a01 100644
--- a/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/UnrecognizedQueryParamExceptionMapper.java
+++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/UnrecognizedQueryParamExceptionMapper.java
@@ -3,6 +3,7 @@ package org.mifosng.platform.api.errorhandling;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.ext.ExceptionMapper;
@@ -42,6 +43,6 @@ public class UnrecognizedQueryParamExceptionMapper implements ExceptionMapper<Un
 				"validation.msg.validation.errors.exist",
 				"Validation errors exist.", errors);
 		
-		return Response.status(Status.BAD_REQUEST).entity(invalidParameterError).build();
+		return Response.status(Status.BAD_REQUEST).entity(invalidParameterError).type(MediaType.APPLICATION_JSON).build();
 	}
 }
\ No newline at end of file