From 45294293484bafbfdd1af398570bba6253d8340e Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@vmware.com>
Date: Wed, 24 Jun 2020 10:35:42 -0400
Subject: [PATCH] GH-1215: Fix Sonar Issue

Method complexity.
---
 .../AbstractJackson2MessageConverter.java     | 62 +++++++++++--------
 1 file changed, 35 insertions(+), 27 deletions(-)

diff --git a/spring-amqp/src/main/java/org/springframework/amqp/support/converter/AbstractJackson2MessageConverter.java b/spring-amqp/src/main/java/org/springframework/amqp/support/converter/AbstractJackson2MessageConverter.java
index 7fbf3d6d..135abfa0 100644
--- a/spring-amqp/src/main/java/org/springframework/amqp/support/converter/AbstractJackson2MessageConverter.java
+++ b/spring-amqp/src/main/java/org/springframework/amqp/support/converter/AbstractJackson2MessageConverter.java
@@ -290,33 +290,7 @@ public abstract class AbstractJackson2MessageConverter extends AbstractMessageCo
 
 		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,40 @@ public abstract class AbstractJackson2MessageConverter extends AbstractMessageCo
 		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());
+		}
+		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.