From 4b0ef67e8e8e61a1bbe91e1f0749fbcf98f1a5ab Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 26 Jan 2021 17:59:57 -0800 Subject: [PATCH] Update code for Spring Data 2021.0.0-M3 See gh-25004 --- .../CouchbaseClientFactoryDependentConfiguration.java | 10 ++++++++++ .../data/couchbase/CouchbaseDataConfiguration.java | 1 - 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseClientFactoryDependentConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseClientFactoryDependentConfiguration.java index f83d909469..bee8992bca 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseClientFactoryDependentConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseClientFactoryDependentConfiguration.java @@ -24,6 +24,8 @@ import org.springframework.data.couchbase.CouchbaseClientFactory; import org.springframework.data.couchbase.config.BeanNames; import org.springframework.data.couchbase.core.CouchbaseTemplate; import org.springframework.data.couchbase.core.convert.MappingCouchbaseConverter; +import org.springframework.data.couchbase.core.index.CouchbasePersistentEntityIndexCreator; +import org.springframework.data.couchbase.core.mapping.CouchbaseMappingContext; import org.springframework.data.couchbase.repository.config.RepositoryOperationsMapping; /** @@ -49,4 +51,12 @@ class CouchbaseClientFactoryDependentConfiguration { return new RepositoryOperationsMapping(couchbaseTemplate); } + @Bean + @ConditionalOnMissingBean + CouchbasePersistentEntityIndexCreator couchbasePersistentEntityIndexCreator(CouchbaseDataProperties properties, + CouchbaseMappingContext couchbaseMappingContext, CouchbaseClientFactory clientFactory) { + return new CouchbasePersistentEntityIndexCreator(couchbaseMappingContext, clientFactory, + properties.getTypeKey(), properties.isAutoIndex()); + } + } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataConfiguration.java index d747615b90..bb3677d268 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataConfiguration.java @@ -72,7 +72,6 @@ class CouchbaseDataConfiguration { mappingContext .setFieldNamingStrategy((FieldNamingStrategy) BeanUtils.instantiateClass(fieldNamingStrategy)); } - mappingContext.setAutoIndexCreation(properties.isAutoIndex()); return mappingContext; }