From e16c40359a1809a647d0adfc2d7cfffcfaa9963a Mon Sep 17 00:00:00 2001
From: Tim Meighen <timmeighen.public@gmail.com>
Date: Wed, 29 Aug 2012 13:46:23 -0700
Subject: [PATCH] Support wildcard style media types in JSON converters

Add "application/*+json" to supported media types for both Jackson
message converters.

Issue: SPR-7905
---
 .../json/MappingJackson2HttpMessageConverter.java        | 2 +-
 .../json/MappingJacksonHttpMessageConverter.java         | 2 +-
 .../AbstractMappingJacksonHttpMessageConverterTests.java | 9 ++++++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java
index 31f236a6bd..2e4e6fb45b 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java
@@ -69,7 +69,7 @@ public class MappingJackson2HttpMessageConverter extends AbstractHttpMessageConv
 	 * Construct a new {@code MappingJackson2HttpMessageConverter}.
 	 */
 	public MappingJackson2HttpMessageConverter() {
-		super(new MediaType("application", "json", DEFAULT_CHARSET));
+		super(new MediaType("application", "json", DEFAULT_CHARSET), new MediaType("application", "*+json", DEFAULT_CHARSET));
 	}
 
 	/**
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java
index 51976c380b..d85b627197 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java
@@ -69,7 +69,7 @@ public class MappingJacksonHttpMessageConverter extends AbstractHttpMessageConve
 	 * Construct a new {@code MappingJacksonHttpMessageConverter}.
 	 */
 	public MappingJacksonHttpMessageConverter() {
-		super(new MediaType("application", "json", DEFAULT_CHARSET));
+		super(new MediaType("application", "json", DEFAULT_CHARSET), new MediaType("application", "*+json", DEFAULT_CHARSET));
 	}
 
 	/**
diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/AbstractMappingJacksonHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/AbstractMappingJacksonHttpMessageConverterTests.java
index 6335cbab98..da72170f55 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/json/AbstractMappingJacksonHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/json/AbstractMappingJacksonHttpMessageConverterTests.java
@@ -45,7 +45,6 @@ public abstract class AbstractMappingJacksonHttpMessageConverterTests<T extends
 
 	protected static final String NEWLINE_SYSTEM_PROPERTY = System.getProperty("line.separator");
 
-
 	private T converter;
 
 	@Before
@@ -71,6 +70,14 @@ public abstract class AbstractMappingJacksonHttpMessageConverterTests<T extends
 		assertTrue(converter.canWrite(Map.class, new MediaType("application", "json")));
 	}
 
+	// SPR-7905
+
+	@Test
+	public void canReadAndWriteMicroformats() {
+		assertTrue(converter.canRead(MyBean.class, new MediaType("application", "vnd.test-micro-type+json")));
+		assertTrue(converter.canWrite(MyBean.class, new MediaType("application", "vnd.test-micro-type+json")));
+	}
+
 	@Test
 	public void readTyped() throws IOException {
 		String body =