diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/ParameterBindingJsonReader.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/ParameterBindingJsonReader.java index 811477970..2891cd741 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/ParameterBindingJsonReader.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/ParameterBindingJsonReader.java @@ -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);