Sonar Fixes

garyrussell · artembilan · commit 563f526ddc27 · 2018-12-07T14:59:27.000-05:00
Critical smells for packages `o.s.i.i*`.

* Polishing

* Polishing

* Missed saving a file.

* Polishing - PR Comments

* More PR comments.
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/support/PayloadsArgumentResolver.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/support/PayloadsArgumentResolver.java
@@ -62,8 +62,8 @@ public Object resolveArgument(MethodParameter parameter, Message<?> message) thr
 		Collection<Message<?>> messages = (Collection<Message<?>>) payload;
 
 		if (!this.expressionCache.containsKey(parameter)) {
-			Payloads payloads = parameter.getParameterAnnotation(Payloads.class); // NOSONAR never null - supportsParameter()
-			String expression = payloads.value();
+			Payloads payloads = parameter.getParameterAnnotation(Payloads.class);
+			String expression = payloads.value(); // NOSONAR never null - supportsParameter()
 			if (StringUtils.hasText(expression)) {
 				this.expressionCache.put(parameter, EXPRESSION_PARSER.parseExpression("![payload." + expression + "]"));
 			}
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/mapping/OutboundMessageMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/mapping/OutboundMessageMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -16,16 +16,19 @@
 
 package org.springframework.integration.mapping;
 
+import org.springframework.lang.Nullable;
 import org.springframework.messaging.Message;
 
 /**
  * Strategy interface for mapping from a {@link Message} to an Object.
  *
  * @author Mark Fisher
+ * @author Gary Russell
  */
 @FunctionalInterface
 public interface OutboundMessageMapper<T> {
 
+	@Nullable
 	T fromMessage(Message<?> message) throws Exception;
 
 }
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpOutboundGateway.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpOutboundGateway.java
@@ -31,6 +31,7 @@
 import org.springframework.expression.spel.support.StandardEvaluationContext;
 import org.springframework.integration.MessageTimeoutException;
 import org.springframework.integration.expression.ExpressionUtils;
+import org.springframework.integration.expression.ValueExpression;
 import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
 import org.springframework.integration.ip.IpHeaders;
 import org.springframework.integration.ip.tcp.connection.AbstractClientConnectionFactory;
@@ -62,6 +63,8 @@
 public class TcpOutboundGateway extends AbstractReplyProducingMessageHandler
 		implements TcpSender, TcpListener, Lifecycle {
 
+	private static final long DEFAULT_REMOTE_TIMEOUT = 10_000L;
+
 	private static final int DEFAULT_SECOND_CHANCE_DELAY = 2;
 
 	private final Map<String, AsyncReply> pendingReplies = new ConcurrentHashMap<>();
@@ -72,10 +75,9 @@ public class TcpOutboundGateway extends AbstractReplyProducingMessageHandler
 
 	private boolean isSingleUse;
 
-	private Expression remoteTimeoutExpression = new LiteralExpression("10000");
+	private Expression remoteTimeoutExpression = new ValueExpression<>(DEFAULT_REMOTE_TIMEOUT);
 
 	private long requestTimeout = 10000;
-
 	private EvaluationContext evaluationContext = new StandardEvaluationContext();
 
 	private boolean evaluationContextSet;
@@ -148,8 +150,16 @@ protected Object handleRequestMessage(Message<?> requestMessage) {
 				}
 			}
 			connection = this.connectionFactory.getConnection();
-			AsyncReply reply = new AsyncReply(this.remoteTimeoutExpression.getValue(this.evaluationContext,
-					requestMessage, Long.class));
+			Long remoteTimeout = this.remoteTimeoutExpression.getValue(this.evaluationContext, requestMessage,
+					Long.class);
+			if (remoteTimeout == null) {
+				remoteTimeout = DEFAULT_REMOTE_TIMEOUT;
+				if (logger.isWarnEnabled()) {
+					logger.warn("remoteTimeoutExpression evaluated to null; falling back to default for message "
+							+ requestMessage);
+				}
+			}
+			AsyncReply reply = new AsyncReply(remoteTimeout);
 			connectionId = connection.getConnectionId();
 			this.pendingReplies.put(connectionId, reply);
 			if (logger.isDebugEnabled()) {
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractConnectionFactory.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractConnectionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -314,13 +314,15 @@ public int getPort() {
 	/**
 	 * @return the listener
 	 */
+	@Nullable
 	public TcpListener getListener() {
 		return this.listener;
 	}
 
 	/**
 	 * @return the sender
 	 */
+	@Nullable
 	public TcpSender getSender() {
 		return this.sender;
 	}
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractServerConnectionFactory.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractServerConnectionFactory.java
@@ -154,6 +154,7 @@ protected void postProcessServerSocket(ServerSocket serverSocket) {
 	 *
 	 * @return the localAddress
 	 */
+	@Nullable
 	public String getLocalAddress() {
 		return this.localAddress;
 	}
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/DefaultTcpNioSSLConnectionSupport.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/DefaultTcpNioSSLConnectionSupport.java
@@ -81,9 +81,6 @@ public TcpNioConnection createNewConnection(SocketChannel socketChannel, boolean
 		postProcessSSLEngine(sslEngine);
 		if (this.sslVerifyHost) {
 			SSLParameters sslParameters = sslEngine.getSSLParameters();
-			if (sslParameters == null) {
-				sslParameters = new SSLParameters();
-			}
 			// HTTPS works for any TCP connection.
 			// It checks SAN (Subject Alternative Name) as well as CN.
 			sslParameters.setEndpointIdentificationAlgorithm("HTTPS");
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/DefaultTcpSocketSupport.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/DefaultTcpSocketSupport.java
@@ -66,9 +66,6 @@ public void postProcessSocket(Socket socket) {
 		if (this.sslVerifyHost && socket instanceof SSLSocket) {
 			SSLSocket sslSocket = (SSLSocket) socket;
 			SSLParameters sslParameters = sslSocket.getSSLParameters();
-			if (sslParameters == null) {
-				sslParameters = new SSLParameters();
-			}
 			// HTTPS works for any TCP connection.
 			// It checks SAN (Subject Alternative Name) as well as CN.
 			sslParameters.setEndpointIdentificationAlgorithm("HTTPS");
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/FailoverClientConnectionFactory.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/FailoverClientConnectionFactory.java
@@ -363,7 +363,16 @@ public boolean onMessage(Message<?> message) {
 					messageBuilder.setHeader(IpHeaders.ACTUAL_CONNECTION_ID,
 							message.getHeaders().get(IpHeaders.CONNECTION_ID));
 				}
-				return this.getListener().onMessage(messageBuilder.build());
+				TcpListener listener = getListener();
+				if (listener == null) {
+					if (this.logger.isDebugEnabled()) {
+						logger.debug("No listener for " + message);
+					}
+					return false;
+				}
+				else {
+					return listener.onMessage(messageBuilder.build());
+				}
 			}
 			else {
 				if (logger.isDebugEnabled()) {
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnection.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnection.java
@@ -61,6 +61,7 @@ public interface TcpConnection extends Runnable {
 	 * @return The payload.
 	 * @throws Exception Any Exception.
 	 */
+	@Nullable
 	Object getPayload() throws Exception;
 
 	/**
@@ -104,6 +105,7 @@ public interface TcpConnection extends Runnable {
 	/**
 	 * @return this connection's listener
 	 */
+	@Nullable
 	TcpListener getListener();
 
 	/**
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionInterceptorFactoryChain.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionInterceptorFactoryChain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2018 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,6 +18,8 @@
 
 import java.util.Arrays;
 
+import org.springframework.lang.Nullable;
+
 /**
  * @author Gary Russell
  * @since 2.0
@@ -27,6 +29,7 @@ public class TcpConnectionInterceptorFactoryChain {
 
 	private TcpConnectionInterceptorFactory[] interceptorFactories;
 
+	@Nullable
 	public TcpConnectionInterceptorFactory[] getInterceptorFactories() {
 		return this.interceptorFactories; //NOSONAR
 	}
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionSupport.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionSupport.java
@@ -165,11 +165,15 @@ protected void closeConnection(boolean isException) {
 			close();
 		}
 		else {
-			TcpConnectionInterceptor outerInterceptor = (TcpConnectionInterceptor) listener;
-			while (outerInterceptor.getListener() instanceof TcpConnectionInterceptor) {
-				outerInterceptor = (TcpConnectionInterceptor) outerInterceptor.getListener();
+			TcpConnectionInterceptor outerListener = (TcpConnectionInterceptor) listener;
+			while (outerListener.getListener() instanceof TcpConnectionInterceptor) {
+				TcpConnectionInterceptor nextListener = (TcpConnectionInterceptor) outerListener.getListener();
+				if (nextListener == null) {
+					break;
+				}
+				outerListener = nextListener;
 			}
-			outerInterceptor.close();
+			outerListener.close();
 			if (isException) {
 				// ensure physical close in case the interceptor did not close
 				this.close();
@@ -235,7 +239,7 @@ public void setSerializer(Serializer<?> serializer) {
 	 * Set the listener that will receive incoming Messages.
 	 * @param listener The listener.
 	 */
-	public void registerListener(TcpListener listener) {
+	public void registerListener(@Nullable TcpListener listener) {
 		this.listener = listener;
 		this.listenerRegisteredLatch.countDown();
 	}
@@ -257,7 +261,7 @@ public void enableManualListenerRegistration() {
 	 * to.
 	 * @param sender the sender.
 	 */
-	public void registerSender(TcpSender sender) {
+	public void registerSender(@Nullable TcpSender sender) {
 		this.sender = sender;
 		if (sender != null) {
 			sender.addNewConnection(this);
@@ -342,11 +346,12 @@ protected void setNoReadErrorOnClose(boolean noReadErrorOnClose) {
 	}
 
 	protected final void sendExceptionToListener(Exception e) {
-		if (!this.exceptionSent.getAndSet(true) && this.getListener() != null) {
+		TcpListener listenerForException = getListener();
+		if (!this.exceptionSent.getAndSet(true) && listenerForException != null) {
 			Map<String, Object> headers = Collections.singletonMap(IpHeaders.CONNECTION_ID,
 					(Object) this.getConnectionId());
 			ErrorMessage errorMessage = new ErrorMessage(e, headers);
-			this.getListener().onMessage(errorMessage);
+			listenerForException.onMessage(errorMessage);
 		}
 	}
 
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetConnection.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetConnection.java
@@ -35,6 +35,7 @@
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessagingException;
 import org.springframework.scheduling.SchedulingAwareRunnable;
+import org.springframework.util.Assert;
 
 /**
  * A TcpConnection that uses and underlying {@link Socket}.
@@ -103,10 +104,11 @@ public synchronized void send(Message<?> message) throws Exception {
 			this.socketOutputStream = new BufferedOutputStream(this.socket.getOutputStream(),
 					writeBufferSize > 0 ? writeBufferSize : 8192);
 		}
-		Object object = this.getMapper().fromMessage(message);
+		Object object = getMapper().fromMessage(message);
+		Assert.state(object != null, "Mapper mapped the message to 'null'.");
 		this.lastSend = System.currentTimeMillis();
 		try {
-			((Serializer<Object>) this.getSerializer()).serialize(object, this.socketOutputStream);
+			((Serializer<Object>) getSerializer()).serialize(object, this.socketOutputStream);
 			this.socketOutputStream.flush();
 		}
 		catch (Exception e) {
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioConnection.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioConnection.java
@@ -152,6 +152,7 @@ public void send(Message<?> message) throws Exception {
 						writeBufferSize > 0 ? writeBufferSize : 8192);
 			}
 			Object object = this.getMapper().fromMessage(message);
+			Assert.state(object != null, "Mapper mapped the message to 'null'.");
 			this.lastSend = System.currentTimeMillis();
 			try {
 				((Serializer<Object>) this.getSerializer()).serialize(object, this.bufferedOutputStream);
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapper.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapper.java
@@ -163,10 +163,13 @@ private DatagramPacket fromMessageWithAck(Message<?> message) throws Exception {
 		buffer.put((byte) '=');
 		buffer.put(this.ackAddress.getBytes(this.charset));
 		buffer.put((byte) ';');
-		buffer.put(MessageHeaders.ID.getBytes(this.charset));
-		buffer.put((byte) '=');
-		buffer.put(message.getHeaders().getId().toString().getBytes(this.charset));
-		buffer.put((byte) ';');
+		UUID id = message.getHeaders().getId();
+		if (id != null) {
+			buffer.put(MessageHeaders.ID.getBytes(this.charset));
+			buffer.put((byte) '=');
+			buffer.put(id.toString().getBytes(this.charset));
+			buffer.put((byte) ';');
+		}
 		int headersLength = buffer.position() - 4;
 		buffer.put(bytes);
 		if (this.lengthCheck) {
@@ -199,6 +202,7 @@ else if (payload instanceof String) {
 	}
 
 	@Override
+	@Nullable
 	public Message<byte[]> toMessage(DatagramPacket object) throws Exception {
 		return toMessage(object, null);
 	}
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/MulticastSendingMessageHandler.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/MulticastSendingMessageHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2016 the original author or authors.
+ * Copyright 2001-2018 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.
@@ -129,11 +129,11 @@ protected synchronized DatagramSocket getSocket() throws IOException {
 		if (getTheSocket() == null) {
 			createSocket();
 		}
-		return getTheSocket();
+		return super.getSocket();
 	}
 
 	private void createSocket() throws IOException {
-		if (this.getTheSocket() == null) {
+		if (getTheSocket() == null) {
 			MulticastSocket socket;
 			if (this.isAcknowledge()) {
 				int ackPort = this.getAckPort();
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastReceivingChannelAdapter.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastReceivingChannelAdapter.java
@@ -31,6 +31,7 @@
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.integration.ip.AbstractInternetProtocolReceivingChannelAdapter;
 import org.springframework.integration.ip.IpHeaders;
+import org.springframework.lang.Nullable;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHeaders;
 import org.springframework.messaging.MessagingException;
@@ -145,8 +146,12 @@ public void run() {
 	protected void sendAck(Message<byte[]> message) {
 		MessageHeaders headers = message.getHeaders();
 		Object id = headers.get(IpHeaders.ACK_ID);
+		if (id == null) {
+			logger.error("No " + IpHeaders.ACK_ID + " header; cannot send ack");
+			return;
+		}
 		byte[] ack = id.toString().getBytes();
-		String ackAddress = ((String) headers.get(IpHeaders.ACK_ADDRESS)).trim();
+		String ackAddress = (headers.get(IpHeaders.ACK_ADDRESS, String.class)).trim(); // NOSONAR caller checks header
 		Matcher mat = addressPattern.matcher(ackAddress);
 		if (!mat.matches()) {
 			throw new MessagingException(message,
@@ -227,6 +232,7 @@ public void setSocket(DatagramSocket socket) {
 		this.socket = socket;
 	}
 
+	@Nullable
 	protected DatagramSocket getTheSocket() {
 		return this.socket;
 	}
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastSendingMessageHandler.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastSendingMessageHandler.java

Original file line number	Diff line number	Diff line change
`@@ -154,6 +154,7 @@ protected void postProcessServerSocket(ServerSocket serverSocket) {`
`154`	`154`	`*`
`155`	`155`	`* @return the localAddress`
`156`	`156`	`*/`
	`157`	`+ @Nullable`
`157`	`158`	`public String getLocalAddress() {`
`158`	`159`	`return this.localAddress;`
`159`	`160`	`}`