diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/CassandraHealthIndicator.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/CassandraHealthIndicator.java index 6c35cedb225..b8da356c216 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/CassandraHealthIndicator.java +++ b/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; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/MongoHealthIndicator.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/MongoHealthIndicator.java index ed02a62f72b..21c79841b9e 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/MongoHealthIndicator.java +++ b/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")); } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/MongoHealthIndicatorTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/MongoHealthIndicatorTests.java index 4110b222d8d..0d78458896e 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/MongoHealthIndicatorTests.java +++ b/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); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfiguration.java index 465d391b517..09dce3d43ac 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfiguration.java +++ b/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(); + } + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java index f1a069d24b4..7c7aab69684 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java +++ b/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( - this.context.getEnvironment().getProperty("local.mongo.port")); + Integer mongoPort = Integer + .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( - this.context.getEnvironment().getProperty("local.mongo.port")); + Integer mongoPort = Integer + .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( - this.context.getEnvironment().getProperty("local.mongo.port")); + Integer mongoPort = Integer + .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, - MongoAutoConfiguration.class, + ctx.register(EmbeddedMongoAutoConfiguration.class, MongoAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); ctx.refresh(); this.context = ctx; diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index 2c36193eb2b..1930d88b60d 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -132,6 +132,7 @@ 1.5.6 6.1.0.jre8 2.5.4 + 1.2.0 3.4.1 5.1.40 5.5.0.Final @@ -153,7 +154,7 @@ 2.0.0.BUILD-SNAPSHOT 1.2.3.RELEASE 4.0.0.BUILD-SNAPSHOT - Ingalls-BUILD-SNAPSHOT + Kay-BUILD-SNAPSHOT 0.23.0.RELEASE 5.0.0.M2 1.1.2.RELEASE @@ -1764,6 +1765,11 @@ mongodb-driver-core ${mongodb.version} + + org.mongodb + mongodb-driver-reactivestreams + ${mongo-driver-reactivestreams.version} + org.mongodb mongo-java-driver