Remove unnecessary intermediate String deserialization of document bodies by emilienbev · Pull Request #2122 · spring-projects/spring-data-couchbase

emilienbev · 2026-02-19T12:55:59Z

You have read the Spring Data contribution guidelines.
There is a ticket in the bug tracker for the project in our JIRA.
You use the code formatters provided here and have them applied to your changes. Don’t submit any formatting related changes.
You submit test cases (unit or integration tests) that back your changes.
You added yourself as author in the headers of the classes you touched. Amend the date range in the Apache license header if needed. For new types, add the license header (copy from another file and set the current year only).

… favour of the raw bytes Signed-off-by: Emilien Bevierre <emilien.bevierre@couchbase.com>

…immediately after subscribe(), before the document has potentially been saved. Signed-off-by: Emilien Bevierre <emilien.bevierre@couchbase.com>

Copilot

Pull request overview

This PR addresses issue #2121 by eliminating an unnecessary intermediate String conversion when decoding KV document bodies, enabling decoding directly from raw response bytes (notably for reactive KV operations) while keeping string-based decoding available.

Changes:

Add byte[] decode paths across template support APIs and internal decode flow (TemplateSupport / ReactiveTemplateSupport → AbstractTemplateSupport → TranslationService).
Update reactive KV operations (e.g., find-by-id, range scan, replicas) to pass contentAsBytes() instead of converting to String.
Extend Jackson translation to decode directly from byte[] and add tests validating byte-based decoding (including non-ASCII content).

Reviewed changes

Copilot reviewed 13 out of 14 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
src/test/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseRepositoryQueryCollectionIntegrationTests.java	Adjusts reactive test flow to block for completion (avoids async subscribe).
src/test/java/org/springframework/data/couchbase/core/convert/translation/JacksonTranslationServiceTests.java	Adds coverage for decoding from UTF-8 bytes (ASCII + non-ASCII).
src/main/java/org/springframework/data/couchbase/core/convert/translation/TranslationService.java	Adds `decode(byte[], ...)` default overload to support byte-based decoding.
src/main/java/org/springframework/data/couchbase/core/convert/translation/JacksonTranslationService.java	Implements direct byte[] parsing via Jackson `JsonParser`.
src/main/java/org/springframework/data/couchbase/core/TemplateSupport.java	Adds byte[] overload for entity decoding (sync template support).
src/main/java/org/springframework/data/couchbase/core/ReactiveTemplateSupport.java	Adds byte[] overload for entity decoding (reactive template support).
src/main/java/org/springframework/data/couchbase/core/ReactiveRangeScanOperationSupport.java	Uses `contentAsBytes()` to avoid intermediate String creation.
src/main/java/org/springframework/data/couchbase/core/ReactiveFindFromReplicasByIdOperationSupport.java	Uses `contentAsBytes()` for replica reads.
src/main/java/org/springframework/data/couchbase/core/ReactiveFindByIdOperationSupport.java	Uses `contentAsBytes()` across get variants (touch/lock/get/tx path).
src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateSupport.java	Implements reactive byte[] decodeEntity overload.
src/main/java/org/springframework/data/couchbase/core/NonReactiveSupportWrapper.java	Bridges reactive byte[] decode to non-reactive support.
src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplateSupport.java	Implements sync byte[] decodeEntity overload.
src/main/java/org/springframework/data/couchbase/core/AbstractTemplateSupport.java	Adds byte[] decodeEntityBase path and refactors shared decode/finalize steps.
.gitignore	Ignores `src/test/resources/integration.local.properties`.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

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

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

...ain/java/org/springframework/data/couchbase/core/convert/translation/TranslationService.java

...a/org/springframework/data/couchbase/core/convert/translation/JacksonTranslationService.java

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

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Emilien Bevierre <44171454+emilienbev@users.noreply.github.com>

