Skip to content

Commit 42da7af

Browse files
committed
Stop manually encoding UUIDs
1 parent 71bab54 commit 42da7af

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

driver-core/src/main/com/mongodb/client/model/search/SearchOperator.java

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,8 @@
2121
import com.mongodb.client.model.Aggregates;
2222
import com.mongodb.client.model.geojson.Point;
2323

24-
import java.util.ArrayList;
25-
import java.util.List;
2624
import java.util.UUID;
2725

28-
import org.bson.BsonBinary;
2926
import org.bson.BsonType;
3027
import org.bson.Document;
3128
import org.bson.conversions.Bson;
@@ -367,14 +364,7 @@ static InSearchOperator in(final FieldSearchPath path, final Instant value, fina
367364
* @mongodb.atlas.manual atlas-search/in/ in operator
368365
*/
369366
static InSearchOperator in(final FieldSearchPath path, final UUID value, final UUID... values) {
370-
List<BsonBinary> bsonValues = new ArrayList<>();
371-
bsonValues.add(new BsonBinary(value));
372-
if (values != null) {
373-
for (UUID uuid : values) {
374-
bsonValues.add(new BsonBinary(uuid));
375-
}
376-
}
377-
return in(notNull("path", path), notNull("value", bsonValues));
367+
return in(notNull("path", path), concat(notNull("value", value), values));
378368
}
379369

380370
/**

driver-core/src/test/unit/com/mongodb/client/model/search/SearchOperatorTest.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232
import org.bson.BsonObjectId;
3333
import org.bson.BsonString;
3434
import org.bson.Document;
35+
import org.bson.UuidRepresentation;
36+
import org.bson.codecs.configuration.CodecRegistries;
37+
import org.bson.conversions.Bson;
3538
import org.bson.types.ObjectId;
3639
import org.junit.jupiter.api.Test;
3740

@@ -663,7 +666,9 @@ void in() {
663666
.append("value", new BsonBinary(uuid))
664667
),
665668
SearchOperator.in(fieldPath("fieldName1"), uuid)
666-
.toBsonDocument()
669+
.toBsonDocument(
670+
Document.class,
671+
CodecRegistries.withUuidRepresentation(Bson.DEFAULT_CODEC_REGISTRY, UuidRepresentation.STANDARD))
667672
),
668673
() -> assertEquals(
669674
new BsonDocument("in",

0 commit comments

Comments
 (0)