Start building against Spring Data Kay snapshots

See gh-7461

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/CassandraHealthIndicator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,7 +48,8 @@ public class CassandraHealthIndicator extends AbstractHealthIndicator {
 		try {
 			Select select = QueryBuilder.select("release_version").from("system",
 					"local");
-			ResultSet results = this.cassandraOperations.query(select);
+			ResultSet results = this.cassandraOperations.getCqlOperations()
+					.queryForResultSet(select);
 			if (results.isExhausted()) {
 				builder.up();
 				return;

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/MongoHealthIndicator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.boot.actuate.health;
 
-import com.mongodb.CommandResult;
+import org.bson.Document;
 
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.util.Assert;
@@ -39,7 +39,7 @@ public class MongoHealthIndicator extends AbstractHealthIndicator {
 
 	@Override
 	protected void doHealthCheck(Health.Builder builder) throws Exception {
-		CommandResult result = this.mongoTemplate.executeCommand("{ buildInfo: 1 }");
+		Document result = this.mongoTemplate.executeCommand("{ buildInfo: 1 }");
 		builder.up().withDetail("version", result.getString("version"));
 	}
 

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/MongoHealthIndicatorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 
 package org.springframework.boot.actuate.health;
 
-import com.mongodb.CommandResult;
 import com.mongodb.MongoException;
+import org.bson.Document;
 import org.junit.After;
 import org.junit.Test;
 
@@ -65,7 +65,7 @@ public class MongoHealthIndicatorTests {
 
 	@Test
 	public void mongoIsUp() throws Exception {
-		CommandResult commandResult = mock(CommandResult.class);
+		Document commandResult = mock(Document.class);
 		given(commandResult.getString("version")).willReturn("2.6.4");
 		MongoTemplate mongoTemplate = mock(MongoTemplate.class);
 		given(mongoTemplate.executeCommand("{ buildInfo: 1 }")).willReturn(commandResult);

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@ import java.util.Collections;
 import com.mongodb.DB;
 import com.mongodb.Mongo;
 import com.mongodb.MongoClient;
+import com.mongodb.client.MongoDatabase;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.BeanFactory;
@@ -161,7 +162,7 @@ public class MongoDataAutoConfiguration {
 		}
 
 		@Override
-		public DB getDb() throws DataAccessException {
+		public MongoDatabase getDb() throws DataAccessException {
 			String gridFsDatabase = this.properties.getGridFsDatabase();
 			if (StringUtils.hasText(gridFsDatabase)) {
 				return this.mongoDbFactory.getDb(gridFsDatabase);
@@ -170,7 +171,7 @@ public class MongoDataAutoConfiguration {
 		}
 
 		@Override
-		public DB getDb(String dbName) throws DataAccessException {
+		public MongoDatabase getDb(String dbName) throws DataAccessException {
 			return this.mongoDbFactory.getDb(dbName);
 		}
 
@@ -179,6 +180,11 @@ public class MongoDataAutoConfiguration {
 			return this.mongoDbFactory.getExceptionTranslator();
 		}
 
+		@Override
+		public DB getLegacyDb() {
+			return this.mongoDbFactory.getLegacyDb();
+		}
+
 	}
 
 }

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java

@@ -19,11 +19,11 @@ package org.springframework.boot.autoconfigure.mongo.embedded;
 import java.io.File;
 import java.net.UnknownHostException;
 
-import com.mongodb.CommandResult;
 import com.mongodb.MongoClient;
 import de.flapdoodle.embed.mongo.config.IMongodConfig;
 import de.flapdoodle.embed.mongo.config.Storage;
 import de.flapdoodle.embed.mongo.distribution.Feature;
+import org.bson.Document;
 import org.junit.After;
 import org.junit.Test;
 
@@ -82,8 +82,8 @@ public class EmbeddedMongoAutoConfigurationTests {
 		load();
 		assertThat(this.context.getBeansOfType(MongoClient.class)).hasSize(1);
 		MongoClient client = this.context.getBean(MongoClient.class);
-		Integer mongoPort = Integer.valueOf(
+		Integer mongoPort = Integer
-				this.context.getEnvironment().getProperty("local.mongo.port"));
+				.valueOf(this.context.getEnvironment().getProperty("local.mongo.port"));
 		assertThat(client.getAddress().getPort()).isEqualTo(mongoPort);
 	}
 
@@ -92,8 +92,8 @@ public class EmbeddedMongoAutoConfigurationTests {
 		load("spring.data.mongodb.port=0");
 		assertThat(this.context.getBeansOfType(MongoClient.class)).hasSize(1);
 		MongoClient client = this.context.getBean(MongoClient.class);
-		Integer mongoPort = Integer.valueOf(
+		Integer mongoPort = Integer
-				this.context.getEnvironment().getProperty("local.mongo.port"));
+				.valueOf(this.context.getEnvironment().getProperty("local.mongo.port"));
 		assertThat(client.getAddress().getPort()).isEqualTo(mongoPort);
 	}
 
@@ -101,8 +101,8 @@ public class EmbeddedMongoAutoConfigurationTests {
 	public void randomlyAllocatedPortIsAvailableWhenCreatingMongoClient() {
 		load(MongoClientConfiguration.class);
 		MongoClient client = this.context.getBean(MongoClient.class);
-		Integer mongoPort = Integer.valueOf(
+		Integer mongoPort = Integer
-				this.context.getEnvironment().getProperty("local.mongo.port"));
+				.valueOf(this.context.getEnvironment().getProperty("local.mongo.port"));
 		assertThat(client.getAddress().getPort()).isEqualTo(mongoPort);
 	}
 
@@ -172,7 +172,7 @@ public class EmbeddedMongoAutoConfigurationTests {
 				MongoDataAutoConfiguration.class, EmbeddedMongoAutoConfiguration.class);
 		this.context.refresh();
 		MongoTemplate mongo = this.context.getBean(MongoTemplate.class);
-		CommandResult buildInfo = mongo.executeCommand("{ buildInfo: 1 }");
+		Document buildInfo = mongo.executeCommand("{ buildInfo: 1 }");
 
 		assertThat(buildInfo.getString("version")).isEqualTo(expectedVersion);
 	}
@@ -187,8 +187,7 @@ public class EmbeddedMongoAutoConfigurationTests {
 			ctx.register(config);
 		}
 		EnvironmentTestUtils.addEnvironment(ctx, environment);
-		ctx.register(EmbeddedMongoAutoConfiguration.class,
+		ctx.register(EmbeddedMongoAutoConfiguration.class, MongoAutoConfiguration.class,
-				MongoAutoConfiguration.class,
 				PropertyPlaceholderAutoConfiguration.class);
 		ctx.refresh();
 		this.context = ctx;

spring-boot-dependencies/pom.xml

@@ -132,6 +132,7 @@
 		<mariadb.version>1.5.6</mariadb.version>
 		<mssql-jdbc.version>6.1.0.jre8</mssql-jdbc.version>
 		<mockito.version>2.5.4</mockito.version>
+		<mongo-driver-reactivestreams.version>1.2.0</mongo-driver-reactivestreams.version>
 		<mongodb.version>3.4.1</mongodb.version>
 		<mysql.version>5.1.40</mysql.version>
 		<narayana.version>5.5.0.Final</narayana.version>
@@ -153,7 +154,7 @@
 		<spring-amqp.version>2.0.0.BUILD-SNAPSHOT</spring-amqp.version>
 		<spring-cloud-connectors.version>1.2.3.RELEASE</spring-cloud-connectors.version>
 		<spring-batch.version>4.0.0.BUILD-SNAPSHOT</spring-batch.version>
-		<spring-data-releasetrain.version>Ingalls-BUILD-SNAPSHOT</spring-data-releasetrain.version>
+		<spring-data-releasetrain.version>Kay-BUILD-SNAPSHOT</spring-data-releasetrain.version>
 		<spring-hateoas.version>0.23.0.RELEASE</spring-hateoas.version>
 		<spring-integration.version>5.0.0.M2</spring-integration.version>
 		<spring-kafka.version>1.1.2.RELEASE</spring-kafka.version>
@@ -1764,6 +1765,11 @@
 				<artifactId>mongodb-driver-core</artifactId>
 				<version>${mongodb.version}</version>
 			</dependency>
+			<dependency>
+		 		<groupId>org.mongodb</groupId>
+				<artifactId>mongodb-driver-reactivestreams</artifactId>
+				<version>${mongo-driver-reactivestreams.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.mongodb</groupId>
 				<artifactId>mongo-java-driver</artifactId>