@@ -168,6 +168,7 @@ public ClusterEnvironment couchbaseClusterEnvironment() {
168
168
throw new CouchbaseException ("non-shadowed Jackson not present" );
169
169
}
170
170
builder .jsonSerializer (JacksonJsonSerializer .create (couchbaseObjectMapper ()));
171
+ // todo gp only suitable for tests
171
172
TransactionsConfig .cleanupConfig (TransactionsCleanupConfig .cleanupLostAttempts (false ));
172
173
builder .transactionsConfig (transactionsConfig ());
173
174
configureEnvironment (builder );
@@ -185,15 +186,15 @@ protected void configureEnvironment(final ClusterEnvironment.Builder builder) {
185
186
186
187
@ Bean (name = BeanNames .COUCHBASE_TEMPLATE )
187
188
public CouchbaseTemplate couchbaseTemplate (CouchbaseClientFactory couchbaseClientFactory ,
188
- ReactiveCouchbaseClientFactory reactiveCouchbaseClientFactory ,
189
- MappingCouchbaseConverter mappingCouchbaseConverter , TranslationService couchbaseTranslationService ) {
189
+ ReactiveCouchbaseClientFactory reactiveCouchbaseClientFactory ,
190
+ MappingCouchbaseConverter mappingCouchbaseConverter , TranslationService couchbaseTranslationService ) {
190
191
return new CouchbaseTemplate (couchbaseClientFactory , reactiveCouchbaseClientFactory , mappingCouchbaseConverter ,
191
192
couchbaseTranslationService , getDefaultConsistency ());
192
193
}
193
194
194
195
public CouchbaseTemplate couchbaseTemplate (CouchbaseClientFactory couchbaseClientFactory ,
195
- ReactiveCouchbaseClientFactory reactiveCouchbaseClientFactory ,
196
- MappingCouchbaseConverter mappingCouchbaseConverter ) {
196
+ ReactiveCouchbaseClientFactory reactiveCouchbaseClientFactory ,
197
+ MappingCouchbaseConverter mappingCouchbaseConverter ) {
197
198
return couchbaseTemplate (couchbaseClientFactory , reactiveCouchbaseClientFactory , mappingCouchbaseConverter ,
198
199
new JacksonTranslationService ());
199
200
}
@@ -291,7 +292,7 @@ public String typeKey() {
291
292
*/
292
293
@ Bean
293
294
public MappingCouchbaseConverter mappingCouchbaseConverter (CouchbaseMappingContext couchbaseMappingContext ,
294
- CouchbaseCustomConversions couchbaseCustomConversions ) {
295
+ CouchbaseCustomConversions couchbaseCustomConversions ) {
295
296
MappingCouchbaseConverter converter = new MappingCouchbaseConverter (couchbaseMappingContext , typeKey ());
296
297
converter .setCustomConversions (couchbaseCustomConversions );
297
298
return converter ;
@@ -346,12 +347,6 @@ public ObjectMapper couchbaseObjectMapper() {
346
347
347
348
/***** ALL THIS TX SHOULD BE MOVED OUT INTO THE IMPL OF AbstractCouchbaseConfiguration *****/
348
349
349
- // todo gp how to DI this into the Cluster creation esp. as it creates a CoreTransactionConfig
350
- // @Bean
351
- // public TransactionsConfig transactionConfig() {
352
- // return TransactionsConfig.builder().build();
353
- // }
354
-
355
350
@ Bean (BeanNames .REACTIVE_COUCHBASE_TRANSACTION_MANAGER )
356
351
ReactiveCouchbaseTransactionManager reactiveTransactionManager (
357
352
ReactiveCouchbaseClientFactory reactiveCouchbaseClientFactory ) {
@@ -377,11 +372,13 @@ CouchbaseTransactionManager transactionManager(CouchbaseClientFactory clientFact
377
372
return new CouchbaseTransactionManager (clientFactory , options );
378
373
}
379
374
375
+ // todo gpx these would be per-transactions options so it seems odd to have a global bean? Surely would want to configure everything at global level instead?
380
376
@ Bean
381
377
public TransactionOptions transactionsOptions (){
382
378
return TransactionOptions .transactionOptions ();
383
379
}
384
380
381
+ // todo gpx transactions config is now done in standard ClusterConfig - so I think we don't want a separate bean?
385
382
public TransactionsConfig .Builder transactionsConfig (){
386
383
return TransactionsConfig .builder ().durabilityLevel (DurabilityLevel .NONE ).timeout (Duration .ofMinutes (20 ));// for testing
387
384
}
0 commit comments