Skip to content

Commit 803ed1b

Browse files
committed
Apply uuid representation from MongoClientURI to MongoClientOptions
JAVA-3688
1 parent 7d35c2c commit 803ed1b

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

driver-legacy/src/main/com/mongodb/MongoClientURI.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package com.mongodb;
1818

1919
import com.mongodb.lang.Nullable;
20+
import org.bson.UuidRepresentation;
2021

2122
import java.util.List;
2223

@@ -407,6 +408,10 @@ public MongoClientOptions getOptions() {
407408
if (!proxied.getCompressorList().isEmpty()) {
408409
builder.compressorList(proxied.getCompressorList());
409410
}
411+
UuidRepresentation uuidRepresentation = proxied.getUuidRepresentation();
412+
if (uuidRepresentation != null) {
413+
builder.uuidRepresentation(uuidRepresentation);
414+
}
410415
return builder.build();
411416
}
412417

driver-legacy/src/test/unit/com/mongodb/MongoClientURISpecification.groovy

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.mongodb
1818

19+
import org.bson.UuidRepresentation
1920
import spock.lang.Specification
2021
import spock.lang.Unroll
2122

@@ -137,6 +138,7 @@ class MongoClientURISpecification extends Specification {
137138
+ 'heartbeatFrequencyMS=20000&'
138139
+ 'retryWrites=true&'
139140
+ 'retryReads=true&'
141+
+ 'uuidRepresentation=csharpLegacy&'
140142
+ 'appName=app1')
141143

142144
when:
@@ -160,6 +162,7 @@ class MongoClientURISpecification extends Specification {
160162
options.getHeartbeatFrequency() == 20000
161163
options.getRetryWrites()
162164
options.getRetryReads()
165+
options.getUuidRepresentation() == UuidRepresentation.C_SHARP_LEGACY
163166
options.getApplicationName() == 'app1'
164167
}
165168

@@ -177,6 +180,7 @@ class MongoClientURISpecification extends Specification {
177180
!options.isSslEnabled()
178181
options.getRetryWrites()
179182
options.getRetryReads()
183+
options.getUuidRepresentation() == UuidRepresentation.UNSPECIFIED
180184
}
181185

182186
def 'should apply default uri to options'() {
@@ -205,6 +209,7 @@ class MongoClientURISpecification extends Specification {
205209
.localThreshold(25)
206210
.requiredReplicaSetName('test')
207211
.compressorList([MongoCompressor.createZlibCompressor()])
212+
.uuidRepresentation(UuidRepresentation.C_SHARP_LEGACY)
208213

209214
when:
210215
def options = new MongoClientURI('mongodb://localhost', optionsBuilder).getOptions()
@@ -234,6 +239,7 @@ class MongoClientURISpecification extends Specification {
234239
options.getServerSettings().getHeartbeatFrequency(MILLISECONDS) == 5
235240
options.getServerSettings().getMinHeartbeatFrequency(MILLISECONDS) == 11
236241
options.compressorList == [MongoCompressor.createZlibCompressor()]
242+
options.getUuidRepresentation() == UuidRepresentation.C_SHARP_LEGACY
237243
}
238244

239245
@Unroll

0 commit comments

Comments
 (0)