Commit 17ecf18a authored by Andy Wilkinson's avatar Andy Wilkinson

Upgrade to MongoDB 4.2.2

Closes gh-25675
parent 2e796f04
...@@ -25,7 +25,6 @@ import com.mongodb.connection.AsynchronousSocketChannelStreamFactoryFactory; ...@@ -25,7 +25,6 @@ import com.mongodb.connection.AsynchronousSocketChannelStreamFactoryFactory;
import com.mongodb.connection.StreamFactory; import com.mongodb.connection.StreamFactory;
import com.mongodb.connection.StreamFactoryFactory; import com.mongodb.connection.StreamFactoryFactory;
import com.mongodb.connection.netty.NettyStreamFactoryFactory; import com.mongodb.connection.netty.NettyStreamFactoryFactory;
import com.mongodb.internal.async.client.AsyncMongoClient;
import com.mongodb.reactivestreams.client.MongoClient; import com.mongodb.reactivestreams.client.MongoClient;
import io.netty.channel.EventLoopGroup; import io.netty.channel.EventLoopGroup;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
...@@ -113,8 +112,7 @@ class MongoReactiveAutoConfigurationTests { ...@@ -113,8 +112,7 @@ class MongoReactiveAutoConfigurationTests {
private MongoClientSettings getSettings(ApplicationContext context) { private MongoClientSettings getSettings(ApplicationContext context) {
MongoClient client = context.getBean(MongoClient.class); MongoClient client = context.getBean(MongoClient.class);
AsyncMongoClient wrappedClient = (AsyncMongoClient) ReflectionTestUtils.getField(client, "wrapped"); return (MongoClientSettings) ReflectionTestUtils.getField(client, "settings");
return (MongoClientSettings) ReflectionTestUtils.getField(wrappedClient, "settings");
} }
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
......
...@@ -19,7 +19,6 @@ package org.springframework.boot.autoconfigure.mongo; ...@@ -19,7 +19,6 @@ package org.springframework.boot.autoconfigure.mongo;
import java.util.List; import java.util.List;
import com.mongodb.MongoClientSettings; import com.mongodb.MongoClientSettings;
import com.mongodb.internal.async.client.AsyncMongoClient;
import com.mongodb.reactivestreams.client.MongoClient; import com.mongodb.reactivestreams.client.MongoClient;
import org.springframework.test.util.ReflectionTestUtils; import org.springframework.test.util.ReflectionTestUtils;
...@@ -41,8 +40,7 @@ class ReactiveMongoClientFactoryTests extends MongoClientFactorySupportTests<Mon ...@@ -41,8 +40,7 @@ class ReactiveMongoClientFactoryTests extends MongoClientFactorySupportTests<Mon
@Override @Override
protected MongoClientSettings getClientSettings(MongoClient client) { protected MongoClientSettings getClientSettings(MongoClient client) {
AsyncMongoClient wrapped = (AsyncMongoClient) ReflectionTestUtils.getField(client, "wrapped"); return (MongoClientSettings) ReflectionTestUtils.getField(client, "settings");
return (MongoClientSettings) ReflectionTestUtils.getField(wrapped, "settings");
} }
} }
...@@ -1206,7 +1206,7 @@ bom { ...@@ -1206,7 +1206,7 @@ bom {
] ]
} }
} }
library("MongoDB", "4.2.0-beta1") { library("MongoDB", "4.2.2") {
group("org.mongodb") { group("org.mongodb") {
modules = [ modules = [
"bson", "bson",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment