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 index 3f2bca97a4f..68305acfed9 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/ResourceRegionHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/ResourceRegionHttpMessageConverter.java @@ -104,7 +104,6 @@ public class ResourceRegionHttpMessageConverter extends AbstractGenericHttpMessa } @Override - @SuppressWarnings("unchecked") protected void writeInternal(Object object, @Nullable Type type, HttpOutputMessage outputMessage) throws IOException, HttpMessageNotWritableException { @@ -112,6 +111,7 @@ public class ResourceRegionHttpMessageConverter extends AbstractGenericHttpMessa writeResourceRegion(resourceRegion, outputMessage); } else { + @SuppressWarnings("unchecked") Collection regions = (Collection) object; if (regions.size() == 1) { writeResourceRegion(regions.iterator().next(), outputMessage); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilderTests.java index 2e96c2f7884..29b6868aa2b 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilderTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilderTests.java @@ -864,12 +864,14 @@ public class MvcUriComponentsBuilderTests { } } + interface HelloInterface { @GetMapping("/hello/{name}") ResponseEntity get(@PathVariable String name); } + @Controller static class HelloController implements HelloInterface { @@ -877,7 +879,6 @@ public class MvcUriComponentsBuilderTests { public ResponseEntity get(String name) { return ResponseEntity.ok("Hello " + name); } - } }