From 15824cfdb0ba90628bf3093105b12699a854cb5b Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Tue, 29 Jun 2021 12:48:17 +0200
Subject: [PATCH] GH-2129 Ensure exception is propagated from
 ApplicationJsonMessageMarshallingConverter

This will ensure that any exception that is thrown during the conversion by ApplicationJsonMessageMarshallingConverter are propagated. Basically the idea is that since MessageConverter has accepted the conversion via canConvert() method it is no longer necessary to expect that may be some other converter in the stack may succeed. And on top of that user can still define custom message converter

Resolves #2129
Resolves #2191
---
 ...cationJsonMessageMarshallingConverter.java |  7 +--
 ...nJsonMessageMarshallingConverterTests.java | 55 +++++++++++++++++++
 2 files changed, 56 insertions(+), 6 deletions(-)
 create mode 100644 spring-cloud-stream/src/test/java/org/springframework/cloud/stream/converter/ApplicationJsonMessageMarshallingConverterTests.java

diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/converter/ApplicationJsonMessageMarshallingConverter.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/converter/ApplicationJsonMessageMarshallingConverter.java
index 3bd8949ab..18e560afd 100644
--- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/converter/ApplicationJsonMessageMarshallingConverter.java
+++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/converter/ApplicationJsonMessageMarshallingConverter.java
@@ -110,12 +110,7 @@ class ApplicationJsonMessageMarshallingConverter extends MappingJackson2MessageC
 						StandardCharsets.UTF_8);
 			}
 			else {
-				try {
-					result = super.convertFromInternal(message, targetClass, conversionHint);
-				}
-				catch (Exception e) {
-					// ignore
-				}
+				result = super.convertFromInternal(message, targetClass, conversionHint);
 			}
 		}
 
diff --git a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/converter/ApplicationJsonMessageMarshallingConverterTests.java b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/converter/ApplicationJsonMessageMarshallingConverterTests.java
new file mode 100644
index 000000000..375c8f61c
--- /dev/null
+++ b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/converter/ApplicationJsonMessageMarshallingConverterTests.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2021-2021 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.stream.converter;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.MapperFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.messaging.converter.MessageConversionException;
+import org.springframework.messaging.support.GenericMessage;
+
+import static org.junit.Assert.fail;
+
+
+public class ApplicationJsonMessageMarshallingConverterTests {
+	@Test
+	void badJson() {
+
+		try {
+			ApplicationJsonMessageMarshallingConverter converter = new ApplicationJsonMessageMarshallingConverter(
+					initObjectMapper());
+			converter.convertFromInternal(
+					new GenericMessage<>("{ notjson }".getBytes()), JsonNode.class, null);
+		}
+		catch (MessageConversionException e) {
+			// Good
+		}
+		catch (Throwable t) {
+			fail();
+		}
+	}
+
+	private ObjectMapper initObjectMapper() {
+		ObjectMapper objectMapper = new ObjectMapper();
+		objectMapper.configure(MapperFeature.DEFAULT_VIEW_INCLUSION, false);
+		objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		return objectMapper;
+	}
+}