Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MockMvcResultMatchers.forwardedUrl argument declared as nullable

Browse Source 
Issue: SPR-17623

(cherry picked from commit 7a7958f275)
This commit is contained in:
Juergen Hoeller
2018-12-25 13:20:09 +01:00
parent 7ba5ee35df
commit 49cc5f2f81
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-test/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultMatchers.java
View File

@@ -21,6 +21,7 @@ import javax.xml.xpath.XPathExpressionException;
import org.hamcrest.Matcher; import org.hamcrest.Matcher;
import org.springframework.lang.Nullable;
import org.springframework.test.web.servlet.ResultMatcher; import org.springframework.test.web.servlet.ResultMatcher;
import org.springframework.util.AntPathMatcher; import org.springframework.util.AntPathMatcher;
import org.springframework.web.util.UriComponentsBuilder; import org.springframework.web.util.UriComponentsBuilder;
@@ -84,7 +85,7 @@ public abstract class MockMvcResultMatchers {
* <p>This method accepts only exact matches. * <p>This method accepts only exact matches.
* @param expectedUrl the exact URL expected * @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()); return result -> assertEquals("Forwarded URL", expectedUrl, result.getResponse().getForwardedUrl());
} }