From 113db2fb2f6a1ad73d37bfe83c5dbbb22edb296e Mon Sep 17 00:00:00 2001
From: rstoyanchev <rstoyanchev@vmware.com>
Date: Wed, 12 Oct 2022 15:42:34 +0100
Subject: [PATCH] Fix regression in AbstractJackson2Decoder

Closes gh-29307
---
 .../http/codec/json/AbstractJackson2Decoder.java |  4 ++++
 .../codec/json/Jackson2JsonDecoderTests.java     | 16 ++++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/codec/json/AbstractJackson2Decoder.java b/spring-web/src/main/java/org/springframework/http/codec/json/AbstractJackson2Decoder.java
index 0acce8ce5ce..287dd8ce687 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/json/AbstractJackson2Decoder.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/json/AbstractJackson2Decoder.java
@@ -292,6 +292,10 @@ public abstract class AbstractJackson2Decoder extends Jackson2CodecSupport imple
 		return getMimeTypes();
 	}
 
+	@Override
+	public List<MimeType> getDecodableMimeTypes(ResolvableType targetType) {
+		return getMimeTypes(targetType);
+	}
 
 	// Jackson2CodecSupport
 
diff --git a/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonDecoderTests.java b/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonDecoderTests.java
index aa8c1f5dfd1..bd03678647e 100644
--- a/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonDecoderTests.java
+++ b/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonDecoderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -95,7 +95,7 @@ public class Jackson2JsonDecoderTests extends AbstractDecoderTests<Jackson2JsonD
 
 	@Test
 	public void canDecodeWithObjectMapperRegistrationForType() {
-				MediaType halJsonMediaType = MediaType.parseMediaType("application/hal+json");
+		MediaType halJsonMediaType = MediaType.parseMediaType("application/hal+json");
 		MediaType halFormsJsonMediaType = MediaType.parseMediaType("application/prs.hal-forms+json");
 
 		assertThat(decoder.canDecode(ResolvableType.forClass(Pojo.class), halJsonMediaType)).isTrue();
@@ -132,6 +132,18 @@ public class Jackson2JsonDecoderTests extends AbstractDecoderTests<Jackson2JsonD
 				decoder.getMimeTypes().add(new MimeType("text", "ecmascript")));
 	}
 
+	@Test
+	public void decodableMimeTypesWithObjectMapperRegistration() {
+		MimeType mimeType1 = MediaType.parseMediaType("application/hal+json");
+		MimeType mimeType2 = new MimeType("text", "javascript", StandardCharsets.UTF_8);
+
+		Jackson2JsonDecoder decoder = new Jackson2JsonDecoder(new ObjectMapper(), mimeType2);
+		decoder.registerObjectMappersForType(Pojo.class, map -> map.put(mimeType1, new ObjectMapper()));
+
+		assertThat(decoder.getDecodableMimeTypes(ResolvableType.forClass(Pojo.class)))
+				.containsExactly(mimeType1);
+	}
+
 	@Override
 	@Test
 	public void decode() {