diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryCreator.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryCreator.java index 5eeda51d0..af07e0f07 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryCreator.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryCreator.java @@ -21,6 +21,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Iterator; import java.util.Optional; +import java.util.regex.Pattern; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -206,7 +207,9 @@ class MongoQueryCreator extends AbstractQueryCreator { case NOT_CONTAINING: return createContainingCriteria(part, property, criteria.not(), parameters); case REGEX: - return criteria.regex(parameters.next().toString()); + + Object param = parameters.next(); + return param instanceof Pattern ? criteria.regex((Pattern) param) : criteria.regex(param.toString()); case EXISTS: return criteria.exists((Boolean) parameters.next()); case TRUE: diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/AbstractPersonRepositoryIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/AbstractPersonRepositoryIntegrationTests.java index 9f19b8af2..23264fc23 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/AbstractPersonRepositoryIntegrationTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/AbstractPersonRepositoryIntegrationTests.java @@ -28,6 +28,7 @@ import java.util.HashSet; import java.util.List; import java.util.Optional; import java.util.UUID; +import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -1216,4 +1217,18 @@ public abstract class AbstractPersonRepositoryIntegrationTests { assertThat(repository.findByAgeGreaterThan(40, Sort.by(Direction.ASC, "age"))).containsExactly(leroi, dave, boyd, carter); } + + @Test // DATAMONGO-2003 + public void findByRegexWithPattern() { + assertThat(repository.findByFirstnameRegex(Pattern.compile(alicia.getFirstname()))).hasSize(1); + } + + @Test // DATAMONGO-2003 + public void findByRegexWithPatternAndOptions() { + + String fn = alicia.getFirstname().toUpperCase(); + + assertThat(repository.findByFirstnameRegex(Pattern.compile(fn))).hasSize(0); + assertThat(repository.findByFirstnameRegex(Pattern.compile(fn, Pattern.CASE_INSENSITIVE))).hasSize(1); + } } diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonRepository.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonRepository.java index 7745b524d..4d1590ea3 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonRepository.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonRepository.java @@ -20,6 +20,7 @@ import java.util.Date; import java.util.List; import java.util.Optional; import java.util.UUID; +import java.util.regex.Pattern; import java.util.stream.Stream; import org.springframework.data.domain.Page; @@ -353,4 +354,6 @@ public interface PersonRepository extends MongoRepository, Query @Query(sort = "{ age : -1 }") List findByAgeGreaterThan(int age, Sort sort); + + List findByFirstnameRegex(Pattern pattern); } diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MongoQueryCreatorUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MongoQueryCreatorUnitTests.java index ecf4398f6..ed9f492ec 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MongoQueryCreatorUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MongoQueryCreatorUnitTests.java @@ -24,7 +24,9 @@ import static org.springframework.data.mongodb.repository.query.StubParameterAcc import java.lang.reflect.Method; import java.util.List; +import java.util.regex.Pattern; +import org.bson.Document; import org.bson.types.ObjectId; import org.junit.Before; import org.junit.Rule; @@ -60,8 +62,6 @@ import org.springframework.data.repository.Repository; import org.springframework.data.repository.core.support.DefaultRepositoryMetadata; import org.springframework.data.repository.query.parser.PartTree; -import org.bson.Document; - /** * Unit test for {@link MongoQueryCreator}. * @@ -627,6 +627,25 @@ public class MongoQueryCreatorUnitTests { new MongoQueryCreator(tree, accessor, context).createQuery(); } + @Test // DATAMONGO-2003 + public void createsRegexQueryForPatternCorrectly() throws Exception { + + PartTree tree = new PartTree("findByFirstNameRegex", Person.class); + MongoQueryCreator creator = new MongoQueryCreator(tree, getAccessor(converter, Pattern.compile(".*")), context); + + assertThat(creator.createQuery(), is(query(where("firstName").regex(".*")))); + } + + @Test // DATAMONGO-2003 + public void createsRegexQueryForPatternWithOptionsCorrectly() throws Exception { + + Pattern pattern = Pattern.compile(".*", Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE); + + PartTree tree = new PartTree("findByFirstNameRegex", Person.class); + MongoQueryCreator creator = new MongoQueryCreator(tree, getAccessor(converter, pattern), context); + assertThat(creator.createQuery(), is(query(where("firstName").regex(".*", "iu")))); + } + interface PersonRepository extends Repository { List findByLocationNearAndFirstname(Point location, Distance maxDistance, String firstname);