Fix new Sonar issues

Author: garyrussell

spring-integration-jpa/src/main/java/org/springframework/integration/jpa/core/DefaultJpaOperations.java

@@ -30,6 +30,7 @@
 import org.springframework.integration.jpa.support.JpaUtils;
 import org.springframework.integration.jpa.support.parametersource.ParameterSource;
 import org.springframework.integration.jpa.support.parametersource.PositionSupportingParameterSource;
+import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -226,6 +227,7 @@ public void persist(Object entity, int flushSize, boolean clearOnFlush) {
 		persistOrMerge(entity, false, flushSize, clearOnFlush);
 	}
 
+	@Nullable
 	private Object persistOrMerge(Object entity, boolean isMerge, int flushSize, boolean clearOnFlush) {
 		Object result = null;
 

spring-integration-jpa/src/main/java/org/springframework/integration/jpa/core/JpaExecutor.java

@@ -472,6 +472,7 @@ else if (this.namedQuery != null) {
 	 * Execute the JPA operation. Delegates to {@link JpaExecutor#poll(Message)}.
 	 * @return The object or null.
 	 */
+	@Nullable
 	public Object poll() {
 		return poll(null);
 	}
@@ -485,6 +486,7 @@ public Object poll() {
 	 * @param requestMessage May be null.
 	 * @return The payload object, which may be null.
 	 */
+	@Nullable
 	public Object poll(@Nullable final Message<?> requestMessage) {
 		final Object payload;
 
@@ -508,8 +510,8 @@ public Object poll(@Nullable final Message<?> requestMessage) {
 				if (this.firstResultExpression != null) {
 					firstResult = getFirstResult(requestMessage);
 				}
-				ParameterSource parameterSource = determineParameterSource(requestMessage);
-				result = doPoll(parameterSource, firstResult, maxNumberOfResults);
+				ParameterSource paramSource = determineParameterSource(requestMessage);
+				result = doPoll(paramSource, firstResult, maxNumberOfResults);
 			}
 
 			if (result.isEmpty()) {
@@ -535,6 +537,11 @@ else if (requestMessage != null) {
 			}
 		}
 
+		checkDelete(payload);
+		return payload;
+	}
+
+	private void checkDelete(final Object payload) {
 		if (payload != null && this.deleteAfterPoll) {
 			if (payload instanceof Iterable) {
 				if (this.deleteInBatch) {
@@ -554,7 +561,6 @@ else if (requestMessage != null) {
 				this.jpaOperations.flush();
 			}
 		}
-		return payload;
 	}
 
 	protected List<?> doPoll(ParameterSource jpaQLParameterSource, int firstResult, int maxNumberOfResults) {