inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD (5.2) to 5.2.N (5.2.1)

Browse Source 
127592 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127226 gjames: RA-1064: Added a WebScriptExceptionResolver


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127684 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 14:18:42 +00:00
parent 95ea8f67aa
commit 10aebdcf28
5 changed files with 91 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/java/org/alfresco/rest/framework/tools/ApiAssistant.java
View File

@@ -73,6 +73,7 @@ public class ApiAssistant {
});
private ExceptionResolver<Exception> defaultResolver = new DefaultExceptionResolver();
private ExceptionResolver<WebScriptException> webScriptExceptionResolver;
private ExceptionResolver<Exception> resolver;
private JacksonHelper jsonHelper;
@@ -86,7 +87,15 @@ public class ApiAssistant {
public ErrorResponse resolveException(Exception ex)
{
ErrorResponse error = resolver.resolveException(ex);
ErrorResponse error = null;
if (ex instanceof WebScriptException)
{
error = webScriptExceptionResolver.resolveException((WebScriptException) ex);
}
else
{
error = resolver.resolveException(ex);
}
if (error == null)
{
error = defaultResolver.resolveException(ex);
@@ -195,6 +204,10 @@ public class ApiAssistant {
this.defaultResolver = defaultResolver;
}
public void setWebScriptExceptionResolver(ExceptionResolver<WebScriptException> webScriptExceptionResolver) {
this.webScriptExceptionResolver = webScriptExceptionResolver;
}
public void setResolver(ExceptionResolver<Exception> resolver) {
this.resolver = resolver;
}