GH-10083: Migrate spring-integration-ws module to Jspecify

spring-integration-ws/src/main/java/org/springframework/integration/ws/MarshallingWebServiceOutboundGateway.java

@@ -18,7 +18,8 @@
 
 import java.io.IOException;
 
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.messaging.Message;
 import org.springframework.oxm.Marshaller;
 import org.springframework.oxm.Unmarshaller;

spring-integration-ws/src/main/java/org/springframework/integration/ws/SimpleWebServiceOutboundGateway.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,9 +25,9 @@
 import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.dom.DOMSource;
 
+import org.jspecify.annotations.Nullable;
 import org.w3c.dom.Document;
 
-import org.springframework.lang.Nullable;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessagingException;
 import org.springframework.util.Assert;

spring-integration-ws/src/main/java/org/springframework/integration/ws/dsl/BaseWsOutboundGatewaySpec.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,12 +19,14 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.expression.Expression;
 import org.springframework.integration.JavaUtils;
 import org.springframework.integration.dsl.MessageHandlerSpec;
 import org.springframework.integration.ws.AbstractWebServiceOutboundGateway;
 import org.springframework.integration.ws.SoapHeaderMapper;
-import org.springframework.web.util.DefaultUriBuilderFactory;
+import org.springframework.web.util.DefaultUriBuilderFactory.EncodingMode;
 import org.springframework.ws.WebServiceMessageFactory;
 import org.springframework.ws.client.core.FaultMessageResolver;
 import org.springframework.ws.client.core.WebServiceMessageCallback;
@@ -51,26 +53,36 @@ public abstract class BaseWsOutboundGatewaySpec<
 
 	private final Map<String, Expression> uriVariableExpressions = new HashMap<>();
 
+	@Nullable
 	protected WebServiceTemplate template; // NOSONAR
 
+	@Nullable
 	protected DestinationProvider destinationProvider; // NOSONAR
 
+	@Nullable
 	protected String uri; // NOSONAR
 
+	@Nullable
 	protected WebServiceMessageFactory webServiceMessageFactory; // NOSONAR
 
+	@Nullable
 	private SoapHeaderMapper headerMapper;
 
-	private DefaultUriBuilderFactory.EncodingMode encodingMode;
+	@Nullable
+	private EncodingMode encodingMode;
 
 	private boolean ignoreEmptyResponses = true;
 
+	@Nullable
 	private WebServiceMessageCallback requestCallback;
 
+	@Nullable
 	protected FaultMessageResolver faultMessageResolver; // NOSONAR
 
+	@SuppressWarnings("NullAway.Init")
 	protected WebServiceMessageSender[] messageSenders; // NOSONAR
 
+	@SuppressWarnings("NullAway.Init")
 	protected ClientInterceptor[] gatewayInterceptors; // NOSONAR
 
 	protected boolean extractPayload = true; // NOSONAR
@@ -117,11 +129,11 @@ public S uriVariableExpressions(Map<String, Expression> uriVariableExpressions)
 	}
 
 	/**
-	 * Specify a {@link DefaultUriBuilderFactory.EncodingMode} for uri construction.
+	 * Specify a {@link EncodingMode} for uri construction.
 	 * @param encodingMode to use for uri construction.
 	 * @return the spec
 	 */
-	public S encodingMode(DefaultUriBuilderFactory.EncodingMode encodingMode) {
+	public S encodingMode(EncodingMode encodingMode) {
 		this.encodingMode = encodingMode;
 		return _this();
 	}

spring-integration-ws/src/main/java/org/springframework/integration/ws/dsl/MarshallingWsOutboundGatewaySpec.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -63,8 +63,10 @@ public static class MarshallingWsOutboundGatewayNoTemplateSpec
 			extends BaseWsOutboundGatewaySpec<MarshallingWsOutboundGatewayNoTemplateSpec,
 			MarshallingWebServiceOutboundGateway> {
 
+		@SuppressWarnings("NullAway.Init")
 		protected Marshaller gatewayMarshaller; // NOSONAR
 
+		@SuppressWarnings("NullAway.Init")
 		protected Unmarshaller gatewayUnmarshaller; // NOSONAR
 
 		/**

spring-integration-ws/src/main/java/org/springframework/integration/ws/dsl/SimpleWsOutboundGatewaySpec.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,10 @@
 
 import java.util.Arrays;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.integration.JavaUtils;
 import org.springframework.integration.ws.SimpleWebServiceOutboundGateway;
-import org.springframework.lang.Nullable;
 import org.springframework.ws.WebServiceMessageFactory;
 import org.springframework.ws.client.core.FaultMessageResolver;
 import org.springframework.ws.client.core.SourceExtractor;
@@ -100,6 +101,7 @@ protected SimpleWebServiceOutboundGateway create() {
 	public static class SimpleWsOutboundGatewayNoTemplateSpec
 			extends BaseWsOutboundGatewaySpec<SimpleWsOutboundGatewayNoTemplateSpec, SimpleWebServiceOutboundGateway> {
 
+		@Nullable
 		protected SourceExtractor<?> sourceExtractor; // NOSONAR
 
 		private boolean extractPayload = true;

spring-integration-ws/src/main/java/org/springframework/integration/ws/dsl/package-info.java

@@ -1,5 +1,5 @@
 /**
  * Contains classes for DSL support.
  */
-@org.springframework.lang.NonNullApi
+@org.jspecify.annotations.NullMarked
 package org.springframework.integration.ws.dsl;