From 06e36b6bbe7a6c99b7428f6fcefbdc2f4200fd97 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 18 Feb 2021 09:23:14 +0000 Subject: [PATCH] Revert "Update code for Spring Data 2021.0.0-M3" This reverts commit 4b0ef67e8e8e61a1bbe91e1f0749fbcf98f1a5ab. See gh-25004 --- .../CouchbaseClientFactoryDependentConfiguration.java | 10 ---------- .../data/couchbase/CouchbaseDataConfiguration.java | 1 + 2 files changed, 1 insertion(+), 10 deletions(-) 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 4fb01cd6bab..a886437946e 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,8 +24,6 @@ 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; /** @@ -51,12 +49,4 @@ 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 344731eae34..b9f55e4f46f 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,6 +72,7 @@ class CouchbaseDataConfiguration { mappingContext .setFieldNamingStrategy((FieldNamingStrategy) BeanUtils.instantiateClass(fieldNamingStrategy)); } + mappingContext.setAutoIndexCreation(properties.isAutoIndex()); return mappingContext; }