Fix DEBUG Logging for Projection

Don't Log Converted Message With Projection

`toString()` cannot be invoked on the payload proxy created by
the projection factory.

Increase memory for builds.

* Unlike Kafka, we can't use the converter type to determine if projection was used.

* Add null check.

# Conflicts:
#	build.gradle
#	gradle.properties
#	spring-amqp/src/main/java/org/springframework/amqp/support/converter/AbstractJackson2MessageConverter.java

Author: garyrussell

build.gradle

@@ -217,6 +217,17 @@ subprojects { subproject ->
     compileKotlin.dependsOn updateCopyrights
 
 	test {
+		maxHeapSize = '2g'
+		jvmArgs '-XX:+HeapDumpOnOutOfMemoryError'
+
+		testLogging {
+			events "skipped", "failed"
+			showStandardStreams = project.hasProperty("showStandardStreams") ?: false
+			showExceptions = true
+			showStackTraces = true
+			exceptionFormat = 'full'
+		}
+
 		jacoco {
 			append = false
 			destinationFile = file("$buildDir/jacoco.exec")

gradle.properties

@@ -1,2 +1,3 @@
 version=2.2.20.BUILD-SNAPSHOT
-org.gradle.daemon=true
+org.gradle.jvmargs=-Xms512m -Xmx4g -XX:MaxPermSize=1024m -XX:MaxMetaspaceSize=1g
+org.gradlee.caching=trueorg.gradle.daemon=true

spring-amqp/src/main/java/org/springframework/amqp/core/MessageProperties.java

@@ -128,6 +128,8 @@ public class MessageProperties implements Serializable {
 
 	private boolean lastInBatch;
 
+	private boolean projectionUsed;
+
 	private transient Type inferredArgumentType;
 
 	private transient Method targetMethod;
@@ -552,6 +554,26 @@ public void setLastInBatch(boolean lastInBatch) {
 		this.lastInBatch = lastInBatch;
 	}
 
+	/**
+	 * Get an internal flag used to communicate that conversion used projection; always
+	 * false at the application level.
+	 * @return true if projection was used.
+	 * @since 2.2.20
+	 */
+	public boolean isProjectionUsed() {
+		return this.projectionUsed;
+	}
+
+	/**
+	 * Set an internal flag used to communicate that conversion used projection; always false
+	 * at the application level.
+	 * @param projectionUsed true for projection.
+	 * @since 2.2.20
+	 */
+	public void setProjectionUsed(boolean projectionUsed) {
+		this.projectionUsed = projectionUsed;
+	}
+
 	/**
 	 * Return the x-death header.
 	 * @return the header.

spring-amqp/src/main/java/org/springframework/amqp/support/converter/AbstractJackson2MessageConverter.java

@@ -290,33 +290,7 @@ private Object doFromMessage(Message message, Object conversionHint, MessageProp
 
 		Object content = null;
 		try {
-			JavaType inferredType = this.javaTypeMapper.getInferredType(properties);
-			if (inferredType != null && this.useProjectionForInterfaces && inferredType.isInterface()
-					&& !inferredType.getRawClass().getPackage().getName().startsWith("java.util")) { // List etc
-				content = this.projectingConverter.convert(message, inferredType.getRawClass());
-			}
-			else if (inferredType != null && this.alwaysConvertToInferredType) {
-				content = tryConverType(message, encoding, inferredType);
-			}
-			if (content == null) {
-				if (conversionHint instanceof ParameterizedTypeReference) {
-					content = convertBytesToObject(message.getBody(), encoding,
-							this.objectMapper.getTypeFactory().constructType(
-									((ParameterizedTypeReference<?>) conversionHint).getType()));
-				}
-				else if (getClassMapper() == null) {
-					JavaType targetJavaType = getJavaTypeMapper()
-							.toJavaType(message.getMessageProperties());
-					content = convertBytesToObject(message.getBody(),
-							encoding, targetJavaType);
-				}
-				else {
-					Class<?> targetClass = getClassMapper().toClass(// NOSONAR never null
-							message.getMessageProperties());
-					content = convertBytesToObject(message.getBody(),
-							encoding, targetClass);
-				}
-			}
+			content = convertContent(message, conversionHint, properties, encoding);
 		}
 		catch (IOException e) {
 			throw new MessageConversionException(
@@ -325,6 +299,41 @@ else if (getClassMapper() == null) {
 		return content;
 	}
 
+	private Object convertContent(Message message, Object conversionHint, MessageProperties properties, String encoding)
+			throws IOException {
+
+		Object content = null;
+		JavaType inferredType = this.javaTypeMapper.getInferredType(properties);
+		if (inferredType != null && this.useProjectionForInterfaces && inferredType.isInterface()
+				&& !inferredType.getRawClass().getPackage().getName().startsWith("java.util")) { // List etc
+			content = this.projectingConverter.convert(message, inferredType.getRawClass());
+			properties.setProjectionUsed(true);
+		}
+		else if (inferredType != null && this.alwaysConvertToInferredType) {
+			content = tryConverType(message, encoding, inferredType);
+		}
+		if (content == null) {
+			if (conversionHint instanceof ParameterizedTypeReference) {
+				content = convertBytesToObject(message.getBody(), encoding,
+						this.objectMapper.getTypeFactory().constructType(
+								((ParameterizedTypeReference<?>) conversionHint).getType()));
+			}
+			else if (getClassMapper() == null) {
+				JavaType targetJavaType = getJavaTypeMapper()
+						.toJavaType(message.getMessageProperties());
+				content = convertBytesToObject(message.getBody(),
+						encoding, targetJavaType);
+			}
+			else {
+				Class<?> targetClass = getClassMapper().toClass(// NOSONAR never null
+						message.getMessageProperties());
+				content = convertBytesToObject(message.getBody(),
+						encoding, targetClass);
+			}
+		}
+		return content;
+	}
+
 	/*
 	 * Unfortunately, mapper.canDeserialize() always returns true (adds an AbstractDeserializer
 	 * to the cache); so all we can do is try a conversion.

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/adapter/MessagingMessageListenerAdapter.java

@@ -183,7 +183,11 @@ private void handleException(org.springframework.amqp.core.Message amqpMessage,
 	protected void invokeHandlerAndProcessResult(@Nullable org.springframework.amqp.core.Message amqpMessage,
 			Channel channel, Message<?> message) throws Exception { // NOSONAR
 
-		if (logger.isDebugEnabled()) {
+		boolean projectionUsed = amqpMessage == null ? false : amqpMessage.getMessageProperties().isProjectionUsed();
+		if (projectionUsed) {
+			amqpMessage.getMessageProperties().setProjectionUsed(false);
+		}
+		if (logger.isDebugEnabled() && !projectionUsed) {
 			logger.debug("Processing [" + message + "]");
 		}
 		InvocationResult result = null;