image-download - removing exception handling

This commit is contained in:
Slavisa Avramovic 2016-05-17 07:21:01 +02:00
parent fbd2d577da
commit b572a9066c
1 changed files with 5 additions and 11 deletions

View File

@ -42,19 +42,13 @@ public class ImageController {
} }
@RequestMapping(value = "/image-response-entity", method = RequestMethod.GET) @RequestMapping(value = "/image-response-entity", method = RequestMethod.GET)
public ResponseEntity<byte[]> getImageAsResponseEntity() { public ResponseEntity<byte[]> getImageAsResponseEntity() throws IOException {
ResponseEntity<byte[]> responseEntity; ResponseEntity<byte[]> responseEntity;
final HttpHeaders headers = new HttpHeaders(); final HttpHeaders headers = new HttpHeaders();
try { final InputStream in = servletContext.getResourceAsStream("/WEB-INF/images/image-example.jpg");
final InputStream in = servletContext.getResourceAsStream("/WEB-INF/images/image-example.jpg"); byte[] media = IOUtils.toByteArray(in);
byte[] media = IOUtils.toByteArray(in); headers.setCacheControl(CacheControl.noCache().getHeaderValue());
headers.setCacheControl(CacheControl.noCache().getHeaderValue()); responseEntity = new ResponseEntity<>(media, headers, HttpStatus.OK);
responseEntity = new ResponseEntity<>(media, headers, HttpStatus.OK);
} catch (FileNotFoundException fnfe) {
responseEntity = new ResponseEntity<>(null, headers, HttpStatus.NOT_FOUND);
} catch (Exception e) {
responseEntity = new ResponseEntity<>(null, headers, HttpStatus.INTERNAL_SERVER_ERROR);
}
return responseEntity; return responseEntity;
} }