Skip to content

Commit 622938b

Browse files
committed
updates mongodb driver
1 parent 112d0ce commit 622938b

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

mongodb-driver/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<description>The Eclipse JNoSQL communication layer, Diana, implementation to MongoDB</description>
2828

2929
<properties>
30-
<monbodb.driver>3.12.4</monbodb.driver>
30+
<monbodb.driver>4.0.3</monbodb.driver>
3131
</properties>
3232
<dependencies>
3333
<dependency>
@@ -42,7 +42,7 @@
4242
</dependency>
4343
<dependency>
4444
<groupId>org.mongodb</groupId>
45-
<artifactId>mongo-java-driver</artifactId>
45+
<artifactId>mongodb-driver-sync</artifactId>
4646
<version>${monbodb.driver}</version>
4747
</dependency>
4848
</dependencies>

mongodb-driver/src/main/java/org/eclipse/jnosql/diana/mongodb/document/MongoDBDocumentCollectionManagerFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
package org.eclipse.jnosql.diana.mongodb.document;
1717

18-
import com.mongodb.MongoClient;
18+
import com.mongodb.client.MongoClient;
1919
import jakarta.nosql.document.DocumentCollectionManagerFactory;
2020

2121
/**

mongodb-driver/src/main/java/org/eclipse/jnosql/diana/mongodb/document/MongoDBDocumentConfiguration.java

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@
1414
*/
1515
package org.eclipse.jnosql.diana.mongodb.document;
1616

17-
import com.mongodb.MongoClient;
18-
import com.mongodb.MongoClientOptions;
17+
import com.mongodb.MongoClientSettings;
1918
import com.mongodb.MongoCredential;
2019
import com.mongodb.ServerAddress;
20+
import com.mongodb.client.MongoClient;
21+
import com.mongodb.client.MongoClients;
2122
import jakarta.nosql.Configurations;
2223
import jakarta.nosql.Settings;
2324
import jakarta.nosql.Settings.SettingsBuilder;
@@ -93,14 +94,18 @@ public MongoDBDocumentCollectionManagerFactory get(Settings settings) throws Nul
9394
.map(HostPortConfiguration::toServerAddress)
9495
.collect(Collectors.toList());
9596
if (servers.isEmpty()) {
96-
return new MongoDBDocumentCollectionManagerFactory(new MongoClient());
97+
return new MongoDBDocumentCollectionManagerFactory(MongoClients.create());
9798
}
9899

99100
Optional<MongoCredential> credential = MongoAuthentication.of(settings);
100-
MongoClient mongoClient = credential.map(c -> new MongoClient(servers, c, MongoClientOptions.builder().build()))
101-
.orElseGet(() -> new MongoClient(servers));
102101

103-
return new MongoDBDocumentCollectionManagerFactory(mongoClient);
102+
103+
final MongoClientSettings mongoClientSettings = credential.map(c -> MongoClientSettings.builder().credential(c)
104+
.applyToClusterSettings(builder -> builder.hosts(servers))).orElseGet(() ->
105+
MongoClientSettings.builder()
106+
.applyToClusterSettings(builder -> builder.hosts(servers))).build();
107+
108+
return new MongoDBDocumentCollectionManagerFactory(MongoClients.create(mongoClientSettings));
104109
}
105110

106111
public MongoDBDocumentCollectionManagerFactory get(String pathFileConfig) throws NullPointerException {

0 commit comments

Comments
 (0)