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

DATAMONGO-2571 - Fix regular expression parameter binding for String-based queries.

Browse Source 
Original pull request: #873.
This commit is contained in:
Christoph Strobl
2020-06-29 11:18:45 +02:00
committed by Mark Paluch
parent d9477501ae
commit 6a8609c7f8
2 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -229,7 +229,7 @@ public class ParameterBindingJsonReader extends AbstractBsonReader {
case REGULAR_EXPRESSION:
setCurrentBsonType(BsonType.REGULAR_EXPRESSION);
currentValue = bindableValueFor(token).getValue().toString();
currentValue = bindableValueFor(token).getValue();
break;
case STRING:
@@ -365,8 +365,11 @@ public class ParameterBindingJsonReader extends AbstractBsonReader {
return null;
}
boolean isRegularExpression = token.getType().equals(JsonTokenType.REGULAR_EXPRESSION);
BindableValue bindableValue = new BindableValue();
String tokenValue = String.class.cast(token.getValue());
String tokenValue = isRegularExpression ? token.getValue(BsonRegularExpression.class).getPattern()
: String.class.cast(token.getValue());
Matcher matcher = PARAMETER_BINDING_PATTERN.matcher(tokenValue);
if (token.getType().equals(JsonTokenType.UNQUOTED_STRING)) {
@@ -406,8 +409,6 @@ public class ParameterBindingJsonReader extends AbstractBsonReader {
String computedValue = tokenValue;
Matcher regexMatcher = EXPRESSION_BINDING_PATTERN.matcher(computedValue);
while (regexMatcher.find()) {
@@ -437,9 +438,15 @@ public class ParameterBindingJsonReader extends AbstractBsonReader {
computedValue = computedValue.replace(group, nullSafeToString(getBindableValueForIndex(index)));
}
bindableValue.setValue(computedValue);
bindableValue.setType(BsonType.STRING);
if (isRegularExpression) {
bindableValue.setValue(new BsonRegularExpression(computedValue));
bindableValue.setType(BsonType.REGULAR_EXPRESSION);
} else {
bindableValue.setValue(computedValue);
bindableValue.setType(BsonType.STRING);
}
return bindableValue;
}

16
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/util/json/ParameterBindingJsonReaderUnitTests.java
View File

@@ -333,6 +333,22 @@ public class ParameterBindingJsonReaderUnitTests {
new Document("user.supervisor", "wonderwoman"))));
}
@Test // DATAMONGO-2571
public void shouldParseRegexCorrectly() {
Document target = parse("{ $and: [{'fieldA': {$in: [/ABC.*/, /CDE.*F/]}}, {'fieldB': {$ne: null}}]}");
assertThat(target)
.isEqualTo(Document.parse("{ $and: [{'fieldA': {$in: [/ABC.*/, /CDE.*F/]}}, {'fieldB': {$ne: null}}]}"));
}
@Test // DATAMONGO-2571
public void shouldParseRegexWithPlaceholderCorrectly() {
Document target = parse("{ $and: [{'fieldA': {$in: [/?0.*/, /CDE.*F/]}}, {'fieldB': {$ne: null}}]}", "ABC");
assertThat(target)
.isEqualTo(Document.parse("{ $and: [{'fieldA': {$in: [/ABC.*/, /CDE.*F/]}}, {'fieldB': {$ne: null}}]}"));
}
private static Document parse(String json, Object... args) {
ParameterBindingJsonReader reader = new ParameterBindingJsonReader(json, args);