root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Revert "Update code for Spring Data 2021.0.0-M3" 

This reverts commit 4b0ef67e8e.

See gh-25004
This commit is contained in:
Andy Wilkinson 2021-02-18 09:23:14 +00:00
parent 38610a6cae
commit 06e36b6bbe
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseClientFactoryDependentConfiguration.java
View File

@ -24,8 +24,6 @@ import org.springframework.data.couchbase.CouchbaseClientFactory;
import org.springframework.data.couchbase.config.BeanNames; import org.springframework.data.couchbase.config.BeanNames;
import org.springframework.data.couchbase.core.CouchbaseTemplate; import org.springframework.data.couchbase.core.CouchbaseTemplate;
import org.springframework.data.couchbase.core.convert.MappingCouchbaseConverter; 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; import org.springframework.data.couchbase.repository.config.RepositoryOperationsMapping;
/** /**
@ -51,12 +49,4 @@ class CouchbaseClientFactoryDependentConfiguration {
return new RepositoryOperationsMapping(couchbaseTemplate); return new RepositoryOperationsMapping(couchbaseTemplate);
} }
@Bean
@ConditionalOnMissingBean
CouchbasePersistentEntityIndexCreator couchbasePersistentEntityIndexCreator(CouchbaseDataProperties properties,
CouchbaseMappingContext couchbaseMappingContext, CouchbaseClientFactory clientFactory) {
return new CouchbasePersistentEntityIndexCreator(couchbaseMappingContext, clientFactory,
properties.getTypeKey(), properties.isAutoIndex());
}
} }

1
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataConfiguration.java
View File

@ -72,6 +72,7 @@ class CouchbaseDataConfiguration {
mappingContext mappingContext
.setFieldNamingStrategy((FieldNamingStrategy) BeanUtils.instantiateClass(fieldNamingStrategy)); .setFieldNamingStrategy((FieldNamingStrategy) BeanUtils.instantiateClass(fieldNamingStrategy));
} }
mappingContext.setAutoIndexCreation(properties.isAutoIndex());
return mappingContext; return mappingContext;
} }