Provide default fallback implementation of decodeEntity(Object id, byte[] ...) (back to String).

Ensure that if both parsing and close throw, the close exception is suppressed rather than masking the original error.

Signed-off-by: Emilien Bevierre <emilien.bevierre@couchbase.com>

Author: emilienbev

src/main/java/org/springframework/data/couchbase/core/ReactiveTemplateSupport.java

@@ -17,6 +17,7 @@
 
 import reactor.core.publisher.Mono;
 
+import java.nio.charset.StandardCharsets;
 import java.time.Instant;
 
 import org.springframework.data.couchbase.core.convert.translation.TranslationService;
@@ -36,8 +37,11 @@ public interface ReactiveTemplateSupport {
 	<T> Mono<T> decodeEntity(Object id, String source, Long cas, Instant expiryTime, Class<T> entityClass, String scope,
 			String collection, Object txResultHolder, CouchbaseResourceHolder holder);
 
-	<T> Mono<T> decodeEntity(Object id, byte[] source, Long cas, Instant expiryTime, Class<T> entityClass, String scope,
-			String collection, Object txResultHolder, CouchbaseResourceHolder holder);
+	default <T> Mono<T> decodeEntity(Object id, byte[] source, Long cas, Instant expiryTime, Class<T> entityClass,
+			String scope, String collection, Object txResultHolder, CouchbaseResourceHolder holder) {
+		return decodeEntity(id, new String(source, StandardCharsets.UTF_8), cas, expiryTime, entityClass, scope,
+				collection, txResultHolder, holder);
+	}
 
 	<T> Mono<T> applyResult(T entity, CouchbaseDocument converted, Object id, Long cas,
 			Object txResultHolder, CouchbaseResourceHolder holder);

src/main/java/org/springframework/data/couchbase/core/TemplateSupport.java

@@ -15,6 +15,7 @@
  */
 package org.springframework.data.couchbase.core;
 
+import java.nio.charset.StandardCharsets;
 import java.time.Instant;
 
 import org.springframework.data.couchbase.core.convert.translation.TranslationService;
@@ -32,8 +33,11 @@ public interface TemplateSupport {
 	<T> T decodeEntity(Object id, String source, Long cas, Instant expiryTime, Class<T> entityClass, String scope,
 			String collection, Object txResultHolder, CouchbaseResourceHolder holder);
 
-	<T> T decodeEntity(Object id, byte[] source, Long cas, Instant expiryTime, Class<T> entityClass, String scope,
-			String collection, Object txResultHolder, CouchbaseResourceHolder holder);
+	default <T> T decodeEntity(Object id, byte[] source, Long cas, Instant expiryTime, Class<T> entityClass, String scope,
+			String collection, Object txResultHolder, CouchbaseResourceHolder holder) {
+		return decodeEntity(id, new String(source, StandardCharsets.UTF_8), cas, expiryTime, entityClass, scope,
+				collection, txResultHolder, holder);
+	}
 
 	<T> T applyResult(T entity, CouchbaseDocument converted, Object id, long cas, Object txResultHolder,
 			CouchbaseResourceHolder holder);

src/main/java/org/springframework/data/couchbase/core/convert/translation/JacksonTranslationService.java

@@ -128,8 +128,7 @@ private boolean isEnumOrClass(final Class<?> clazz) {
 	 */
 	@Override
 	public final CouchbaseStorable decode(final String source, final CouchbaseStorable target) {
-		try {
-			JsonParser parser = factory.createParser(source);
+		try (JsonParser parser = factory.createParser(source)) {
 			return decodeWithParser(parser, target);
 		} catch (IOException ex) {
 			throw new RuntimeException("Could not decode JSON", ex);
@@ -146,29 +145,24 @@ public final CouchbaseStorable decode(final String source, final CouchbaseStorab
 	 */
 	@Override
 	public final CouchbaseStorable decode(final byte[] source, final CouchbaseStorable target) {
-		try {
-			JsonParser parser = factory.createParser(source);
+		try (JsonParser parser = factory.createParser(source)) {
 			return decodeWithParser(parser, target);
 		} catch (IOException ex) {
 			throw new RuntimeException("Could not decode JSON", ex);
 		}
 	}
 
 	private CouchbaseStorable decodeWithParser(final JsonParser parser, final CouchbaseStorable target) throws IOException {
-		try {
-			while (parser.nextToken() != null) {
-				JsonToken currentToken = parser.getCurrentToken();
-
-				if (currentToken == JsonToken.START_OBJECT) {
-					return decodeObject(parser, (CouchbaseDocument) target);
-				} else if (currentToken == JsonToken.START_ARRAY) {
-					return decodeArray(parser, new CouchbaseList());
-				} else {
-					throw new MappingException("JSON to decode needs to start as array or object!");
-				}
+		while (parser.nextToken() != null) {
+			JsonToken currentToken = parser.getCurrentToken();
+
+			if (currentToken == JsonToken.START_OBJECT) {
+				return decodeObject(parser, (CouchbaseDocument) target);
+			} else if (currentToken == JsonToken.START_ARRAY) {
+				return decodeArray(parser, new CouchbaseList());
+			} else {
+				throw new MappingException("JSON to decode needs to start as array or object!");
 			}
-		} finally {
-			parser.close();
 		}
 		return target;
 	}

src/main/java/org/springframework/data/couchbase/core/convert/translation/TranslationService.java

@@ -48,7 +48,8 @@ public interface TranslationService {
 
 	/**
 	 * Decodes the target format from a byte array into a {@link CouchbaseDocument}.
-	 * This avoids the intermediate String allocation when the source is already available as bytes.
+	 * The default implementation converts the bytes to a String via UTF-8 before decoding.
+	 * Implementations may override this to parse bytes directly and avoid the intermediate String allocation.
 	 *
 	 * @param source the source formatted document as bytes (UTF-8 encoded).
 	 * @param target the target of the populated data.