From e49bfa498bf9595362f97013552f8233e5586414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Wed, 23 Apr 2025 11:56:32 +0200 Subject: [PATCH] Start building against Spring Framework 7.0.0-M5 snapshots See gh-1552 --- gradle.properties | 2 +- .../transport/http/ClientHttpRequestConnection.java | 2 +- .../transport/http/JdkHttpClientMessageSender.java | 3 ++- .../WebServiceMessageReceiverHandlerAdapter.java | 6 ------ .../transport/http/WsdlDefinitionHandlerAdapter.java | 7 ------- .../ws/transport/http/XsdSchemaHandlerAdapter.java | 7 ------- .../transport/http/XsdSchemaHandlerAdapterTests.java | 12 ------------ 7 files changed, 4 insertions(+), 35 deletions(-) diff --git a/gradle.properties b/gradle.properties index 3795ad56..67457944 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,4 +4,4 @@ org.gradle.caching=true org.gradle.parallel=true compatibilityTestPluginVersion=0.0.3 -springFrameworkVersion=6.2.6 \ No newline at end of file +springFrameworkVersion=7.0.0-SNAPSHOT \ No newline at end of file diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/ClientHttpRequestConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/ClientHttpRequestConnection.java index b2e69edd..f399d338 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/ClientHttpRequestConnection.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/ClientHttpRequestConnection.java @@ -92,7 +92,7 @@ public class ClientHttpRequestConnection extends AbstractHttpSenderConnection { @Override public Iterator getResponseHeaderNames() throws IOException { - return this.response.getHeaders().keySet().iterator(); + return this.response.getHeaders().headerNames().iterator(); } @Override diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/JdkHttpClientMessageSender.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/JdkHttpClientMessageSender.java index 13e606aa..712aa3af 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/JdkHttpClientMessageSender.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/JdkHttpClientMessageSender.java @@ -21,8 +21,9 @@ import java.net.URI; import java.net.http.HttpClient; import java.time.Duration; +import org.jspecify.annotations.Nullable; + import org.springframework.beans.factory.InitializingBean; -import org.springframework.lang.Nullable; import org.springframework.util.Assert; import org.springframework.ws.transport.WebServiceConnection; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHandlerAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHandlerAdapter.java index f84f4016..cebac6cf 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHandlerAdapter.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHandlerAdapter.java @@ -48,12 +48,6 @@ import org.springframework.ws.transport.support.WebServiceMessageReceiverObjectS 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 { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapter.java index 7729b39f..8cb903fe 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapter.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapter.java @@ -140,13 +140,6 @@ public class WsdlDefinitionHandlerAdapter extends LocationTransformerObjectSuppo 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 { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapter.java index 3d7d2f33..27697a97 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapter.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapter.java @@ -88,13 +88,6 @@ public class XsdSchemaHandlerAdapter extends LocationTransformerObjectSupport 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 { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapterTests.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapterTests.java index 68fce1ef..d97ed735 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapterTests.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapterTests.java @@ -57,18 +57,6 @@ class XsdSchemaHandlerAdapterTests { this.response = new MockHttpServletResponse(); } - @Test - @Deprecated - 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 void handleGet() throws Exception {