From aaa128180958d4b6d420cb7e4a955bb2edab0c0b Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@pivotal.io>
Date: Fri, 16 Sep 2016 12:19:38 -0400
Subject: [PATCH] Remove Exception declaration in abstract Encoder

---
 .../core/codec/AbstractSingleValueEncoder.java       | 12 ++----------
 .../springframework/core/codec/ResourceEncoder.java  | 11 ++++++++---
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/codec/AbstractSingleValueEncoder.java b/spring-core/src/main/java/org/springframework/core/codec/AbstractSingleValueEncoder.java
index 7242a490c9..286cd4acde 100644
--- a/spring-core/src/main/java/org/springframework/core/codec/AbstractSingleValueEncoder.java
+++ b/spring-core/src/main/java/org/springframework/core/codec/AbstractSingleValueEncoder.java
@@ -47,14 +47,7 @@ public abstract class AbstractSingleValueEncoder<T> extends AbstractEncoder<T> {
 
 		return Flux.from(inputStream).
 				take(1).
-				concatMap(t -> {
-					try {
-						return encode(t, bufferFactory, elementType, mimeType, hints);
-					}
-					catch (Exception ex) {
-						return Flux.error(ex);
-					}
-				});
+				concatMap(t -> encode(t, bufferFactory, elementType, mimeType, hints));
 	}
 
 	/**
@@ -65,9 +58,8 @@ public abstract class AbstractSingleValueEncoder<T> extends AbstractEncoder<T> {
 	 * @param mimeType the mime type to process
 	 * @param hints Additional information about how to do decode, optional
 	 * @return the output stream
-	 * @throws Exception in case of errors
 	 */
 	protected abstract Flux<DataBuffer> encode(T t, DataBufferFactory dataBufferFactory,
-			ResolvableType type, MimeType mimeType, Map<String, Object> hints) throws Exception;
+			ResolvableType type, MimeType mimeType, Map<String, Object> hints);
 
 }
diff --git a/spring-core/src/main/java/org/springframework/core/codec/ResourceEncoder.java b/spring-core/src/main/java/org/springframework/core/codec/ResourceEncoder.java
index 5f5fab3443..ece9ba8143 100644
--- a/spring-core/src/main/java/org/springframework/core/codec/ResourceEncoder.java
+++ b/spring-core/src/main/java/org/springframework/core/codec/ResourceEncoder.java
@@ -64,10 +64,15 @@ public class ResourceEncoder extends AbstractSingleValueEncoder<Resource> {
 
 	@Override
 	protected Flux<DataBuffer> encode(Resource resource, DataBufferFactory dataBufferFactory,
-			ResolvableType type, MimeType mimeType, Map<String, Object> hints) throws IOException {
+			ResolvableType type, MimeType mimeType, Map<String, Object> hints) {
 
-		ReadableByteChannel channel = resource.readableChannel();
-		return DataBufferUtils.read(channel, dataBufferFactory, bufferSize);
+		try {
+			ReadableByteChannel channel = resource.readableChannel();
+			return DataBufferUtils.read(channel, dataBufferFactory, this.bufferSize);
+		}
+		catch (IOException ex) {
+			return Flux.error(ex);
+		}
 	}
 
 }