Skip to content

Commit 21475f1

Browse files
committed
Fixed compilation
1 parent b93bc9f commit 21475f1

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/main/java/org/javawebstack/abstractdata/bson/BsonConverter.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package org.javawebstack.abstractdata.bson;
22

33
import org.bson.*;
4-
import org.bson.internal.Base64;
54
import org.bson.types.Decimal128;
65
import org.bson.types.ObjectId;
76
import org.javawebstack.abstractdata.*;
87

8+
import java.nio.charset.StandardCharsets;
99
import java.text.DateFormat;
1010
import java.text.ParseException;
1111
import java.text.SimpleDateFormat;
12+
import java.util.Base64;
1213
import java.util.Date;
1314

1415
public class BsonConverter {
@@ -77,8 +78,9 @@ public AbstractElement toAbstract(BsonValue value) {
7778
.set("i", Integer.toUnsignedLong(value.asTimestamp().getInc()))
7879
);
7980
case BINARY:
81+
String base64 = new String(Base64.getEncoder().encode(value.asBinary().getData()));
8082
return new AbstractObject().set("$binary", new AbstractObject()
81-
.set("base64", Base64.encode(value.asBinary().getData()))
83+
.set("base64", base64)
8284
.set("subType", String.format("%02x", value.asBinary().getType()))
8385
);
8486
case ARRAY: {
@@ -155,7 +157,7 @@ public BsonValue toBson(AbstractElement element) {
155157
if(o.size() == 1 && o.has("$binary") && o.get("$binary").isObject()) {
156158
AbstractObject bin = o.object("$binary");
157159
if(bin.has("base64") && bin.has("subType") && bin.get("base64").isString() && bin.get("subType").isString()) {
158-
byte[] data = Base64.decode(bin.string("base64"));
160+
byte[] data = Base64.getDecoder().decode(bin.string("base64"));
159161
byte type = (byte) Integer.parseInt(bin.string("subType"), 16);
160162
return new BsonBinary(type, data);
161163
}

0 commit comments

Comments
 (0)