Polish @ExceptionHandler method resolution. Allow subclasses to plug in additional @ExceptionHandler methods.

2011-09-02 11:04:23 +00:00
parent 04bcd77520
commit 91251812b1
6 changed files with 419 additions and 385 deletions
--- a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolverTests.java
+++ b/org.springframework.web/src/test/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolverTests.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2002-2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.web.method.annotation;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.BindException;
+import java.net.SocketException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.junit.Test;
+import org.springframework.stereotype.Controller;
+import org.springframework.util.ClassUtils;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+
+/**
+ * Test fixture for {@link ExceptionHandlerMethodResolver} tests.
+ * 
+ * @author Rossen Stoyanchev
+ */
+public class ExceptionHandlerMethodResolverTests {
+
+	@Test
+	public void resolveMethodFromAnnotation() {
+		ExceptionHandlerMethodResolver resolver = new ExceptionHandlerMethodResolver(ExceptionController.class);
+		IOException exception = new IOException();
+		assertEquals("handleIOException", resolver.resolveMethod(exception).getName());
+	}
+
+	@Test
+	public void resolveMethodFromArgument() {
+		ExceptionHandlerMethodResolver resolver = new ExceptionHandlerMethodResolver(ExceptionController.class);
+		IllegalArgumentException exception = new IllegalArgumentException();
+		assertEquals("handleIllegalArgumentException", resolver.resolveMethod(exception).getName());
+	}
+
+	@Test
+	public void resolveMethodExceptionSubType() {
+		ExceptionHandlerMethodResolver resolver = new ExceptionHandlerMethodResolver(ExceptionController.class);
+		IOException ioException = new FileNotFoundException();
+		assertEquals("handleIOException", resolver.resolveMethod(ioException).getName());
+		SocketException bindException = new BindException();
+		assertEquals("handleSocketException", resolver.resolveMethod(bindException).getName());
+	}
+
+	@Test
+	public void resolveMethodBestMatch() {
+		ExceptionHandlerMethodResolver resolver = new ExceptionHandlerMethodResolver(ExceptionController.class);
+		SocketException exception = new SocketException();
+		assertEquals("handleSocketException", resolver.resolveMethod(exception).getName());
+	}
+
+	@Test
+	public void resolveMethodNoMatch() {
+		ExceptionHandlerMethodResolver resolver = new ExceptionHandlerMethodResolver(ExceptionController.class);
+		Exception exception = new Exception();
+		assertNull("1st lookup", resolver.resolveMethod(exception));
+		assertNull("2nd lookup from cache", resolver.resolveMethod(exception));
+	}
+
+	@Test
+	public void resolveMethodInherited() {
+		ExceptionHandlerMethodResolver resolver = new ExceptionHandlerMethodResolver(InheritedController.class);
+		IOException exception = new IOException();
+		assertEquals("handleIOException", resolver.resolveMethod(exception).getName());
+	}
+	
+	@Test(expected = IllegalStateException.class)
+	public void ambiguousExceptionMapping() {
+		new ExceptionHandlerMethodResolver(AmbiguousController.class);
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void noExceptionMapping() {
+		new ExceptionHandlerMethodResolver(NoExceptionController.class);
+	}
+
+	@Controller
+	static class ExceptionController {
+		
+		public void handle() {}
+
+		@ExceptionHandler(IOException.class)
+		public void handleIOException() {
+		}
+
+		@ExceptionHandler(SocketException.class)
+		public void handleSocketException() {
+		}
+
+		@ExceptionHandler
+		public void handleIllegalArgumentException(IllegalArgumentException exception) {
+		}
+	}
+
+	@Controller
+	static class InheritedController extends ExceptionController {
+
+		@Override
+		public void handleIOException()	{
+		}
+	}
+
+	@Controller
+	static class AmbiguousController {
+
+		public void handle() {}
+
+		@ExceptionHandler({BindException.class, IllegalArgumentException.class})
+		public String handle1(Exception ex, HttpServletRequest request, HttpServletResponse response)
+				throws IOException {
+			return ClassUtils.getShortName(ex.getClass());
+		}
+
+		@ExceptionHandler
+		public String handle2(IllegalArgumentException ex) {
+			return ClassUtils.getShortName(ex.getClass());
+		}
+	}
+
+	@Controller
+	static class NoExceptionController {
+		
+		@ExceptionHandler
+		public void handle() {
+		}
+	}
+	
+}