Start building against Spring Framework 7.0.0-RC1 snapshots

See gh-996

Author: wilkinsona

gradle.properties

@@ -5,4 +5,4 @@ org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
 org.gradle.parallel=true
 
 javaFormatVersion=0.0.47
-springFrameworkVersion=7.0.0-M9
+springFrameworkVersion=7.0.0-SNAPSHOT

spring-restdocs-mockmvc/src/main/java/org/springframework/restdocs/mockmvc/RestDocumentationRequestBuilders.java

@@ -224,7 +224,7 @@ public static MockHttpServletRequestBuilder request(HttpMethod httpMethod, URI u
 	 * @since 2.0.6
 	 */
 	public static MockMultipartHttpServletRequestBuilder multipart(String urlTemplate, Object... urlVariables) {
-		return (MockMultipartHttpServletRequestBuilder) MockMvcRequestBuilders.multipart(urlTemplate, urlVariables)
+		return MockMvcRequestBuilders.multipart(urlTemplate, urlVariables)
 			.requestAttr(RestDocumentationGenerator.ATTRIBUTE_NAME_URL_TEMPLATE, urlTemplate);
 	}
 

spring-restdocs-mockmvc/src/test/java/org/springframework/restdocs/mockmvc/MockMvcRequestConverterTests.java

@@ -33,6 +33,7 @@
 import org.springframework.restdocs.operation.OperationRequest;
 import org.springframework.restdocs.operation.OperationRequestPart;
 import org.springframework.restdocs.operation.RequestCookie;
+import org.springframework.test.web.servlet.request.AbstractMockHttpServletRequestBuilder;
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
@@ -233,7 +234,7 @@ void requestWithPartWithContentType() throws IOException {
 		assertThat(part.getContent()).isEqualTo(new byte[] { 1, 2, 3, 4 });
 	}
 
-	private OperationRequest createOperationRequest(MockHttpServletRequestBuilder builder) {
+	private OperationRequest createOperationRequest(AbstractMockHttpServletRequestBuilder<?> builder) {
 		return this.factory.convert(builder.buildRequest(new MockServletContext()));
 	}
 

spring-restdocs-mockmvc/src/test/java/org/springframework/restdocs/mockmvc/RestDocumentationRequestBuildersTests.java

@@ -25,7 +25,7 @@
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockServletContext;
 import org.springframework.restdocs.generate.RestDocumentationGenerator;
-import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+import org.springframework.test.web.servlet.request.AbstractMockHttpServletRequestBuilder;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.delete;
@@ -138,15 +138,15 @@ void multipartUri() {
 		assertUri(multipart(URI.create("/uri")), HttpMethod.POST);
 	}
 
-	private void assertTemplate(MockHttpServletRequestBuilder builder, HttpMethod httpMethod) {
+	private void assertTemplate(AbstractMockHttpServletRequestBuilder<?> builder, HttpMethod httpMethod) {
 		MockHttpServletRequest request = builder.buildRequest(this.servletContext);
 		assertThat((String) request.getAttribute(RestDocumentationGenerator.ATTRIBUTE_NAME_URL_TEMPLATE))
 			.isEqualTo("/{template}");
 		assertThat(request.getRequestURI()).isEqualTo("/t");
 		assertThat(request.getMethod()).isEqualTo(httpMethod.name());
 	}
 
-	private void assertUri(MockHttpServletRequestBuilder builder, HttpMethod httpMethod) {
+	private void assertUri(AbstractMockHttpServletRequestBuilder<?> builder, HttpMethod httpMethod) {
 		MockHttpServletRequest request = builder.buildRequest(this.servletContext);
 		assertThat(request.getRequestURI()).isEqualTo("/uri");
 		assertThat(request.getMethod()).isEqualTo(httpMethod.name());