From 5dd70a8e46d825233167cf59d5b107c12890944d Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Tue, 5 May 2015 16:06:00 +0200
Subject: [PATCH] Simplify HandlerMethodAnnotationDetectionTests config

---
 ...HandlerMethodAnnotationDetectionTests.java | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HandlerMethodAnnotationDetectionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HandlerMethodAnnotationDetectionTests.java
index 517ce11e26..f5b170855f 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HandlerMethodAnnotationDetectionTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HandlerMethodAnnotationDetectionTests.java
@@ -65,28 +65,27 @@ import static org.junit.Assert.*;
 public class HandlerMethodAnnotationDetectionTests {
 
 	@Parameters(name = "controller [{0}], auto-proxy [{1}]")
-	public static Collection<Object[]> handlerTypes() {
-		Object[][] array = new Object[12][2];
+	public static Object[][] handlerTypes() {
+		return new Object[][] {
 
-		array[0] = new Object[] { SimpleController.class, true};  // CGLib proxy
-		array[1] = new Object[] { SimpleController.class, false};
+			{ SimpleController.class, true }, // CGLib proxy
+			{ SimpleController.class, false },
 
-		array[2] = new Object[] { AbstractClassController.class, true };	// CGLib proxy
-		array[3] = new Object[] { AbstractClassController.class, false };
+			{ AbstractClassController.class, true }, // CGLib proxy
+			{ AbstractClassController.class, false },
 
-		array[4] = new Object[] { ParameterizedAbstractClassController.class, false}; // CGLib proxy
-		array[5] = new Object[] { ParameterizedAbstractClassController.class, false};
+			{ ParameterizedAbstractClassController.class, true }, // CGLib proxy
+			{ ParameterizedAbstractClassController.class, false },
 
-		array[6] = new Object[] { InterfaceController.class, true };	// JDK dynamic proxy
-		array[7] = new Object[] { InterfaceController.class, false };
+			{ InterfaceController.class, true }, // JDK dynamic proxy
+			{ InterfaceController.class, false },
 
-		array[8] = new Object[] { ParameterizedInterfaceController.class, false}; // no AOP
-		array[9] = new Object[] { ParameterizedInterfaceController.class, false};
+			{ ParameterizedInterfaceController.class, false }, // no AOP
 
-		array[10] = new Object[] { SupportClassController.class, true};  // CGLib proxy
-		array[11] = new Object[] { SupportClassController.class, false};
+			{ SupportClassController.class, true }, // CGLib proxy
+			{ SupportClassController.class, false }
 
-		return Arrays.asList(array);
+		};
 	}
 
 	private RequestMappingHandlerMapping handlerMapping = new RequestMappingHandlerMapping();