GitHub-Spring
/
spring-data-mongodb
mirror of https://github.com/spring-projects/spring-data-mongodb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Polishing. 

Favor Base64 over deprecated Base64Utils.

See: #2750
Original pull request: #4316.
pull/4323/head
Christoph Strobl 3 years ago committed by Mark Paluch
parent
a416441427
commit
f4b85242d4
No known key found for this signature in database
GPG Key ID: 4406B84C1661DCD1
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Criteria.java

4
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Criteria.java
Unescape View File

@ -19,6 +19,7 @@ import static org.springframework.util.ObjectUtils.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Base64;
import java.util.Collection; import java.util.Collection;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
@ -46,7 +47,6 @@ import org.springframework.data.mongodb.core.schema.MongoJsonSchema;
import org.springframework.data.mongodb.util.RegexFlags; import org.springframework.data.mongodb.util.RegexFlags;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.Base64Utils;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
@ -1394,7 +1394,7 @@ public class Criteria implements CriteriaDefinition {
Assert.hasText(bitmask, "Bitmask must not be null"); Assert.hasText(bitmask, "Bitmask must not be null");
target.criteria.put(operator, new Binary(Base64Utils.decodeFromString(bitmask))); target.criteria.put(operator, new Binary(Base64.getDecoder().decode(bitmask)));
return target; return target;
} }

Write Preview
Loading…
Cancel
Save