From 49cc5f2f81316c437aee9fb40fa94f32d2f752bc Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 25 Dec 2018 13:20:09 +0100 Subject: [PATCH] MockMvcResultMatchers.forwardedUrl argument declared as nullable Issue: SPR-17623 (cherry picked from commit 7a7958f2758df2fd6630d840d1ce11ada880d1de) --- .../test/web/servlet/result/MockMvcResultMatchers.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultMatchers.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultMatchers.java index fd0b1f86016..bc2699caee4 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultMatchers.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultMatchers.java @@ -21,6 +21,7 @@ import javax.xml.xpath.XPathExpressionException; import org.hamcrest.Matcher; +import org.springframework.lang.Nullable; import org.springframework.test.web.servlet.ResultMatcher; import org.springframework.util.AntPathMatcher; import org.springframework.web.util.UriComponentsBuilder; @@ -84,7 +85,7 @@ public abstract class MockMvcResultMatchers { *

This method accepts only exact matches. * @param expectedUrl the exact URL expected */ - public static ResultMatcher forwardedUrl(String expectedUrl) { + public static ResultMatcher forwardedUrl(@Nullable String expectedUrl) { return result -> assertEquals("Forwarded URL", expectedUrl, result.getResponse().getForwardedUrl()); }