Spring/spring-data-examples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#325 - Upgrade to Spring Boot 2.0 M7.

Browse Source 
Tweak bom to reflect Spring Framework and Spring Data versions.

Remove reactive Couchbase configuration code required prior to Spring Boot 2.0 M7.

Tweak CORS examples to adapt to Spring Framework's disabled allowCredentials by default.
This commit is contained in:
Mark Paluch
2017-11-30 14:15:09 -08:00
parent 3d19c67d0a
commit 674c4e904c
4 changed files with 11 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
couchbase/reactive/src/main/java/example/springdata/couchbase/CouchbaseConfiguration.java
View File

@@ -24,13 +24,9 @@ import javax.annotation.PostConstruct;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.data.couchbase.CouchbaseRepositoriesAutoConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.data.couchbase.config.AbstractReactiveCouchbaseDataConfiguration;
import org.springframework.data.couchbase.config.BeanNames;
import org.springframework.data.couchbase.config.CouchbaseConfigurer;
import org.springframework.data.couchbase.core.CouchbaseOperations;
import org.springframework.data.couchbase.repository.config.EnableReactiveCouchbaseRepositories;
import org.springframework.data.couchbase.repository.support.IndexManager;
import com.couchbase.client.java.query.N1qlQuery;
@@ -40,19 +36,12 @@ import com.couchbase.client.java.query.N1qlQuery;
*
* @author Mark Paluch
*/
@SpringBootApplication(exclude = CouchbaseRepositoriesAutoConfiguration.class) // see DATACOUCH-350
@SpringBootApplication
@RequiredArgsConstructor
@EnableReactiveCouchbaseRepositories
public class CouchbaseConfiguration extends AbstractReactiveCouchbaseDataConfiguration {
public class CouchbaseConfiguration {
private final CouchbaseConfigurer couchbaseConfigurer;
private final ObjectProvider<CouchbaseOperations> couchbaseOperationsProvider;
@Override
protected CouchbaseConfigurer couchbaseConfigurer() {
return couchbaseConfigurer;
}
/**
* Create an {@link IndexManager} that allows index creation.
*