refactor: consistently use Search Dialect 2 as the default

redis-om-spring/src/main/java/com/redis/om/spring/annotations/UseDialect.java

@@ -8,5 +8,5 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
 public @interface UseDialect {
-  Dialect dialect() default Dialect.ONE;
+  Dialect dialect() default Dialect.TWO;
 }

redis-om-spring/src/main/java/com/redis/om/spring/repository/query/RediSearchQuery.java

@@ -87,7 +87,7 @@ public class RediSearchQuery implements RepositoryQuery {
   private Boolean aggregationVerbatim;
   private Gson gson;
   private boolean isNullParamQuery;
-  private Dialect dialect = Dialect.ONE;
+  private Dialect dialect = Dialect.TWO;
 
   @SuppressWarnings("unchecked")
   public RediSearchQuery(//
@@ -416,6 +416,7 @@ private Object executeQuery(Object[] parameters) {
     boolean excludeNullParams = !isNullParamQuery;
     String preparedQuery = prepareQuery(parameters, excludeNullParams);
     Query query = new Query(preparedQuery);
+    query.dialect(2);
 
     ReturnedType returnedType = processor.getReturnedType();
 

redis-om-spring/src/main/java/com/redis/om/spring/repository/support/SimpleRedisDocumentRepository.java

@@ -6,6 +6,7 @@
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
 import com.redis.om.spring.RedisOMProperties;
+import com.redis.om.spring.annotations.Dialect;
 import com.redis.om.spring.audit.EntityAuditor;
 import com.redis.om.spring.convert.MappingRedisOMConverter;
 import com.redis.om.spring.id.IdentifierFilter;
@@ -424,20 +425,20 @@ public <S extends T> Optional<S> findOne(Example<S> example) {
 
   @Override
   public <S extends T> Iterable<S> findAll(Example<S> example) {
-    return entityStream.of(example.getProbeType()).filter(example).collect(Collectors.toList());
+    return entityStream.of(example.getProbeType()).dialect(Dialect.TWO.getValue()).filter(example).collect(Collectors.toList());
   }
 
   @Override
   public <S extends T> Iterable<S> findAll(Example<S> example, Sort sort) {
-    return entityStream.of(example.getProbeType()).filter(example).sorted(sort).collect(Collectors.toList());
+    return entityStream.of(example.getProbeType()).dialect(Dialect.TWO.getValue()).filter(example).sorted(sort).collect(Collectors.toList());
   }
 
   @Override
   public <S extends T> Page<S> findAll(Example<S> example, Pageable pageable) {
     SearchStream<S> stream = entityStream.of(example.getProbeType());
     var offset = pageable.getPageNumber() * pageable.getPageSize();
     var limit = pageable.getPageSize();
-    Page<S> page = stream.filter(example).loadAll().limit(limit, Math.toIntExact(offset))
+    Page<S> page = stream.filter(example).dialect(Dialect.TWO.getValue()).loadAll().limit(limit, Math.toIntExact(offset))
         .toList(pageable, stream.getEntityClass());
 
     return page;

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

@@ -1,6 +1,7 @@
 package com.redis.om.spring.search.stream;
 
 import com.google.gson.Gson;
+import com.redis.om.spring.annotations.Dialect;
 import com.redis.om.spring.convert.MappingRedisOMConverter;
 import com.redis.om.spring.ops.search.SearchOperations;
 import com.redis.om.spring.util.ObjectUtils;
@@ -118,6 +119,7 @@ public long getTotalElements() {
         String baseQuery = aggregationStream.backingQuery();
         Query countQuery = (baseQuery.isBlank()) ? new Query() : new Query(baseQuery);
         countQuery.setNoContent();
+        countQuery.dialect(Dialect.TWO.getValue());
         for (Order order : pageable.getSort()) {
           countQuery.setSortBy(order.getProperty(), order.isAscending());
         }

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

@@ -1,6 +1,7 @@
 package com.redis.om.spring.search.stream;
 
 import com.google.gson.Gson;
+import com.redis.om.spring.annotations.Dialect;
 import com.redis.om.spring.annotations.Document;
 import com.redis.om.spring.annotations.ReducerFunction;
 import com.redis.om.spring.convert.MappingRedisOMConverter;
@@ -42,6 +43,7 @@ public AggregationStreamImpl(String searchIndex, RedisModulesOperations<String>
     this.entityClass = entityClass;
     search = modulesOperations.opsForSearch(searchIndex);
     aggregation = new AggregationBuilder(query);
+    aggregation.dialect(Dialect.TWO.getValue());
     isDocument = entityClass.isAnnotationPresent(Document.class);
     this.query = query;
     this.gson = gson;

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

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

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

@@ -1,5 +1,6 @@
 package com.redis.om.spring.search.stream;
 
+import com.redis.om.spring.annotations.Dialect;
 import com.redis.om.spring.metamodel.MetamodelField;
 import com.redis.om.spring.metamodel.MetamodelUtils;
 import com.redis.om.spring.ops.search.SearchOperations;
@@ -91,6 +92,7 @@ public RedisFluentQueryByExample( //
     this.searchStream = entityStream.of(resultType);
     this.projectionFactory = new SpelAwareProxyProjectionFactory();
     this.mappingContext = mappingContext;
+    searchStream.dialect(Dialect.TWO.getValue());
     searchStream.filter((Example<R>)example);
   }
 
@@ -151,6 +153,7 @@ public Page<R> page(Pageable pageable) {
     long count = -1;
     if (!searchStream.backingQuery().isBlank()) {
       Query query = new Query(searchStream.backingQuery());
+      query.dialect(Dialect.TWO.getValue());
       query.limit(0, 0);
       SearchResult searchResult = searchOps.search(query);
 

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

@@ -2,6 +2,7 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.redis.om.spring.annotations.Dialect;
 import com.redis.om.spring.annotations.Document;
 import com.redis.om.spring.convert.MappingRedisOMConverter;
 import com.redis.om.spring.indexing.RediSearchIndexer;
@@ -78,7 +79,7 @@ public class SearchStreamImpl<E> implements SearchStream<E> {
   private Runnable closeHandler;
   private Stream<E> resolvedStream;
   private KNNPredicate<E, ?> knnPredicate;
-  private int dialect = 1;
+  private int dialect = Dialect.TWO.getValue();
   private SummarizeParams summarizeParams;
   private Pair<String, String> highlightTags;
   private boolean isQBE = false;
@@ -357,6 +358,7 @@ public long count() {
     if (!rootNode.toString().isBlank()) {
       Query query = new Query(rootNode.toString());
       query.limit(0, 0);
+      query.dialect(Dialect.TWO.getValue());
       SearchResult searchResult = search.search(query);
       resolvedStream = Stream.empty();
 
@@ -463,13 +465,14 @@ Query prepareQuery() {
 
     if (knnPredicate != null) {
       query = new Query(knnPredicate.apply(rootNode).toString());
+      query.dialect(Dialect.TWO.getValue());
       query.addParam(knnPredicate.getBlobAttributeName(), knnPredicate.getBlobAttribute() != null ?
           knnPredicate.getBlobAttribute() :
           floatArrayToByteArray(knnPredicate.getDoublesAttribute()));
       query.addParam("K", knnPredicate.getK());
-      query.dialect(2);
     } else {
       query = (rootNode.toString().isBlank()) ? new Query() : new Query(rootNode.toString());
+      query.dialect(Dialect.TWO.getValue());
       query.dialect(dialect);
     }
 

redis-om-spring/src/main/java/com/redis/om/spring/search/stream/predicates/tag/EqualPredicate.java

@@ -14,7 +14,7 @@ public class EqualPredicate<E, T> extends BaseAbstractPredicate<E, T> {
 
   public EqualPredicate(SearchFieldAccessor field, T value) {
     super(field);
-    this.value = QueryUtils.escape(value);
+    this.value = value;
   }
 
   public T getValue() {
@@ -29,12 +29,12 @@ public Node apply(Node root) {
       Iterable<?> values = (Iterable<?>) getValue();
       QueryNode and = QueryBuilders.intersect();
       for (Object v : values) {
-        and.add(getSearchAlias(), "{" + v.toString() + "}");
+        and.add(getSearchAlias(), "{\"" + v.toString() + "\"}");
       }
       return QueryBuilders.intersect(root, and);
     } else {
-      return QueryBuilders.intersect(root).add(getSearchAlias(), "{" + value.toString() + "}");
+      return QueryBuilders.intersect(root).add(getSearchAlias(), "{\"" + value.toString() + "\"}");
     }
   }
 
-}
+}

redis-om-spring/src/main/java/com/redis/om/spring/search/stream/predicates/tag/NotEqualPredicate.java

@@ -19,7 +19,7 @@ public class NotEqualPredicate<E, T> extends BaseAbstractPredicate<E, T> {
 
   public NotEqualPredicate(SearchFieldAccessor field, T value) {
     super(field);
-    this.value = QueryUtils.escape(value);
+    this.value = value;
   }
 
   public NotEqualPredicate(SearchFieldAccessor field, List<String> list) {
@@ -38,7 +38,7 @@ public Node apply(Node root) {
     QueryNode and = QueryBuilders.intersect();
 
     StreamSupport.stream(getValues().spliterator(), false) //
-        .map(v -> Values.value("{" + v.toString() + "}"))
+        .map(v -> Values.value("{\"" + v.toString() + "\"}"))
         .forEach(val -> and.add(QueryBuilders.disjunct(getSearchAlias(), val)));
 
     return QueryBuilders.intersect(root, and);

tests/src/test/java/com/redis/om/spring/search/stream/EntityStreamDocumentQBEAdvancedTest.java

@@ -38,7 +38,7 @@ void loadTestData() {
     // Data from the screenshot
     entities.add(createDunnageEntity("TMMFV", "T423", "F3483", "CTCI", "THERMOFORME", "NO", 0, 0f, "EUR", null, null, null));
     entities.add(createDunnageEntity("TMMFV", "F375", "F2413", "PPO", "CORREX + EPP", "1150X350X202", 750, 36.71f, "EUR", null, null, null));
-    entities.add(createDunnageEntity("TMMFV", "C035", "F1503", "JAMES LEIGH", "FOAM", "WHITE FOAM", 690, 14.1f, "GBP", null, null, null));
+    entities.add(createDunnageEntity("TMMFV", "C035", "F1-503", "JAMES LEIGH", "FOAM", "WHITE FOAM", 690, 14.1f, "GBP", null, null, null));
     entities.add(createDunnageEntity("TMMFV", "F519", "F3090", "CARPENTER", "FOAM", "NO", 100, 0f, "EURO", null, null, null));
     entities.add(createDunnageEntity("TMMFV", "J066", "20711", "FUJITSU TEN", "CARDBOARD DUNNAGE", "SPEAKER ASSY, RADIO", 100, 1f, "EURO", null, null, null));
     entities.add(createDunnageEntity("TMMFV", "S119", "F2168", "KAYSERSBERG", "TEXT EFFITEK+EVOLON", "540X340X290", 400, 25.56f, "EUR", null, null, null));
@@ -226,6 +226,30 @@ void testSearchWithExactTextValue() {
     assertThat(results).extracting("dunnageCode").containsExactly("F375");
   }
 
+  @Test
+  void testSearchWithExactTagValue() {
+    DunnageEntity template = DunnageEntity.builder()
+        .dunnageSuppcode("F1-503")
+        .build();
+
+    ExampleMatcher matcher = ExampleMatcher.matching()
+        .withStringMatcher(StringMatcher.EXACT)
+        .withIgnoreCase()
+        .withIgnoreNullValues();
+
+    Example<DunnageEntity> example = Example.of(template, matcher);
+
+    // Using entity stream
+    List<DunnageEntity> results = entityStream.of(DunnageEntity.class)
+        .dialect(2)
+        .filter(example)
+        .collect(Collectors.toList());
+
+    // Should find entries with "FOAM" in description field despite case difference
+    assertThat(results).hasSize(1);
+    assertThat(results).extracting("dunnageCode").containsExactly("C035");
+  }
+
   private DunnageEntity createDunnageEntity(String plant, String dunnageCode, String dunnageSuppcode,
       String dunnageSupplier, String material, String description,
       Integer weight, Float unitCost, String currency,