Start building against Spring Framework 7.0.0 snapshots

Author: snicoll

gradle.properties

@@ -4,4 +4,4 @@ org.gradle.caching=true
 org.gradle.parallel=true
 
 compatibilityTestPluginVersion=0.0.3
-springFrameworkVersion=6.2.4
+springFrameworkVersion=7.0.0-SNAPSHOT

spring-ws-core/src/main/java/org/springframework/ws/transport/http/ClientHttpRequestConnection.java

@@ -92,7 +92,7 @@ protected long getResponseContentLength() throws IOException {
 
 	@Override
 	public Iterator<String> getResponseHeaderNames() throws IOException {
-		return this.response.getHeaders().keySet().iterator();
+		return this.response.getHeaders().headerNames().iterator();
 	}
 
 	@Override

spring-ws-core/src/main/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHandlerAdapter.java

@@ -48,12 +48,6 @@
 public class WebServiceMessageReceiverHandlerAdapter extends WebServiceMessageReceiverObjectSupport
 		implements HandlerAdapter {
 
-	@Override
-	@Deprecated
-	public long getLastModified(HttpServletRequest request, Object handler) {
-		return -1L;
-	}
-
 	@Override
 	public ModelAndView handle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse,
 			Object handler) throws Exception {

spring-ws-core/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapter.java

@@ -140,13 +140,6 @@ public void setTransformSchemaLocations(boolean transformSchemaLocations) {
 		this.transformSchemaLocations = transformSchemaLocations;
 	}
 
-	@Override
-	@Deprecated
-	public long getLastModified(HttpServletRequest request, Object handler) {
-		Source definitionSource = ((WsdlDefinition) handler).getSource();
-		return LastModifiedHelper.getLastModified(definitionSource);
-	}
-
 	@Override
 	public ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object handler)
 			throws Exception {

spring-ws-core/src/main/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapter.java

@@ -88,13 +88,6 @@ public void setTransformSchemaLocations(boolean transformSchemaLocations) {
 		this.transformSchemaLocations = transformSchemaLocations;
 	}
 
-	@Override
-	@Deprecated
-	public long getLastModified(HttpServletRequest request, Object handler) {
-		Source schemaSource = ((XsdSchema) handler).getSource();
-		return LastModifiedHelper.getLastModified(schemaSource);
-	}
-
 	@Override
 	public ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object handler)
 			throws Exception {

spring-ws-core/src/test/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapterTest.java

@@ -57,18 +57,6 @@ public void setUp() throws Exception {
 		this.response = new MockHttpServletResponse();
 	}
 
-	@Test
-	@Deprecated
-	public void getLastModified() throws Exception {
-
-		Resource single = new ClassPathResource("single.xsd", getClass());
-		SimpleXsdSchema schema = new SimpleXsdSchema(single);
-		schema.afterPropertiesSet();
-		long lastModified = single.getFile().lastModified();
-
-		assertThat(this.adapter.getLastModified(null, schema)).isEqualTo(lastModified);
-	}
-
 	@Test
 	public void handleGet() throws Exception {