From 415d3395562500a716b7dba7b1dc5455bb58f6e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Rodr=C3=ADguez=20Mart=C3=ADn?= Date: Fri, 15 Jan 2021 19:29:14 +0100 Subject: [PATCH] Restore feature 'Inject translation service bean in CouchbaseTemplateSupport'. The feature was accidentally removed when DATACOUCH-550 was reverted. Closes #1140. --- .../config/AbstractCouchbaseConfiguration.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfiguration.java b/src/main/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfiguration.java index 421832b1..eee0a6de 100644 --- a/src/main/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfiguration.java +++ b/src/main/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfiguration.java @@ -70,6 +70,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; * @author Simon Baslé * @author Stephane Nicoll * @author Subhashni Balakrishnan + * @author Jorge Rodriguez Martin */ @Configuration public abstract class AbstractCouchbaseConfiguration { @@ -158,15 +159,27 @@ public abstract class AbstractCouchbaseConfiguration { } @Bean(name = BeanNames.COUCHBASE_TEMPLATE) + public CouchbaseTemplate couchbaseTemplate(CouchbaseClientFactory couchbaseClientFactory, + MappingCouchbaseConverter mappingCouchbaseConverter, TranslationService couchbaseTranslationService) { + return new CouchbaseTemplate(couchbaseClientFactory, mappingCouchbaseConverter, couchbaseTranslationService); + } + public CouchbaseTemplate couchbaseTemplate(CouchbaseClientFactory couchbaseClientFactory, MappingCouchbaseConverter mappingCouchbaseConverter) { - return new CouchbaseTemplate(couchbaseClientFactory, mappingCouchbaseConverter); + return couchbaseTemplate(couchbaseClientFactory, mappingCouchbaseConverter, new JacksonTranslationService()); } @Bean(name = BeanNames.REACTIVE_COUCHBASE_TEMPLATE) + public ReactiveCouchbaseTemplate reactiveCouchbaseTemplate(CouchbaseClientFactory couchbaseClientFactory, + MappingCouchbaseConverter mappingCouchbaseConverter, TranslationService couchbaseTranslationService) { + return new ReactiveCouchbaseTemplate(couchbaseClientFactory, mappingCouchbaseConverter, + couchbaseTranslationService); + } + public ReactiveCouchbaseTemplate reactiveCouchbaseTemplate(CouchbaseClientFactory couchbaseClientFactory, MappingCouchbaseConverter mappingCouchbaseConverter) { - return new ReactiveCouchbaseTemplate(couchbaseClientFactory, mappingCouchbaseConverter); + return reactiveCouchbaseTemplate(couchbaseClientFactory, mappingCouchbaseConverter, + new JacksonTranslationService()); } @Bean(name = BeanNames.COUCHBASE_OPERATIONS_MAPPING)