Skip to content

Commit 2346e5b

Browse files
jyeminjyemin
committed
Extract common CommandMarker code to helper class
1 parent ca4a49a commit 2346e5b

File tree

5 files changed

+29
-53
lines changed

5 files changed

+29
-53
lines changed

‎driver-async/src/main/com/mongodb/async/client/internal/CommandMarker.java

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,21 @@
1616

1717
package com.mongodb.async.client.internal;
1818

19-
import com.mongodb.Block;
20-
import com.mongodb.ConnectionString;
2119
import com.mongodb.MongoClientException;
22-
import com.mongodb.MongoClientSettings;
2320
import com.mongodb.MongoTimeoutException;
2421
import com.mongodb.ReadConcern;
2522
import com.mongodb.ReadPreference;
2623
import com.mongodb.async.SingleResultCallback;
2724
import com.mongodb.async.client.MongoClient;
2825
import com.mongodb.async.client.MongoClients;
29-
import com.mongodb.connection.ClusterSettings;
3026
import org.bson.RawBsonDocument;
3127

3228
import java.io.Closeable;
3329
import java.util.Map;
34-
import java.util.concurrent.TimeUnit;
3530

3631
import static com.mongodb.assertions.Assertions.notNull;
37-
import static com.mongodb.internal.capi.MongoCryptOptionsHelper.createMongocryptdSpawnArgs;
32+
import static com.mongodb.internal.capi.MongoCryptHelper.createMongocryptdClientSettings;
33+
import static com.mongodb.internal.capi.MongoCryptHelper.createMongocryptdSpawnArgs;
3834

3935
@SuppressWarnings("UseOfProcessBuilder")
4036
class CommandMarker implements Closeable {
@@ -54,24 +50,7 @@ class CommandMarker implements Closeable {
5450
} else {
5551
processBuilder = null;
5652
}
57-
58-
String connectionString;
59-
60-
if (options.containsKey("mongocryptdURI")) {
61-
connectionString = (String) options.get("mongocryptdURI");
62-
} else {
63-
connectionString = "mongodb://localhost:27020";
64-
}
65-
66-
client = MongoClients.create(MongoClientSettings.builder()
67-
.applyConnectionString(new ConnectionString(connectionString))
68-
.applyToClusterSettings(new Block<ClusterSettings.Builder>() {
69-
@Override
70-
public void apply(final ClusterSettings.Builder builder) {
71-
builder.serverSelectionTimeout(1, TimeUnit.SECONDS);
72-
}
73-
})
74-
.build());
53+
client = MongoClients.create(createMongocryptdClientSettings((String) options.get("mongocryptdURI")));
7554
}
7655

