vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-22 22:27:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix wrong base exception handlers.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2012-08-31 01:00:30 -03:00
parent d1ce3540ed
commit 7390025bf4
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wise-webapp/src/main/java/com/wisemapping/rest/BaseController.java
View File

@ -18,6 +18,7 @@
package com.wisemapping.rest; package com.wisemapping.rest;
import com.wisemapping.exceptions.AccessDeniedSecurityException;
import com.wisemapping.filter.UserAgent; import com.wisemapping.filter.UserAgent;
import com.wisemapping.mail.NotificationService; import com.wisemapping.mail.NotificationService;
import com.wisemapping.model.User; import com.wisemapping.model.User;
@ -34,6 +35,7 @@ import org.springframework.web.bind.annotation.ResponseStatus;
import javax.servlet.ServletContext; import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.UndeclaredThrowableException;
public class BaseController { public class BaseController {
@ -72,14 +74,14 @@ public class BaseController {
@ExceptionHandler(java.lang.reflect.UndeclaredThrowableException.class) @ExceptionHandler(java.lang.reflect.UndeclaredThrowableException.class)
@ResponseStatus(HttpStatus.BAD_REQUEST) @ResponseStatus(HttpStatus.BAD_REQUEST)
public RestErrors handleSecurityErrors(@NotNull ValidationException ex) { public RestErrors handleSecurityErrors(@NotNull UndeclaredThrowableException ex) {
return new RestErrors(ex.getErrors(), messageSource); return new RestErrors(ex.getMessage());
} }
@ExceptionHandler(com.wisemapping.exceptions.AccessDeniedSecurityException.class) @ExceptionHandler(com.wisemapping.exceptions.AccessDeniedSecurityException.class)
@ResponseStatus(HttpStatus.BAD_REQUEST) @ResponseStatus(HttpStatus.BAD_REQUEST)
public RestErrors handleSecurity2Errors(@NotNull ValidationException ex) { public RestErrors handleSecurityException(@NotNull AccessDeniedSecurityException ex) {
return new RestErrors(ex.getErrors(), messageSource); return new RestErrors(ex.getMessage());
} }
} }