Fix ResourceRegion HttpMessageConverter write checks

bclozel · bclozel · commit 96eba8b99772 · 2018-06-11T22:57:36.000+02:00
This commit fixes the write checks for `ResourceRegionHttpMessageConverter`, which was previously not checking properly the parameterized type (e.g. in case of a `List<Something>`). Issue: SPR-16932 (Cherry-picked from 05ff8b7)
diff --git a/spring-web/src/main/java/org/springframework/http/converter/ResourceRegionHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/ResourceRegionHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -119,7 +119,7 @@ public boolean canWrite(@Nullable Type type, @Nullable Class<?> clazz, @Nullable
 		}
 
 		Class<?> typeArgumentClass = (Class<?>) typeArgument;
-		return typeArgumentClass.isAssignableFrom(ResourceRegion.class);
+		return ResourceRegion.class.isAssignableFrom(typeArgumentClass);
 	}
 
 	@Override
diff --git a/spring-web/src/test/java/org/springframework/http/converter/ResourceRegionHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/ResourceRegionHttpMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -64,6 +64,7 @@ public void canReadResource() {
 	public void canWriteResource() {
 		assertTrue(converter.canWrite(ResourceRegion.class, null, MediaType.APPLICATION_OCTET_STREAM));
 		assertTrue(converter.canWrite(ResourceRegion.class, null, MediaType.ALL));
+		assertFalse(converter.canWrite(Object.class, null, MediaType.ALL));
 	}
 
 	@Test
@@ -74,6 +75,8 @@ public void canWriteResourceCollection() {
 
 		assertFalse(converter.canWrite(List.class, MediaType.APPLICATION_OCTET_STREAM));
 		assertFalse(converter.canWrite(List.class, MediaType.ALL));
+		Type resourceObjectList = new ParameterizedTypeReference<List<Object>>() {}.getType();
+		assertFalse(converter.canWrite(resourceObjectList, null, MediaType.ALL));
 	}
 
 	@Test

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2017 the original author or authors.`
	`2`	`+ * Copyright 2002-2018 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -119,7 +119,7 @@ public boolean canWrite(@Nullable Type type, @Nullable Class<?> clazz, @Nullable`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`Class<?> typeArgumentClass = (Class<?>) typeArgument;`
`122`		`- return typeArgumentClass.isAssignableFrom(ResourceRegion.class);`
	`122`	`+ return ResourceRegion.class.isAssignableFrom(typeArgumentClass);`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`@Override`