Apply review feedback to simplify nullable handling and clean up suppressions

* Use `@Nullable` `WebServiceMessageFactory` with conditional `webServiceTemplate` creation
* Mark `uri` and webServiceMessageFactory fields as `@Nullable`, keep template as final
* Remove all `@SuppressWarnings("NullAway")` annotations
* Remove unnecessary ctor overloads from previous approach

Signed-off-by: Jooyoung Pyoung <[email protected]>

Author: anthologia

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

@@ -69,7 +69,7 @@ public abstract class AbstractWebServiceOutboundGateway extends AbstractReplyPro
 
 	protected final DefaultUriBuilderFactory uriFactory = new DefaultUriBuilderFactory(); // NOSONAR - final
 
-	private final String uri;
+	private final @Nullable String uri;
 
 	private final @Nullable DestinationProvider destinationProvider;
 
@@ -88,56 +88,25 @@ public abstract class AbstractWebServiceOutboundGateway extends AbstractReplyPro
 
 	private boolean webServiceTemplateExplicitlySet;
 
-	public AbstractWebServiceOutboundGateway(final String uri) {
+	public AbstractWebServiceOutboundGateway(@Nullable final String uri, @Nullable WebServiceMessageFactory messageFactory) {
 		Assert.hasText(uri, "URI must not be empty");
-		this.webServiceTemplate = new WebServiceTemplate();
+		this.webServiceTemplate = messageFactory != null ?
+				new WebServiceTemplate(messageFactory) : new WebServiceTemplate();
 		this.destinationProvider = null;
 		this.uri = uri;
 	}
 
-	public AbstractWebServiceOutboundGateway(final String uri, WebServiceMessageFactory messageFactory) {
-		Assert.hasText(uri, "URI must not be empty");
-		this.webServiceTemplate = new WebServiceTemplate(messageFactory);
-		this.destinationProvider = null;
-		this.uri = uri;
-	}
-
-	public AbstractWebServiceOutboundGateway(final String uri, WebServiceTemplate webServiceTemplate) {
-		Assert.hasText(uri, "URI must not be empty");
-		doSetWebServiceTemplate(webServiceTemplate);
-		this.destinationProvider = null;
-		this.uri = uri;
-	}
-
-	protected AbstractWebServiceOutboundGateway(DestinationProvider destinationProvider,
-												WebServiceTemplate webServiceTemplate) {
-
-		Assert.notNull(destinationProvider, "DestinationProvider must not be null");
-		doSetWebServiceTemplate(webServiceTemplate);
-		this.destinationProvider = destinationProvider;
-		this.uri = "";
-	}
-
-	public AbstractWebServiceOutboundGateway(DestinationProvider destinationProvider) {
-		Assert.notNull(destinationProvider, "DestinationProvider must not be null");
-		this.webServiceTemplate = new WebServiceTemplate();
-		this.destinationProvider = destinationProvider;
-		// we always call WebServiceTemplate methods with an explicit URI argument,
-		// but in case the WebServiceTemplate is accessed directly we'll set this:
-		this.webServiceTemplate.setDestinationProvider(destinationProvider);
-		this.uri = "";
-	}
-
 	public AbstractWebServiceOutboundGateway(DestinationProvider destinationProvider,
-			WebServiceMessageFactory messageFactory) {
+			@Nullable WebServiceMessageFactory messageFactory) {
 
 		Assert.notNull(destinationProvider, "DestinationProvider must not be null");
-		this.webServiceTemplate = new WebServiceTemplate(messageFactory);
+		this.webServiceTemplate = messageFactory != null ?
+				new WebServiceTemplate(messageFactory) : new WebServiceTemplate();
 		this.destinationProvider = destinationProvider;
 		// we always call WebServiceTemplate methods with an explicit URI argument,
 		// but in case the WebServiceTemplate is accessed directly we'll set this:
 		this.webServiceTemplate.setDestinationProvider(destinationProvider);
-		this.uri = "";
+		this.uri = null;
 	}
 
 	public void setHeaderMapper(SoapHeaderMapper headerMapper) {
@@ -263,6 +232,7 @@ protected WebServiceTemplate getWebServiceTemplate() {
 						.withRoot(requestMessage)
 						.build();
 
+		Assert.notNull(this.uri, "'uri' must not be null");
 		return this.uriFactory.expand(this.uri, uriVariables);
 	}
 

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

@@ -46,45 +46,41 @@ public class MarshallingWebServiceOutboundGateway extends AbstractWebServiceOutb
 
 	@SuppressWarnings("this-escape")
 	public MarshallingWebServiceOutboundGateway(DestinationProvider destinationProvider, Marshaller marshaller,
-			@Nullable Unmarshaller unmarshaller, WebServiceMessageFactory messageFactory) {
+			@Nullable Unmarshaller unmarshaller, @Nullable WebServiceMessageFactory messageFactory) {
 		super(destinationProvider, messageFactory);
 		configureMarshallers(marshaller, unmarshaller);
 	}
 
-	@SuppressWarnings("NullAway")
 	public MarshallingWebServiceOutboundGateway(DestinationProvider destinationProvider, Marshaller marshaller,
 			Unmarshaller unmarshaller) {
 		this(destinationProvider, marshaller, unmarshaller, null);
 	}
 
 	public MarshallingWebServiceOutboundGateway(DestinationProvider destinationProvider, Marshaller marshaller,
-			WebServiceMessageFactory messageFactory) {
+			@Nullable WebServiceMessageFactory messageFactory) {
 		this(destinationProvider, marshaller, null, messageFactory);
 	}
 
-	@SuppressWarnings("NullAway")
 	public MarshallingWebServiceOutboundGateway(DestinationProvider destinationProvider, Marshaller marshaller) {
 		this(destinationProvider, marshaller, (WebServiceMessageFactory) null);
 	}
 
 	@SuppressWarnings("this-escape")
-	public MarshallingWebServiceOutboundGateway(String uri, Marshaller marshaller, @Nullable Unmarshaller unmarshaller,
-			WebServiceMessageFactory messageFactory) {
+	public MarshallingWebServiceOutboundGateway(@Nullable String uri, Marshaller marshaller, @Nullable Unmarshaller unmarshaller,
+			@Nullable WebServiceMessageFactory messageFactory) {
 		super(uri, messageFactory);
 		configureMarshallers(marshaller, unmarshaller);
 	}
 
-	@SuppressWarnings("NullAway")
 	public MarshallingWebServiceOutboundGateway(String uri, Marshaller marshaller, Unmarshaller unmarshaller) {
 		this(uri, marshaller, unmarshaller, null);
 	}
 
 	public MarshallingWebServiceOutboundGateway(String uri, Marshaller marshaller,
-			WebServiceMessageFactory messageFactory) {
+			@Nullable WebServiceMessageFactory messageFactory) {
 		this(uri, marshaller, null, messageFactory);
 	}
 
-	@SuppressWarnings("NullAway")
 	public MarshallingWebServiceOutboundGateway(String uri, Marshaller marshaller) {
 		this(uri, marshaller, (WebServiceMessageFactory) null);
 	}
@@ -96,8 +92,9 @@ public MarshallingWebServiceOutboundGateway(String uri, Marshaller marshaller) {
 	 * @since 5.0
 	 */
 	@SuppressWarnings("this-escape")
-	public MarshallingWebServiceOutboundGateway(String uri, WebServiceTemplate webServiceTemplate) {
-		super(uri, webServiceTemplate);
+	public MarshallingWebServiceOutboundGateway(@Nullable String uri, WebServiceTemplate webServiceTemplate) {
+		super(uri, null);
+		doSetWebServiceTemplate(webServiceTemplate);
 	}
 
 	/**
@@ -109,7 +106,8 @@ public MarshallingWebServiceOutboundGateway(String uri, WebServiceTemplate webSe
 	@SuppressWarnings("this-escape")
 	public MarshallingWebServiceOutboundGateway(DestinationProvider destinationProvider,
 			WebServiceTemplate webServiceTemplate) {
-		super(destinationProvider, webServiceTemplate);
+		super(destinationProvider, null);
+		doSetWebServiceTemplate(webServiceTemplate);
 	}
 
 	/**

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

@@ -58,33 +58,32 @@ public class SimpleWebServiceOutboundGateway extends AbstractWebServiceOutboundG
 	private boolean extractPayload = true;
 
 	public SimpleWebServiceOutboundGateway(DestinationProvider destinationProvider) {
-		this(destinationProvider, null);
+		this(destinationProvider, null, null);
 	}
 
 	public SimpleWebServiceOutboundGateway(DestinationProvider destinationProvider,
-			@Nullable SourceExtractor<?> sourceExtractor) {
-		super(destinationProvider);
-		this.sourceExtractor = (sourceExtractor != null) ? sourceExtractor : new DefaultSourceExtractor();
+			SourceExtractor<?> sourceExtractor) {
+
+		this(destinationProvider, sourceExtractor, null);
 	}
 
 	public SimpleWebServiceOutboundGateway(DestinationProvider destinationProvider,
 			@Nullable SourceExtractor<?> sourceExtractor,
-			WebServiceMessageFactory messageFactory) {
+			@Nullable WebServiceMessageFactory messageFactory) {
 		super(destinationProvider, messageFactory);
 		this.sourceExtractor = (sourceExtractor != null) ? sourceExtractor : new DefaultSourceExtractor();
 	}
 
 	public SimpleWebServiceOutboundGateway(String uri) {
-		this(uri, null);
+		this(uri, null, null);
 	}
 
-	public SimpleWebServiceOutboundGateway(String uri, @Nullable SourceExtractor<?> sourceExtractor) {
-		super(uri);
-		this.sourceExtractor = (sourceExtractor != null) ? sourceExtractor : new DefaultSourceExtractor();
+	public SimpleWebServiceOutboundGateway(String uri, SourceExtractor<?> sourceExtractor) {
+		this(uri, sourceExtractor, null);
 	}
 
-	public SimpleWebServiceOutboundGateway(String uri, @Nullable SourceExtractor<?> sourceExtractor,
-			WebServiceMessageFactory messageFactory) {
+	public SimpleWebServiceOutboundGateway(@Nullable String uri, @Nullable SourceExtractor<?> sourceExtractor,
+			@Nullable WebServiceMessageFactory messageFactory) {
 
 		super(uri, messageFactory);
 		this.sourceExtractor = (sourceExtractor != null) ? sourceExtractor : new DefaultSourceExtractor();

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

@@ -58,11 +58,9 @@ public abstract class BaseWsOutboundGatewaySpec<
 
 	protected @Nullable DestinationProvider destinationProvider; // NOSONAR
 
-	@SuppressWarnings("NullAway.Init")
-	protected String uri; // NOSONAR
+	protected @Nullable String uri; // NOSONAR
 
-	@SuppressWarnings("NullAway.Init")
-	protected WebServiceMessageFactory webServiceMessageFactory; // NOSONAR
+	protected @Nullable WebServiceMessageFactory webServiceMessageFactory; // NOSONAR
 
 	private @Nullable SoapHeaderMapper headerMapper;
 

spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayParserTests.java

@@ -382,7 +382,7 @@ public void simpleGatewayWithDestinationProvider() {
 		DirectFieldAccessor accessor = new DirectFieldAccessor(gateway);
 		assertThat(accessor.getPropertyValue("destinationProvider")).as("Wrong DestinationProvider")
 				.isEqualTo(stubProvider);
-		assertThat(accessor.getPropertyValue("uri")).isEqualTo("");
+		assertThat(accessor.getPropertyValue("uri")).isNull();
 		Object destinationProviderObject = new DirectFieldAccessor(
 				accessor.getPropertyValue("webServiceTemplate")).getPropertyValue("destinationProvider");
 		assertThat(destinationProviderObject).as("Wrong DestinationProvider").isEqualTo(stubProvider);