mindol1004/spring-restful-exception-handler
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleans up code and adds comments

Browse Source
This commit is contained in:
Rachel Walker
2012-11-27 11:18:47 -08:00
parent 64f386fc92
commit 3b6747cc50
5 changed files with 61 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

158
SpringMVC/.idea/workspace.xml generated
View File

@@ -61,7 +61,7 @@
<file leaf-file-name="ExceptionHandler.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/java/com/raychatter/common/annotation/ExceptionHandler.java">
<provider selected="true" editor-type-id="text-editor">
<state line="21" column="0" selection-start="613" selection-end="613" vertical-scroll-proportion="0.0">
<state line="12" column="39" selection-start="361" selection-end="361" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -70,7 +70,7 @@
<file leaf-file-name="HelloController.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/java/com/raychatter/common/controller/HelloController.java">
<provider selected="true" editor-type-id="text-editor">
<state line="19" column="30" selection-start="731" selection-end="731" vertical-scroll-proportion="0.0">
<state line="18" column="26" selection-start="701" selection-end="701" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -79,7 +79,7 @@
<file leaf-file-name="AnnotationHandler.java" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/java/com/raychatter/common/exception/AnnotationHandler.java">
<provider selected="true" editor-type-id="text-editor">
<state line="45" column="22" selection-start="1949" selection-end="1949" vertical-scroll-proportion="0.9170507">
<state line="46" column="55" selection-start="1942" selection-end="1942" vertical-scroll-proportion="0.50230414">
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -87,36 +87,6 @@
</provider>
</entry>
</file>
<file leaf-file-name="mvc-dispatcher-servlet.xml" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/webapp/WEB-INF/mvc-dispatcher-servlet.xml">
<provider editor-type-id="com.intellij.spring.perspectives.SpringBeansStructureEditorProvider">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state line="22" column="69" selection-start="876" selection-end="876" vertical-scroll-proportion="-12.772727">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="web.xml" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/webapp/WEB-INF/web.xml">
<provider editor-type-id="com.intellij.javaee.module.view.web.viewlets.WebModuleAssemblyDescriptorProvider">
<state />
</provider>
<provider editor-type-id="com.intellij.javaee.module.view.web.viewlets.WebModuleGeneralEditorProvider">
<state />
</provider>
<provider editor-type-id="com.intellij.javaee.module.view.web.viewlets.WebModuleAssemblyDescriptorReferencesProvider">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state line="20" column="19" selection-start="703" selection-end="703" vertical-scroll-proportion="-8.681818">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="error.template" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/resources/error.template">
<provider selected="true" editor-type-id="text-editor">
@@ -126,15 +96,6 @@
</provider>
</entry>
</file>
<file leaf-file-name="error.json.template" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/resources/error.json.template">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="55" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="CustomException.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/java/com/raychatter/common/exception/CustomException.java">
<provider selected="true" editor-type-id="text-editor">
@@ -175,10 +136,10 @@
<option value="$PROJECT_DIR$/src/java/com/raychatter/common/exception/error.template" />
<option value="$PROJECT_DIR$/src/java/com/raychatter/common/exception/CustomException.java" />
<option value="$PROJECT_DIR$/src/java/com/raychatter/common/annotation/ExceptionHandler.java" />
<option value="$PROJECT_DIR$/src/java/com/raychatter/common/exception/AnnotationHandler.java" />
<option value="$PROJECT_DIR$/src/java/com/raychatter/common/controller/HelloController.java" />
<option value="$PROJECT_DIR$/src/resources/error.template" />
<option value="$PROJECT_DIR$/src/java/com/raychatter/common/exception/MyNegativeArraySizeException.java" />
<option value="$PROJECT_DIR$/src/java/com/raychatter/common/controller/HelloController.java" />
<option value="$PROJECT_DIR$/src/java/com/raychatter/common/exception/AnnotationHandler.java" />
</list>
</option>
</component>
@@ -792,11 +753,6 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/webapp/WEB-INF/pages/hello.jsp">
<provider selected="true" editor-type-id="text-editor">
<state line="3" column="13" selection-start="53" selection-end="53" vertical-scroll-proportion="0.088626295" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state line="6" column="28" selection-start="371" selection-end="371" vertical-scroll-proportion="0.042735044" />
@@ -823,56 +779,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/java/com/raychatter/common/controller/HelloController.java">
<provider selected="true" editor-type-id="text-editor">
<state line="19" column="30" selection-start="731" selection-end="731" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/resources/error.json.template">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="55" vertical-scroll-proportion="0.0" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/java/com/raychatter/common/annotation/ExceptionHandler.java">
<provider selected="true" editor-type-id="text-editor">
<state line="21" column="0" selection-start="613" selection-end="613" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/java/com/raychatter/common/exception/CustomException.java">
<provider selected="true" editor-type-id="text-editor">
<state line="7" column="63" selection-start="239" selection-end="250" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/java/com/raychatter/common/exception/MyNegativeArraySizeException.java">
<provider selected="true" editor-type-id="text-editor">
<state line="6" column="43" selection-start="276" selection-end="276" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/resources/error.template">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="14" selection-start="12" selection-end="14" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/webapp/WEB-INF/mvc-dispatcher-servlet.xml">
<provider editor-type-id="com.intellij.spring.perspectives.SpringBeansStructureEditorProvider">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state line="22" column="69" selection-start="876" selection-end="876" vertical-scroll-proportion="-12.772727">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/webapp/WEB-INF/web.xml">
<provider editor-type-id="com.intellij.javaee.module.view.web.viewlets.WebModuleAssemblyDescriptorProvider">
<state />
@@ -889,9 +795,61 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/java/com/raychatter/common/exception/CustomException.java">
<provider selected="true" editor-type-id="text-editor">
<state line="7" column="63" selection-start="239" selection-end="250" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/webapp/WEB-INF/mvc-dispatcher-servlet.xml">
<provider editor-type-id="com.intellij.spring.perspectives.SpringBeansStructureEditorProvider">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state line="22" column="69" selection-start="876" selection-end="876" vertical-scroll-proportion="0.66117644">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/webapp/WEB-INF/pages/hello.jsp">
<provider selected="true" editor-type-id="text-editor">
<state line="3" column="13" selection-start="53" selection-end="53" vertical-scroll-proportion="0.12080537">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/java/com/raychatter/common/annotation/ExceptionHandler.java">
<provider selected="true" editor-type-id="text-editor">
<state line="12" column="39" selection-start="361" selection-end="361" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/java/com/raychatter/common/controller/HelloController.java">
<provider selected="true" editor-type-id="text-editor">
<state line="18" column="26" selection-start="701" selection-end="701" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/resources/error.template">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="14" selection-start="12" selection-end="14" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/java/com/raychatter/common/exception/MyNegativeArraySizeException.java">
<provider selected="true" editor-type-id="text-editor">
<state line="6" column="43" selection-start="276" selection-end="276" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/java/com/raychatter/common/exception/AnnotationHandler.java">
<provider selected="true" editor-type-id="text-editor">
<state line="45" column="22" selection-start="1949" selection-end="1949" vertical-scroll-proportion="0.9170507">
<state line="46" column="55" selection-start="1942" selection-end="1942" vertical-scroll-proportion="0.50230414">
<folding>
<element signature="imports" expanded="true" />
</folding>

