Merge branch '6.2.x'

Author: bclozel

spring-web/src/main/java/org/springframework/web/accept/MappingMediaTypeFileExtensionResolver.java

@@ -95,7 +95,7 @@ private void addFileExtension(MediaType mediaType, String extension) {
 
 	@Override
 	public List<String> resolveFileExtensions(MediaType mediaType) {
-		List<String> fileExtensions = this.fileExtensions.get(mediaType);
+		List<String> fileExtensions = this.fileExtensions.get(mediaType.removeQualityValue());
 		return (fileExtensions != null ? fileExtensions : Collections.emptyList());
 	}
 

spring-web/src/test/java/org/springframework/web/accept/MappingMediaTypeFileExtensionResolverTests.java

@@ -53,6 +53,14 @@ void resolveExtensionsNoMatch() {
 				.resolveFileExtensions(MediaType.TEXT_HTML)).isEmpty();
 	}
 
+	@Test
+	void resolveExtensionsWithQualityParameter() {
+		List<String> extensions = new MappingMediaTypeFileExtensionResolver(DEFAULT_MAPPINGS)
+				.resolveFileExtensions(MediaType.parseMediaType("application/json;q=0.9"));
+
+		assertThat(extensions).containsExactly("json");
+	}
+
 	@Test // SPR-13747
 	public void lookupMediaTypeCaseInsensitive() {
 		assertThat(new MappingMediaTypeFileExtensionResolver(DEFAULT_MAPPINGS).lookupMediaType("JSON"))