7756
void mark(final String databaseName, final RawBsonDocument command, final SingleResultCallback<RawBsonDocument> callback) {

‎driver-async/src/main/com/mongodb/async/client/internal/Crypts.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import javax.net.ssl.SSLContext;
2929
import java.security.NoSuchAlgorithmException;
3030

31-
import static com.mongodb.internal.capi.MongoCryptOptionsHelper.createMongoCryptOptions;
31+
import static com.mongodb.internal.capi.MongoCryptHelper.createMongoCryptOptions;
3232

3333
public final class Crypts {
3434

‎driver-core/src/main/com/mongodb/internal/capi/MongoCryptOptionsHelper.java renamed to ‎driver-core/src/main/com/mongodb/internal/capi/MongoCryptHelper.java

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@
1616

1717
package com.mongodb.internal.capi;
1818

19+
import com.mongodb.Block;
20+
import com.mongodb.ConnectionString;
1921
import com.mongodb.MongoClientException;
22+
import com.mongodb.MongoClientSettings;
23+
import com.mongodb.connection.ClusterSettings;
2024
import com.mongodb.crypt.capi.MongoAwsKmsProviderOptions;
2125
import com.mongodb.crypt.capi.MongoCryptOptions;
2226
import com.mongodb.crypt.capi.MongoLocalKmsProviderOptions;
@@ -26,8 +30,9 @@
2630
import java.util.ArrayList;
2731
import java.util.List;
2832
import java.util.Map;
33+
import java.util.concurrent.TimeUnit;
2934

30-
public final class MongoCryptOptionsHelper {
35+
public final class MongoCryptHelper {
3136

3237
public static MongoCryptOptions createMongoCryptOptions(final Map<String, Map<String, Object>> kmsProviders,
3338
final Map<String, BsonDocument> namespaceToLocalSchemaDocumentMap) {
@@ -75,6 +80,20 @@ public static List<String> createMongocryptdSpawnArgs(final Map<String, Object>
7580
return spawnArgs;
7681
}
7782

78-
private MongoCryptOptionsHelper(){
83+
public static MongoClientSettings createMongocryptdClientSettings(final String connectionString) {
84+
85+
return MongoClientSettings.builder()
86+
.applyConnectionString(new ConnectionString((connectionString != null)
87+
? connectionString : "mongodb://localhost:27020"))
88+
.applyToClusterSettings(new Block<ClusterSettings.Builder>() {
89+
@Override
90+
public void apply(final ClusterSettings.Builder builder) {
91+
builder.serverSelectionTimeout(1, TimeUnit.SECONDS);
92+
}
93+
})
94+
.build();
95+
}
96+
97+
private MongoCryptHelper() {
7998
}
8099
}

‎driver-sync/src/main/com/mongodb/client/internal/CommandMarker.java

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,22 @@
1616

1717
package com.mongodb.client.internal;
1818

19-
import com.mongodb.Block;
20-
import com.mongodb.ConnectionString;
2119
import com.mongodb.MongoClientException;
22-
import com.mongodb.MongoClientSettings;
2320
import com.mongodb.MongoException;
2421
import com.mongodb.MongoTimeoutException;
2522
import com.mongodb.ReadConcern;
2623
import com.mongodb.ReadPreference;
2724
import com.mongodb.client.MongoClient;
2825
import com.mongodb.client.MongoClients;
29-
import com.mongodb.connection.ClusterSettings;
3026
import org.bson.RawBsonDocument;
3127

3228
import java.io.Closeable;
3329
import java.io.IOException;
3430
import java.util.Map;
35-
import java.util.concurrent.TimeUnit;
3631

3732
import static com.mongodb.assertions.Assertions.notNull;
38-
import static com.mongodb.internal.capi.MongoCryptOptionsHelper.createMongocryptdSpawnArgs;
33+
import static com.mongodb.internal.capi.MongoCryptHelper.createMongocryptdClientSettings;
34+
import static com.mongodb.internal.capi.MongoCryptHelper.createMongocryptdSpawnArgs;
3935

4036
@SuppressWarnings("UseOfProcessBuilder")
4137
class CommandMarker implements Closeable {
@@ -55,25 +51,7 @@ class CommandMarker implements Closeable {
5551
} else {
5652
processBuilder = null;
5753
}
58-
59-
String connectionString;
60-
61-
if (options.containsKey("mongocryptdURI")) {
62-
connectionString = (String) options.get("mongocryptdURI");
63-
} else {
64-
connectionString = "mongodb://localhost:27020";
65-
}
66-
67-
client = MongoClients.create(MongoClientSettings.builder()
68-
.applyConnectionString(new ConnectionString(connectionString))
69-
.applyToClusterSettings(new Block<ClusterSettings.Builder>() {
70-
@Override
71-
public void apply(final ClusterSettings.Builder builder) {
72-
builder.serverSelectionTimeout(1, TimeUnit.SECONDS);
73-
}
74-
})
75-
.build());
76-
54+
client = MongoClients.create(createMongocryptdClientSettings((String) options.get("mongocryptdURI")));
7755
}
7856

7957
RawBsonDocument mark(final String databaseName, final RawBsonDocument command) {

‎driver-sync/src/main/com/mongodb/client/internal/Crypts.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import javax.net.ssl.SSLContext;
2828
import java.security.NoSuchAlgorithmException;
2929

30-
import static com.mongodb.internal.capi.MongoCryptOptionsHelper.createMongoCryptOptions;
30+
import static com.mongodb.internal.capi.MongoCryptHelper.createMongoCryptOptions;
3131

3232
public final class Crypts {
3333

0 commit comments

Comments
 (0)