Skip to content

ByteBufBsonDocument and RawBsonDocument simplifications #1902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rozza wants to merge 1 commit into
base: ByteBuf
Choose a base branch
from
Open

ByteBufBsonDocument and RawBsonDocument simplifications #1902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 41 additions & 12 deletions bson/src/main/org/bson/RawBsonDocument.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@
import java.io.StringWriter;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.Collection;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Set;
Expand Down Expand Up @@ -225,17 +229,42 @@ public int size() {

@Override
public Set<Entry<String, BsonValue>> entrySet() {
return toBaseBsonDocument().entrySet();
List<Entry<String, BsonValue>> entries = new ArrayList<>();
try (BsonBinaryReader bsonReader = createReader()) {
bsonReader.readStartDocument();
while (bsonReader.readBsonType() != BsonType.END_OF_DOCUMENT) {
String key = bsonReader.readName();
BsonValue value = RawBsonValueHelper.decode(bytes, bsonReader);
entries.add(new AbstractMap.SimpleImmutableEntry<>(key, value));
}
}
return new LinkedHashSet<>(entries);
}

@Override
public Collection<BsonValue> values() {
return toBaseBsonDocument().values();
List<BsonValue> values = new ArrayList<>();
try (BsonBinaryReader bsonReader = createReader()) {
bsonReader.readStartDocument();
while (bsonReader.readBsonType() != BsonType.END_OF_DOCUMENT) {
bsonReader.skipName();
values.add(RawBsonValueHelper.decode(bytes, bsonReader));
}
}
return new LinkedHashSet<>(values);
}

@Override
public Set<String> keySet() {
return toBaseBsonDocument().keySet();
List<String> keys = new ArrayList<>();
try (BsonBinaryReader bsonReader = createReader()) {
bsonReader.readStartDocument();
while (bsonReader.readBsonType() != BsonType.END_OF_DOCUMENT) {
keys.add(bsonReader.readName());
bsonReader.skipValue();
}
}
return new LinkedHashSet<>(keys);
}

@Override
Expand Down Expand Up @@ -318,12 +347,19 @@ public String toJson(final JsonWriterSettings settings) {

@Override
public boolean equals(final Object o) {
return toBaseBsonDocument().equals(o);
return toBsonDocument().equals(o);
}

@Override
public int hashCode() {
return toBaseBsonDocument().hashCode();
return toBsonDocument().hashCode();
}

@Override
public BsonDocument toBsonDocument() {
try (BsonBinaryReader bsonReader = createReader()) {
return new BsonDocumentCodec().decode(bsonReader, DecoderContext.builder().build());
}
}

@Override
Expand All @@ -335,13 +371,6 @@ private BsonBinaryReader createReader() {
return new BsonBinaryReader(new ByteBufferBsonInput(getByteBuffer()));
}

// Transform to an org.bson.BsonDocument instance
private BsonDocument toBaseBsonDocument() {
try (BsonBinaryReader bsonReader = createReader()) {
return new BsonDocumentCodec().decode(bsonReader, DecoderContext.builder().build());
}
}

/**
* Write the replacement object.
*
Expand Down
Loading