…te[] ...) (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>

mp911de · 2026-02-20T08:59:34Z

...ain/java/org/springframework/data/couchbase/core/convert/translation/TranslationService.java

+	 * @return a properly populated document to work with.
+	 */
+	default CouchbaseStorable decode(byte[] source, CouchbaseStorable target) {
+		return decode(new String(source, StandardCharsets.UTF_8), target);


Seeing new String(…, StandardCharsets.UTF_8) in various places hints for having a utility method somewhere. ByteUtils.toString(…) could be a good startingpoint.

Thanks Mark, pushed this in a7d84f1 .

mp911de · 2026-02-20T09:00:59Z

...a/org/springframework/data/couchbase/core/convert/translation/JacksonTranslationService.java

+	 * @return the decoded structure.
+	 */
+	@Override
+	public final CouchbaseStorable decode(final byte[] source, final CouchbaseStorable target) {


final arguments and in variable declarations (further down below in the pull request) is rather noise and distracts from reading code. This is more of an observation.

onobc

👋🏻 @emilienbev
Great work! Thank you for the excellent detail in the issue and the PR description.

I have one request that spans multiple files... do you mind moving your @ author... tags to the end of the list as we typically add in history order (i.e. the original author of the source is the first entry).

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

...a/couchbase/repository/query/ReactiveCouchbaseRepositoryQueryCollectionIntegrationTests.java

Re-order author tags correctly Remove excessive final modifiers Signed-off-by: Emilien Bevierre <emilien.bevierre@couchbase.com>

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

onobc

Nice work @emilienbev - looks good to me. I have a comment around logging and using String#formatted but you can do what you want w/ that one.

The only other comment I have was mentioned by Mark - we typically don't add final to anything other immutable fields that are set in the constructor.

onobc · 2026-02-23T19:52:43Z

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

-			throw new CouchbaseException(TemplateUtils.SELECT_ID + " was null. Either use #{#n1ql.selectEntity} or project "
-					+ TemplateUtils.SELECT_ID);
+			throw new CouchbaseException(
+					TemplateUtils.SELECT_ID + " was null. Either use #{#n1ql.selectEntity} or project "


I have found String#formatted to help w/ the readability of logging statements like this.

emilienbev added 2 commits February 19, 2026 12:46

Remove unnecessary intermediate String deserialization of document in…

9fa03a7

… favour of the raw bytes Signed-off-by: Emilien Bevierre <emilien.bevierre@couchbase.com>

Fix intermittent test failure where deleteById(id).block() is called …

8885c00

…immediately after subscribe(), before the document has potentially been saved. Signed-off-by: Emilien Bevierre <emilien.bevierre@couchbase.com>

spring-projects-issues added the status: waiting-for-triage An issue we've not yet triaged label Feb 19, 2026

emilienbev requested a review from Copilot February 19, 2026 16:47

Copilot started reviewing on behalf of emilienbev February 19, 2026 16:47 View session

Copilot AI reviewed Feb 19, 2026

View reviewed changes

emilienbev and others added 2 commits February 19, 2026 16:55

Fix typo expiryTIme

33354ce

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Emilien Bevierre <44171454+emilienbev@users.noreply.github.com>

emilienbev assigned onobc Feb 19, 2026

mp911de reviewed Feb 20, 2026

View reviewed changes

onobc reviewed Feb 22, 2026

View reviewed changes

src/main/java/org/springframework/data/couchbase/core/AbstractTemplateSupport.java Outdated Show resolved Hide resolved

...a/couchbase/repository/query/ReactiveCouchbaseRepositoryQueryCollectionIntegrationTests.java Show resolved Hide resolved

emilienbev added 2 commits February 23, 2026 12:39

Add ByteUtils utility static class for byte array/string conversions

a7d84f1

Re-order author tags correctly Remove excessive final modifiers Signed-off-by: Emilien Bevierre <emilien.bevierre@couchbase.com>

Remove decodeEntityBase logic duplication by using a shared function

a2a017a

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

onobc reviewed Feb 23, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Comments

Remove unnecessary intermediate String deserialization of document bodies#2122

Remove unnecessary intermediate String deserialization of document bodies#2122
emilienbev wants to merge 6 commits intomainfrom
UseRawBytes

emilienbev commented Feb 19, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mp911de Feb 20, 2026

Uh oh!

emilienbev Feb 23, 2026

Uh oh!

mp911de Feb 20, 2026

Uh oh!

onobc left a comment

Uh oh!

Uh oh!

Uh oh!

onobc left a comment

Uh oh!

onobc Feb 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Comments

Conversation

emilienbev commented Feb 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mp911de Feb 20, 2026

Choose a reason for hiding this comment

Uh oh!

emilienbev Feb 23, 2026

Choose a reason for hiding this comment

Uh oh!

mp911de Feb 20, 2026

Choose a reason for hiding this comment

Uh oh!

onobc left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

onobc left a comment

Choose a reason for hiding this comment

Uh oh!

onobc Feb 23, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

emilienbev commented Feb 19, 2026 •

edited

Loading