DATAMONGO-1245 - Remove escaping for native regex string matching.

Author: mp911de

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 the original author or authors.
+ * Copyright 2015-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 
 /**
  * @author Christoph Strobl
+ * @author Mark Paluch
  * @since 1.8
  */
 public enum MongoRegexCreator {
@@ -67,6 +68,10 @@ public String toRegularExpression(String source, Type type) {
 
 	private String prepareAndEscapeStringBeforeApplyingLikeRegex(String source, Type type) {
 
+		if (ObjectUtils.nullSafeEquals(Type.REGEX, type)) {
+			return source;
+		}
+
 		if (!ObjectUtils.nullSafeEquals(Type.LIKE, type)) {
 			return PUNCTATION_PATTERN.matcher(source).find() ? Pattern.quote(source) : source;
 		}

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoExampleMapperUnitTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 the original author or authors.
+ * Copyright 2015-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,6 +49,7 @@
 
 /**
  * @author Christoph Strobl
+ * @author Mark Paluch
  */
 @RunWith(MockitoJUnitRunner.class)
 public class MongoExampleMapperUnitTests {
@@ -149,7 +150,7 @@ public void exampleShouldBeMappedCorrectlyForFlatTypeWhenFieldNameIsCustomized()
 	 * @see DATAMONGO-1245
 	 */
 	@Test
-	public void exampleShouldBeMappedAsFlatMapWhenGivenNestedElementsWithLenienMatchMode() {
+	public void exampleShouldBeMappedAsFlatMapWhenGivenNestedElementsWithLenientMatchMode() {
 
 		WrapperDocument probe = new WrapperDocument();
 		probe.flatDoc = new FlatDocument();
@@ -164,7 +165,7 @@ public void exampleShouldBeMappedAsFlatMapWhenGivenNestedElementsWithLenienMatch
 	 * @see DATAMONGO-1245
 	 */
 	@Test
-	public void exampleShouldBeMappedAsExactObjectWhenGivenNestedElementsWithStriktMatchMode() {
+	public void exampleShouldBeMappedAsExactObjectWhenGivenNestedElementsWithStrictMatchMode() {
 
 		WrapperDocument probe = new WrapperDocument();
 		probe.flatDoc = new FlatDocument();
@@ -196,6 +197,26 @@ public void exampleShouldBeMappedCorrectlyForFlatTypeWhenStringMatchModeIsStarti
 						.add("intValue", 100).get()));
 	}
 
+
+	/**
+	 * @see DATAMONGO-1245
+	 */
+	@Test
+	public void exampleShouldBeMappedCorrectlyForFlatTypeContainingDotsWhenStringMatchModeIsStarting() {
+
+		FlatDocument probe = new FlatDocument();
+		probe.stringValue = "fire.ight";
+		probe.intValue = 100;
+
+		Example<?> example = newExampleOf(probe).matchStringsStartingWith().get();
+
+		DBObject dbo = mapper.getMappedExample(example, context.getPersistentEntity(FlatDocument.class));
+
+		assertThat(dbo,
+				is(new BasicDBObjectBuilder().add("stringValue", new BasicDBObject("$regex", "^" + Pattern.quote("fire.ight")))
+						.add("intValue", 100).get()));
+	}
+
 	/**
 	 * @see DATAMONGO-1245
 	 */
@@ -215,6 +236,25 @@ public void exampleShouldBeMappedCorrectlyForFlatTypeWhenStringMatchModeIsEnding
 						.add("intValue", 100).get()));
 	}
 
+	/**
+	 * @see DATAMONGO-1245
+	 */
+	@Test
+	public void exampleShouldBeMappedCorrectlyForFlatTypeWhenStringMatchModeRegex() {
+
+		FlatDocument probe = new FlatDocument();
+		probe.stringValue = "firefight";
+		probe.customNamedField = "^(cat|dog).*shelter\\d?";
+
+		Example<?> example = newExampleOf(probe).matchStrings(StringMatcher.REGEX).get();
+
+		DBObject dbo = mapper.getMappedExample(example, context.getPersistentEntity(FlatDocument.class));
+
+		assertThat(dbo,
+				is(new BasicDBObjectBuilder().add("stringValue", new BasicDBObject("$regex", "firefight"))
+						.add("custom_field_name", new BasicDBObject("$regex", "^(cat|dog).*shelter\\d?")).get()));
+	}
+
 	/**
 	 * @see DATAMONGO-1245
 	 */