#1 Allow regex chars in non-regex search

Author: Sebastian Lang

src/main/java/org/springframework/data/mongodb/datatables/DataTablesCriteria.java

@@ -24,6 +24,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.regex.Pattern;
 
 import static java.util.stream.Collectors.toList;
 import static org.springframework.data.domain.Sort.by;
@@ -286,7 +287,8 @@ private List<Criteria> createCriteria(DataTablesInput.Column column, DataTablesI
             } else {
                 return searchConfig.getReferenceColumns().stream()
                         .map(data -> search.isRegex() ?
-                                where(resolvedColumn.get(column.getData()) + "." + data).regex(searchValue) : where(resolvedColumn.get(column.getData()) + "." + data).regex(searchValue.trim(), "i"))
+                                where(resolvedColumn.get(column.getData()) + "." + data).regex(searchValue) :
+                                where(resolvedColumn.get(column.getData()) + "." + data).regex(Pattern.quote(searchValue.trim()), "i"))
                         .collect(toList());
             }
         } else {
@@ -311,14 +313,14 @@ private List<Criteria> createCriteria(DataTablesInput.Column column, DataTablesI
                     if (search.isRegex()) {
                         criteria.add(where(columnName).regex(searchValue));
                     } else {
-                        criteria.add(where(columnName).regex(searchValue.trim(), "i"));
+                        criteria.add(where(columnName).regex(Pattern.quote(searchValue.trim()), "i"));
                     }
                     break;
                 default:
                     if (search.isRegex()) {
                         criteria.add(where(column.getData()).regex(searchValue));
                     } else {
-                        criteria.add(where(column.getData()).regex(searchValue.trim(), "i"));
+                        criteria.add(where(column.getData()).regex(Pattern.quote(searchValue.trim()), "i"));
                     }
                     break;
             }

src/test/java/org/springframework/data/mongodb/datatables/OrderRepositoryTest.java

@@ -244,6 +244,35 @@ public void globalFilter() {
         assertThat(output.getError()).isNull();
     }
 
+    @Test
+    public void globalFilter_plus() {
+        DataTablesInput input = getDefaultInput();
+        input.setSearch(new DataTablesInput.Search("+49", false));
+
+        DataTablesOutput<Order> output = orderRepository.findAll(input);
+        assertThat(output.getError()).isNull();
+    }
+
+    @Test
+    public void globalFilter_plus_regex() {
+        DataTablesInput input = getDefaultInput();
+        input.setSearch(new DataTablesInput.Search("ab+49", true));
+
+        DataTablesOutput<Order> output = orderRepository.findAll(input);
+        assertThat(output.getError()).isNull();
+    }
+
+    @Test
+    public void globalFilter_plus_regex_invalid() {
+        DataTablesInput input = getDefaultInput();
+
+        // Invalid Regex expression. Cannot start with '+'.
+        input.setSearch(new DataTablesInput.Search("+49", true));
+
+        DataTablesOutput<Order> output = orderRepository.findAll(input);
+        assertThat(output.getError().contains("PatternSyntaxException")).isTrue();
+    }
+
     @Test
     public void globalFilter_int() {
         DataTablesInput input = getDefaultInput();