mindol1004/spring-data-mongodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Favor Base64Utils over bson internal Base64 type.

Browse Source 
org.bson.internal.Base64 is no longer available in MongoDB driver 4.5.0.

Related to: #3962
This commit is contained in:
Christoph Strobl
2022-02-11 07:49:32 +01:00
committed by Mark Paluch
parent 32e7f2032d
commit f96d700d8d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/ParameterBindingJsonReader.java
View File

@@ -30,7 +30,6 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.bson.*;
import org.bson.internal.Base64;
import org.bson.json.JsonParseException;
import org.bson.types.Decimal128;
import org.bson.types.MaxKey;
@@ -40,6 +39,7 @@ import org.springframework.data.spel.EvaluationContextProvider;
import org.springframework.expression.EvaluationContext;
import org.springframework.expression.spel.standard.SpelExpressionParser;
import org.springframework.lang.Nullable;
import org.springframework.util.Base64Utils;
import org.springframework.util.ClassUtils;
import org.springframework.util.NumberUtils;
import org.springframework.util.ObjectUtils;
@@ -924,7 +924,7 @@ public class ParameterBindingJsonReader extends AbstractBsonReader {
}
verifyToken(JsonTokenType.RIGHT_PAREN);
byte[] bytes = Base64.decode(bytesToken.getValue(String.class));
byte[] bytes = Base64Utils.decodeFromString(bytesToken.getValue(String.class));
return new BsonBinary(subTypeToken.getValue(Integer.class).byteValue(), bytes);
}
@@ -1190,7 +1190,7 @@ public class ParameterBindingJsonReader extends AbstractBsonReader {
byte type;
if (firstNestedKey.equals("base64")) {
verifyToken(JsonTokenType.COLON);
data = Base64.decode(readStringFromExtendedJson());
data = Base64Utils.decodeFromString(readStringFromExtendedJson());
verifyToken(JsonTokenType.COMMA);
verifyString("subType");
verifyToken(JsonTokenType.COLON);
@@ -1201,7 +1201,7 @@ public class ParameterBindingJsonReader extends AbstractBsonReader {
verifyToken(JsonTokenType.COMMA);
verifyString("base64");
verifyToken(JsonTokenType.COLON);
data = Base64.decode(readStringFromExtendedJson());
data = Base64Utils.decodeFromString(readStringFromExtendedJson());
} else {
throw new JsonParseException("Unexpected key for $binary: " + firstNestedKey);
}
@@ -1229,7 +1229,7 @@ public class ParameterBindingJsonReader extends AbstractBsonReader {
byte type;
if (firstKey.equals("$binary")) {
data = Base64.decode(readStringFromExtendedJson());
data = Base64Utils.decodeFromString(readStringFromExtendedJson());
verifyToken(JsonTokenType.COMMA);
verifyString("$type");
verifyToken(JsonTokenType.COLON);
@@ -1239,7 +1239,7 @@ public class ParameterBindingJsonReader extends AbstractBsonReader {
verifyToken(JsonTokenType.COMMA);
verifyString("$binary");
verifyToken(JsonTokenType.COLON);
data = Base64.decode(readStringFromExtendedJson());
data = Base64Utils.decodeFromString(readStringFromExtendedJson());
}
verifyToken(JsonTokenType.END_OBJECT);