Polish nullability declarations

Author: snicoll

spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java

@@ -270,7 +270,7 @@ public void setDestinationProvider(DestinationProvider destinationProvider) {
 	}
 
 	/** Sets the marshaller for this template. */
-	public void setMarshaller(Marshaller marshaller) {
+	public void setMarshaller(@Nullable Marshaller marshaller) {
 		this.marshaller = marshaller;
 	}
 
@@ -280,7 +280,7 @@ public void setMarshaller(Marshaller marshaller) {
 	}
 
 	/** Sets the unmarshaller for this template. */
-	public void setUnmarshaller(Unmarshaller unmarshaller) {
+	public void setUnmarshaller(@Nullable Unmarshaller unmarshaller) {
 		this.unmarshaller = unmarshaller;
 	}
 
@@ -566,15 +566,15 @@ public boolean sendAndReceive(String uri, WebServiceMessageCallback requestCallb
 	}
 
 	@Override
-	public <T> @Nullable T sendAndReceive(WebServiceMessageCallback requestCallback,
+	public <T> @Nullable T sendAndReceive(@Nullable WebServiceMessageCallback requestCallback,
 			WebServiceMessageExtractor<T> responseExtractor) {
 		String defaultUri = getDefaultUri();
 		Assert.notNull(defaultUri, "'defaultUri' must not be null");
 		return sendAndReceive(defaultUri, requestCallback, responseExtractor);
 	}
 
 	@Override
-	public <T> @Nullable T sendAndReceive(String uriString, WebServiceMessageCallback requestCallback,
+	public <T> @Nullable T sendAndReceive(String uriString, @Nullable WebServiceMessageCallback requestCallback,
 			WebServiceMessageExtractor<T> responseExtractor) {
 		Assert.notNull(responseExtractor, "'responseExtractor' must not be null");
 		Assert.hasLength(uriString, "'uri' must not be empty");

spring-ws-core/src/main/java/org/springframework/ws/soap/support/SoapUtils.java

@@ -19,6 +19,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 import org.springframework.ws.transport.TransportConstants;
@@ -38,7 +40,7 @@ private SoapUtils() {
 	}
 
 	/** Escapes the given SOAP action to be surrounded by quotes. */
-	public static String escapeAction(String soapAction) {
+	public static String escapeAction(@Nullable String soapAction) {
 
 		if (!StringUtils.hasLength(soapAction)) {
 			soapAction = "\"\"";

spring-ws-core/src/main/java/org/springframework/ws/transport/context/TransportContextHolder.java

@@ -16,6 +16,8 @@
 
 package org.springframework.ws.transport.context;
 
+import org.jspecify.annotations.Nullable;
+
 /**
  * Simple holder class that associates a {@code TransportContext} instance with the
  * current thread. The {@code TransportContext} will be inherited by any child threads
@@ -34,8 +36,13 @@ public abstract class TransportContextHolder {
 	 * @param transportContext the current transport context, or {@code null} to reset the
 	 * thread-bound context
 	 */
-	public static void setTransportContext(TransportContext transportContext) {
-		transportContextHolder.set(transportContext);
+	public static void setTransportContext(@Nullable TransportContext transportContext) {
+		if (transportContext != null) {
+			transportContextHolder.set(transportContext);
+		}
+		else {
+			transportContextHolder.remove();
+		}
 	}
 
 	/**

spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/AbstractPortTypesProvider.java

@@ -17,6 +17,7 @@
 package org.springframework.ws.wsdl.wsdl11.provider;
 
 import java.util.List;
+import java.util.Objects;
 
 import javax.wsdl.Definition;
 import javax.wsdl.Fault;
@@ -90,7 +91,7 @@ public void addPortTypes(Definition definition) throws WSDLException {
 	 */
 	protected void populatePortType(Definition definition, PortType portType) throws WSDLException {
 
-		QName portTypeName = new QName(definition.getTargetNamespace(), getPortTypeName());
+		QName portTypeName = new QName(definition.getTargetNamespace(), Objects.requireNonNull(getPortTypeName()));
 		if (this.logger.isDebugEnabled()) {
 			this.logger.debug("Creating port type [" + portTypeName + "]");
 		}

spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailMessageReceiver.java

@@ -194,12 +194,13 @@ protected void onShutdown() {
 	}
 
 	private void openSession() throws MessagingException {
-		this.store = this.session.getStore(this.storeUri);
+		Store storeToConnectTo = this.session.getStore(this.storeUri);
 		if (this.logger.isDebugEnabled()) {
 			this.logger
 				.debug("Connecting to store [" + MailTransportUtils.toPasswordProtectedString(this.storeUri) + "]");
 		}
-		this.store.connect();
+		storeToConnectTo.connect();
+		this.store = storeToConnectTo;
 	}
 
 	private void openFolder() throws MessagingException {

spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsMessageSenderIntegrationTests.java

@@ -34,6 +34,7 @@
 import jakarta.xml.soap.SOAPException;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.awaitility.Awaitility;
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -227,15 +228,15 @@ public Boolean doInJms(Session session, QueueBrowser browser) throws JMSExceptio
 
 	static class TestJmsListener {
 
-		private ThrowingFunction<jakarta.jms.Message, Object> messageHandler;
+		private ThrowingFunction<jakarta.jms.Message, @Nullable Object> messageHandler;
 
-		public void handleMessage(ThrowingFunction<Message, Object> messageHandler) {
+		public void handleMessage(ThrowingFunction<Message, @Nullable Object> messageHandler) {
 			this.messageHandler = messageHandler;
 		}
 
 		@JmsListener(destination = "SenderRequestQueue")
 		@SendTo("SenderResponseQueue")
-		Object handleRequest(jakarta.jms.Message message) {
+		@Nullable Object handleRequest(jakarta.jms.Message message) {
 			return this.messageHandler.apply(message);
 		}
 

spring-ws-test/src/main/java/org/springframework/ws/test/client/WebServiceMessageMatcherAdapter.java

@@ -19,6 +19,8 @@
 import java.io.IOException;
 import java.net.URI;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.util.Assert;
 import org.springframework.ws.WebServiceMessage;
 import org.springframework.ws.test.support.matcher.WebServiceMessageMatcher;
@@ -39,7 +41,7 @@ class WebServiceMessageMatcherAdapter implements RequestMatcher {
 	}
 
 	@Override
-	public void match(URI uri, WebServiceMessage request) throws IOException, AssertionError {
+	public void match(@Nullable URI uri, WebServiceMessage request) throws IOException, AssertionError {
 		this.adaptee.match(request);
 	}
 

spring-ws-test/src/main/java/org/springframework/ws/test/server/WebServiceMessageMatcherAdapter.java

@@ -18,6 +18,8 @@
 
 import java.io.IOException;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.util.Assert;
 import org.springframework.ws.WebServiceMessage;
 import org.springframework.ws.test.support.matcher.WebServiceMessageMatcher;
@@ -38,7 +40,8 @@ class WebServiceMessageMatcherAdapter implements ResponseMatcher {
 	}
 
 	@Override
-	public void match(WebServiceMessage request, WebServiceMessage response) throws IOException, AssertionError {
+	public void match(@Nullable WebServiceMessage request, WebServiceMessage response)
+			throws IOException, AssertionError {
 		this.adaptee.match(response);
 	}