Upgrade to Servlet API 4.0 for MVC and merge EhCache 3 tests into spring-context-support

jhoeller · jhoeller · commit fac1f236c312 · 2017-08-21T01:34:11.000+02:00
Includes general streamlining of dependency declarations with reduced version variables, direct use of EclipseLink 2.7 and its implicit JPA 2.2 dependency in spring-orm, mixed use of Hibernate 5.2.10 and 5.1.10 for integration tests, as well as an upgrade to Jetty 9.4.7 RC0 and a downgrade to Groovy 2.4.12 (since Groovy 2.5 won't be final in time for Spring Framework 5.0).

Issue: SPR-15879
Issue: SPR-15880
diff --git a/build.gradle b/build.gradle
diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCache3AnnotationTests.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCache3AnnotationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2017 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.
diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCache3ApiTests.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCache3ApiTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2017 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.
diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheAnnotationTests.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheAnnotationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -59,7 +59,7 @@ protected ConfigurableApplicationContext getApplicationContext() {
 	}
 
 	protected CachingProvider getCachingProvider() {
-		return Caching.getCachingProvider();
+		return Caching.getCachingProvider("org.ehcache.jcache.JCacheCachingProvider");
 	}
 
 	@After
diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheApiTests.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheApiTests.java
@@ -54,7 +54,7 @@ public void setup() {
 	}
 
 	protected CachingProvider getCachingProvider() {
-		return Caching.getCachingProvider();
+		return Caching.getCachingProvider("org.ehcache.jcache.JCacheCachingProvider");
 	}
 
 	@After
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/DefaultMessageHandlerMethodFactoryTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/DefaultMessageHandlerMethodFactoryTests.java
@@ -23,7 +23,6 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import javax.validation.Valid;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -46,6 +45,7 @@
 import org.springframework.util.ReflectionUtils;
 import org.springframework.validation.Errors;
 import org.springframework.validation.Validator;
+import org.springframework.validation.annotation.Validated;
 
 import static org.junit.Assert.*;
 
@@ -219,7 +219,7 @@ public void simpleString(String value) {
 			invocations.put("simpleString", true);
 		}
 
-		public void payloadValidation(@Payload @Valid String value) {
+		public void payloadValidation(@Payload @Validated String value) {
 			invocations.put("payloadValidation", true);
 		}
 
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java b/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java
@@ -572,33 +572,33 @@ public SessionCookieConfig getSessionCookieConfig() {
 		return this.sessionCookieConfig;
 	}
 
-	// @Override - but only against Servlet 4.0
+	@Override  // on Servlet 4.0
 	public void setSessionTimeout(int sessionTimeout) {
 		this.sessionTimeout = sessionTimeout;
 	}
 
-	// @Override - but only against Servlet 4.0
+	@Override  // on Servlet 4.0
 	public int getSessionTimeout() {
 		return this.sessionTimeout;
 	}
 
-	// @Override - but only against Servlet 4.0
+	@Override  // on Servlet 4.0
 	public void setRequestCharacterEncoding(@Nullable String requestCharacterEncoding) {
 		this.requestCharacterEncoding = requestCharacterEncoding;
 	}
 
-	// @Override - but only against Servlet 4.0
+	@Override  // on Servlet 4.0
 	@Nullable
 	public String getRequestCharacterEncoding() {
 		return this.requestCharacterEncoding;
 	}
 
-	// @Override - but only against Servlet 4.0
+	@Override  // on Servlet 4.0
 	public void setResponseCharacterEncoding(@Nullable String responseCharacterEncoding) {
 		this.responseCharacterEncoding = responseCharacterEncoding;
 	}
 
-	// @Override - but only against Servlet 4.0
+	@Override  // on Servlet 4.0
 	@Nullable
 	public String getResponseCharacterEncoding() {
 		return this.responseCharacterEncoding;
@@ -614,7 +614,7 @@ public JspConfigDescriptor getJspConfigDescriptor() {
 		throw new UnsupportedOperationException();
 	}
 
-	// @Override - but only against Servlet 4.0
+	@Override  // on Servlet 4.0
 	public ServletRegistration.Dynamic addJspFile(String servletName, String jspFile) {
 		throw new UnsupportedOperationException();
 	}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolver.java
@@ -19,20 +19,19 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
-import java.lang.reflect.Method;
 import java.security.Principal;
 import java.time.ZoneId;
 import java.util.Locale;
 import java.util.TimeZone;
 import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
+import javax.servlet.http.PushBuilder;
 
 import org.springframework.core.MethodParameter;
 import org.springframework.http.HttpMethod;
 import org.springframework.lang.Nullable;
 import org.springframework.util.ClassUtils;
-import org.springframework.util.ReflectionUtils;
 import org.springframework.web.bind.support.WebDataBinderFactory;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.context.request.WebRequest;
@@ -66,8 +65,18 @@
 public class ServletRequestMethodArgumentResolver implements HandlerMethodArgumentResolver {
 
 	@Nullable
-	private static final Method newPushBuilderMethod =
-			ClassUtils.getMethodIfAvailable(HttpServletRequest.class, "newPushBuilder");
+	private static Class<?> pushBuilder;
+
+	static {
+		try {
+			pushBuilder = ClassUtils.forName("javax.servlet.http.PushBuilder",
+					ServletRequestMethodArgumentResolver.class.getClassLoader());
+		}
+		catch (ClassNotFoundException ex) {
+			// Servlet 4.0 PushBuilder not found - not supported for injection
+			pushBuilder = null;
+		}
+	}
 
 
 	@Override
@@ -77,7 +86,7 @@ public boolean supportsParameter(MethodParameter parameter) {
 				ServletRequest.class.isAssignableFrom(paramType) ||
 				MultipartRequest.class.isAssignableFrom(paramType) ||
 				HttpSession.class.isAssignableFrom(paramType) ||
-				(newPushBuilderMethod != null && newPushBuilderMethod.getReturnType().isAssignableFrom(paramType)) ||
+				(pushBuilder != null && pushBuilder.isAssignableFrom(paramType)) ||
 				Principal.class.isAssignableFrom(paramType) ||
 				InputStream.class.isAssignableFrom(paramType) ||
 				Reader.class.isAssignableFrom(paramType) ||
@@ -130,13 +139,8 @@ private Object resolveArgument(Class<?> paramType, HttpServletRequest request) t
 			}
 			return session;
 		}
-		else if (newPushBuilderMethod != null && newPushBuilderMethod.getReturnType().isAssignableFrom(paramType)) {
-			Object pushBuilder = ReflectionUtils.invokeMethod(newPushBuilderMethod, request);
-			if (pushBuilder != null && !paramType.isInstance(pushBuilder)) {
-				throw new IllegalStateException(
-						"Current push builder is not of type [" + paramType.getName() + "]: " + pushBuilder);
-			}
-			return pushBuilder;
+		else if (pushBuilder != null && pushBuilder.isAssignableFrom(paramType)) {
+			return PushBuilderDelegate.resolvePushBuilder(request, paramType);
 		}
 		else if (InputStream.class.isAssignableFrom(paramType)) {
 			InputStream inputStream = request.getInputStream();
@@ -181,4 +185,22 @@ else if (ZoneId.class == paramType) {
 		throw new UnsupportedOperationException("Unknown parameter type: " + paramType.getName());
 	}
 
+
+	/**
+	 * Inner class to avoid a hard dependency on Servlet API 4.0 at runtime.
+	 */
+	private static class PushBuilderDelegate {
+
+		@Nullable
+		public static Object resolvePushBuilder(HttpServletRequest request, Class<?> paramType) {
+			PushBuilder pushBuilder = request.newPushBuilder();
+			if (pushBuilder != null && !paramType.isInstance(pushBuilder)) {
+				throw new IllegalStateException(
+						"Current push builder is not of type [" + paramType.getName() + "]: " + pushBuilder);
+			}
+			return pushBuilder;
+
+		}
+	}
+
 }
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.java
@@ -25,9 +25,11 @@
 import java.util.TimeZone;
 import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpSession;
+import javax.servlet.http.PushBuilder;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Mockito;
 
 import org.springframework.core.MethodParameter;
 import org.springframework.http.HttpMethod;
@@ -46,6 +48,7 @@
 /**
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
+ * @author Juergen Hoeller
  * @author Nicholas Williams
  */
 public class ServletRequestMethodArgumentResolverTests {
@@ -70,7 +73,7 @@ public void setup() throws Exception {
 
 		method = getClass().getMethod("supportedParams", ServletRequest.class, MultipartRequest.class,
 				HttpSession.class, Principal.class, Locale.class, InputStream.class, Reader.class,
-				WebRequest.class, TimeZone.class, ZoneId.class, HttpMethod.class);
+				WebRequest.class, TimeZone.class, ZoneId.class, HttpMethod.class, PushBuilder.class);
 	}
 
 
@@ -99,12 +102,7 @@ public void session() throws Exception {
 
 	@Test
 	public void principal() throws Exception {
-		Principal principal = new Principal() {
-			@Override
-			public String getName() {
-				return "Foo";
-			}
-		};
+		Principal principal = () -> "Foo";
 		servletRequest.setUserPrincipal(principal);
 
 		MethodParameter principalParameter = new MethodParameter(method, 3);
@@ -228,6 +226,24 @@ public void httpMethod() throws Exception {
 		assertSame("Invalid result", HttpMethod.valueOf(webRequest.getRequest().getMethod()), result);
 	}
 
+	@Test
+	public void pushBuilder() throws Exception {
+		final PushBuilder pushBuilder = Mockito.mock(PushBuilder.class);
+		servletRequest = new MockHttpServletRequest("GET", "") {
+			@Override
+			public PushBuilder newPushBuilder() {
+				return pushBuilder;
+			}
+		};
+		ServletWebRequest webRequest = new ServletWebRequest(servletRequest, new MockHttpServletResponse());
+
+		MethodParameter pushBuilderParameter = new MethodParameter(method, 11);
+		assertTrue("PushBuilder not supported", resolver.supportsParameter(pushBuilderParameter));
+
+		Object result = resolver.resolveArgument(pushBuilderParameter, null, webRequest, null);
+		assertSame("Invalid result", pushBuilder, result);
+	}
+
 
 	@SuppressWarnings("unused")
 	public void supportedParams(ServletRequest p0,
@@ -240,7 +256,8 @@ public void supportedParams(ServletRequest p0,
 								WebRequest p7,
 								TimeZone p8,
 								ZoneId p9,
-								HttpMethod p10) {
+								HttpMethod p10,
+								PushBuilder p11) {
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2015 the original author or authors.`
	`2`	`+ * Copyright 2002-2017 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2016 the original author or authors.`
	`2`	`+ * Copyright 2002-2017 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -59,7 +59,7 @@ protected ConfigurableApplicationContext getApplicationContext() {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`protected CachingProvider getCachingProvider() {`
`62`		`- return Caching.getCachingProvider();`
	`62`	`+ return Caching.getCachingProvider("org.ehcache.jcache.JCacheCachingProvider");`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`@After`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public void setup() {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`protected CachingProvider getCachingProvider() {`
`57`		`- return Caching.getCachingProvider();`
	`57`	`+ return Caching.getCachingProvider("org.ehcache.jcache.JCacheCachingProvider");`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`@After`
Original file line number	Diff line number	Diff line change
`@@ -572,33 +572,33 @@ public SessionCookieConfig getSessionCookieConfig() {`
`572`	`572`	`return this.sessionCookieConfig;`
`573`	`573`	`}`
`574`	`574`
`575`		`- // @Override - but only against Servlet 4.0`
	`575`	`+ @Override // on Servlet 4.0`
`576`	`576`	`public void setSessionTimeout(int sessionTimeout) {`
`577`	`577`	`this.sessionTimeout = sessionTimeout;`
`578`	`578`	`}`
`579`	`579`
`580`		`- // @Override - but only against Servlet 4.0`
	`580`	`+ @Override // on Servlet 4.0`
`581`	`581`	`public int getSessionTimeout() {`
`582`	`582`	`return this.sessionTimeout;`
`583`	`583`	`}`
`584`	`584`
`585`		`- // @Override - but only against Servlet 4.0`
	`585`	`+ @Override // on Servlet 4.0`
`586`	`586`	`public void setRequestCharacterEncoding(@Nullable String requestCharacterEncoding) {`
`587`	`587`	`this.requestCharacterEncoding = requestCharacterEncoding;`
`588`	`588`	`}`
`589`	`589`
`590`		`- // @Override - but only against Servlet 4.0`
	`590`	`+ @Override // on Servlet 4.0`
`591`	`591`	`@Nullable`
`592`	`592`	`public String getRequestCharacterEncoding() {`
`593`	`593`	`return this.requestCharacterEncoding;`
`594`	`594`	`}`
`595`	`595`
`596`		`- // @Override - but only against Servlet 4.0`
	`596`	`+ @Override // on Servlet 4.0`
`597`	`597`	`public void setResponseCharacterEncoding(@Nullable String responseCharacterEncoding) {`
`598`	`598`	`this.responseCharacterEncoding = responseCharacterEncoding;`
`599`	`599`	`}`
`600`	`600`
`601`		`- // @Override - but only against Servlet 4.0`
	`601`	`+ @Override // on Servlet 4.0`
`602`	`602`	`@Nullable`
`603`	`603`	`public String getResponseCharacterEncoding() {`
`604`	`604`	`return this.responseCharacterEncoding;`
`@@ -614,7 +614,7 @@ public JspConfigDescriptor getJspConfigDescriptor() {`
`614`	`614`	`throw new UnsupportedOperationException();`
`615`	`615`	`}`
`616`	`616`
`617`		`- // @Override - but only against Servlet 4.0`
	`617`	`+ @Override // on Servlet 4.0`
`618`	`618`	`public ServletRegistration.Dynamic addJspFile(String servletName, String jspFile) {`
`619`	`619`	`throw new UnsupportedOperationException();`
`620`	`620`	`}`