Browse Source

Polishing.

Reformat code. Add since tags.

See #3395
Original pull request: #3554.
2.2.x
Mark Paluch 5 years ago
parent
commit
39803621b1
No known key found for this signature in database
GPG Key ID: 4406B84C1661DCD1
  1. 7
      spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/MongoRegexCreator.java
  2. 2
      spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryCreator.java

7
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/MongoRegexCreator.java

@ -103,8 +103,13 @@ public enum MongoRegexCreator {
} }
} }
/**
* @param source
* @return
* @since 2.2.14
*/
public Object toCaseInsensitiveMatch(Object source) { public Object toCaseInsensitiveMatch(Object source) {
return source instanceof String ? new BsonRegularExpression(Pattern.quote((String)source), "i") : source; return source instanceof String ? new BsonRegularExpression(Pattern.quote((String) source), "i") : source;
} }
private String prepareAndEscapeStringBeforeApplyingLikeRegex(String source, MatchMode matcherType) { private String prepareAndEscapeStringBeforeApplyingLikeRegex(String source, MatchMode matcherType) {

2
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryCreator.java

@ -404,7 +404,7 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> {
private java.util.List<?> nextAsList(Iterator<Object> iterator, Part part) { private java.util.List<?> nextAsList(Iterator<Object> iterator, Part part) {
Streamable<?> streamable = asStreamable(iterator.next()); Streamable<?> streamable = asStreamable(iterator.next());
if(!isSimpleComparisionPossible(part)) { if (!isSimpleComparisionPossible(part)) {
streamable = streamable.map(MongoRegexCreator.INSTANCE::toCaseInsensitiveMatch); streamable = streamable.map(MongoRegexCreator.INSTANCE::toCaseInsensitiveMatch);
} }

Loading…
Cancel
Save