root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request #28124 from radoslawdabrowski

Browse Source 
* pr/28124:
  Polish "Stop considering persistent when scanning for Couchbase entities"
  Stop considering persistent when scanning for Couchbase entities

Closes gh-28124
pull/28162/head
Stephane Nicoll 3 years ago
parent 1b7536fda4 14fc0f78b2
commit 86a4425162
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File

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

@ -24,7 +24,6 @@ import org.springframework.boot.autoconfigure.domain.EntityScanner;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.data.annotation.Persistent;
import org.springframework.data.couchbase.config.BeanNames; import org.springframework.data.couchbase.config.BeanNames;
import org.springframework.data.couchbase.core.convert.CouchbaseCustomConversions; import org.springframework.data.couchbase.core.convert.CouchbaseCustomConversions;
import org.springframework.data.couchbase.core.convert.MappingCouchbaseConverter; import org.springframework.data.couchbase.core.convert.MappingCouchbaseConverter;
@ -64,8 +63,7 @@ class CouchbaseDataConfiguration {
ApplicationContext applicationContext, CouchbaseCustomConversions couchbaseCustomConversions) ApplicationContext applicationContext, CouchbaseCustomConversions couchbaseCustomConversions)
throws Exception { throws Exception {
CouchbaseMappingContext mappingContext = new CouchbaseMappingContext(); CouchbaseMappingContext mappingContext = new CouchbaseMappingContext();
mappingContext mappingContext.setInitialEntitySet(new EntityScanner(applicationContext).scan(Document.class));
.setInitialEntitySet(new EntityScanner(applicationContext).scan(Document.class, Persistent.class));
mappingContext.setSimpleTypeHolder(couchbaseCustomConversions.getSimpleTypeHolder()); mappingContext.setSimpleTypeHolder(couchbaseCustomConversions.getSimpleTypeHolder());
Class<?> fieldNamingStrategy = properties.getFieldNamingStrategy(); Class<?> fieldNamingStrategy = properties.getFieldNamingStrategy();
if (fieldNamingStrategy != null) { if (fieldNamingStrategy != null) {

Write Preview
Loading…
Cancel
Save