10
SpringMVC/src/java/com/raychatter/common/exception/AnnotationHandler.java
View File

@@ -18,15 +18,8 @@ public class AnnotationHandler implements HandlerExceptionResolver {
final Object handler,
final Exception thrownException) {
// Class<?> handlerClass = handler.getClass();
// if (handler instanceof org.springframework.web.method.HandlerMethod) {
// final HandlerMethod router = (HandlerMethod) handler;
// handlerClass = router.getBeanType();
// }
final ExceptionHandler exceptionHandlerAnnotation = thrownException.getClass().getAnnotation(ExceptionHandler.class);
if (exceptionHandlerAnnotation == null) {
// TODO: test what you get in UI when you return here, also test what happens if you return 'null';
return new ModelAndView();
}
@@ -45,10 +38,13 @@ public class AnnotationHandler implements HandlerExceptionResolver {
return new ModelAndView();
}
// Customize your output message here. If you have multiple dynamic parameters to
// put into your template, you can assign them all in this method.
private String formatMessage(final Exception thrownException) {
return String.format(readTemplate(), thrownException.getMessage());
}
// Reads the template file until the end of the line
private String readTemplate() {
final InputStream templateFile = getClass().getResourceAsStream("/error.template");
return new Scanner(templateFile, "UTF-8").useDelimiter("\\A").next().trim();

14
SpringMVC/src/resources/error.json.template
View File

@@ -1,14 +0,0 @@
{
"code": %d,
"error": %s,
"description": %s
}
----------------
<?xml version="1.0"?>
<error>
<code>%d</code>
<description>%s</description>
</error>
----------------
code: %d
error: %s

BIN
SpringMVC/target/classes/com/raychatter/common/exception/AnnotationHandler.class
View File

Binary file not shown.

BIN
SpringMVC/target/web/WEB-INF/classes/com/raychatter/common/exception/AnnotationHandler.class
View File

Binary file not shown.