fix: TAG and TEXT fields should be escaped by default when using QBE (r…

…esolved gh-451)

redis-om-spring/src/main/java/com/redis/om/spring/search/stream/ExampleToNodeConverter.java

@@ -81,9 +81,9 @@ public Node processExample(Example<E> example, Node rootNode) {
               }
             } else {
               if (matchingAll) {
-                rootNode = QueryBuilders.intersect(rootNode).add(fieldName, "{" + value + "}");
+                rootNode = QueryBuilders.intersect(rootNode).add(fieldName, "{" + QueryUtils.escape(value) + "}");
               } else {
-                rootNode = QueryBuilders.union(rootNode).add(fieldName, "{" + value + "}");
+                rootNode = QueryBuilders.union(rootNode).add(fieldName, "{" + QueryUtils.escape(value) + "}");
               }
             }
           }

redis-om-spring/src/test/java/com/redis/om/spring/annotations/document/RedisDocumentQueryByExampleTest.java

@@ -24,7 +24,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class RedisDocumentQueryByExampleTest extends AbstractBaseDocumentTest {
   @Autowired
@@ -542,4 +543,28 @@ void testFindByShouldApplyProjection() {
     assertThat(doc1.getANumber()).isNotNull();
     assertThat(doc1.getTitle()).isNull();
   }
+
+  @Test
+  void testTagEscapeCharsWithProjection() {
+    Company template = new Company();
+    template.setEmail("[email protected]");
+
+    Example<Company> example = Example.of(template);
+
+    Company result = companyRepository.findBy(example, it -> it.project("name").firstValue());
+
+    assertThat(result.getName()).isEqualTo("RedisInc");
+  }
+
+  @Test
+  void testTagEscapeCharsFindByShouldReturnOneResult() {
+    Company template = new Company();
+    template.setEmail("[email protected]");
+
+    Example<Company> example = Example.of(template);
+
+    Company result = companyRepository.findBy(example, FetchableFluentQuery::oneValue);
+    assertThat(result).isNotNull().hasFieldOrPropertyWithValue("email", "[email protected]");
+    assertThat(result.getName()).isEqualTo("RedisInc");
+  }
 }

redis-om-spring/src/test/java/com/redis/om/spring/annotations/hash/RedisHashQueryByExampleTest.java

@@ -454,4 +454,28 @@ void testFindByShouldApplyProjection() {
     assertThat(doc1.getTitle()).isNull();
   }
 
+  @Test
+  void testTagEscapeCharsWithProjection() {
+    Company template = new Company();
+    template.setEmail("[email protected]");
+
+    Example<Company> example = Example.of(template);
+
+    Company result = companyRepository.findBy(example, it -> it.project("name").firstValue());
+
+    assertThat(result.getName()).isEqualTo("RedisInc");
+  }
+
+  @Test
+  void testTagEscapeCharsFindByShouldReturnOneResult() {
+    Company template = new Company();
+    template.setEmail("[email protected]");
+
+    Example<Company> example = Example.of(template);
+
+    Company result = companyRepository.findBy(example, FetchableFluentQuery::oneValue);
+    assertThat(result).isNotNull().hasFieldOrPropertyWithValue("email", "[email protected]");
+    assertThat(result.getName()).isEqualTo("RedisInc");
+  }
+
 }