refactor: move serialization hints to its own property

Author: bsbodden

redis-om-spring/src/main/java/com/redis/om/spring/RediSearchIndexer.java

@@ -6,7 +6,7 @@
 import com.redis.om.spring.ops.RedisModulesOperations;
 import com.redis.om.spring.ops.search.SearchOperations;
 import com.redis.om.spring.repository.query.QueryUtils;
-import com.redis.om.spring.serialization.gson.EnumTypeAdapter;
+import com.redis.om.spring.serialization.gson.*;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -213,10 +213,19 @@ private List<Field> findIndexFields(java.lang.reflect.Field field, String prefix
         //
         // Any Character class, Boolean or Enum with AUTODETECT -> Tag Search Field
         //
-        if (CharSequence.class.isAssignableFrom(fieldType) || (fieldType == Boolean.class) ||
-            (fieldType.isEnum())) {
+        if (CharSequence.class.isAssignableFrom(fieldType) || (fieldType == Boolean.class)) {
           fields.add(indexAsTagFieldFor(field, isDocument, prefix, indexed.sortable(), indexed.separator(),
               indexed.arrayIndex(), indexed.alias()));
+        } else if (fieldType.isEnum()) {
+          switch (indexed.serializationHint()) {
+            case ORDINAL -> {
+              fields.add(indexAsNumericFieldFor(field, isDocument, prefix, indexed.sortable(), indexed.noindex(),
+                indexed.alias()));
+              gsonBuilder.registerTypeAdapter(fieldType, EnumTypeAdapter.of(fieldType));
+            }
+            default -> fields.add(indexAsTagFieldFor(field, isDocument, prefix, indexed.sortable(), indexed.separator(),
+              indexed.arrayIndex(), indexed.alias()));
+          }
         }
         //
         // Any Numeric class -> Numeric Search Field
@@ -293,11 +302,6 @@ else if (fieldType == Point.class) {
               fields.addAll(findIndexFields(subfield, subfieldPrefix, isDocument));
             }
           }
-          case ORDINAL -> {
-            fields.add(indexAsNumericFieldFor(field, isDocument, prefix, indexed.sortable(),
-                indexed.noindex(), indexed.alias()));
-            gsonBuilder.registerTypeAdapter(fieldType, EnumTypeAdapter.of(fieldType));
-          }
         }
       }
     }

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

@@ -13,6 +13,8 @@
   // by default, attempt to determine the schema field type from the Java datatype
   SchemaFieldType schemaFieldType() default SchemaFieldType.AUTODETECT;
 
+  SerializationHint serializationHint() default SerializationHint.NONE;
+
   String fieldName() default "";
 
   String alias() default "";

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

@@ -6,6 +6,5 @@ public enum SchemaFieldType {
   NUMERIC,
   GEO,
   VECTOR,
-  NESTED,
-  ORDINAL
+  NESTED
 }

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

@@ -0,0 +1,6 @@
+package com.redis.om.spring.annotations;
+
+public enum SerializationHint {
+  ORDINAL,
+  NONE
+}

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

@@ -3,6 +3,7 @@
 import com.redis.om.spring.annotations.Document;
 import com.redis.om.spring.annotations.Indexed;
 import com.redis.om.spring.annotations.SchemaFieldType;
+import com.redis.om.spring.annotations.SerializationHint;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -22,7 +23,7 @@ public class Developer {
   @Id
   private String id;
 
-  @Indexed(schemaFieldType = SchemaFieldType.ORDINAL)
+  @Indexed(serializationHint = SerializationHint.ORDINAL)
   private DeveloperType typeOrdinal;
 
   private DeveloperState state;

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

@@ -41,6 +41,7 @@ public class KitchenSink {
   private Instant instant;
   @NonNull
   private OffsetDateTime localOffsetDateTime;
+
   @Singular
   @JsonAdapter(SetToStringAdapter.class)
   private Set<String> setThings;

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

@@ -1,10 +1,7 @@
 package com.redis.om.spring.annotations.document.fixtures;
 
 import com.google.gson.annotations.JsonAdapter;
-import com.redis.om.spring.annotations.Document;
-import com.redis.om.spring.annotations.DocumentScore;
-import com.redis.om.spring.annotations.Indexed;
-import com.redis.om.spring.annotations.Searchable;
+import com.redis.om.spring.annotations.*;
 import com.redis.om.spring.serialization.gson.SetToStringAdapter;
 import lombok.*;
 import org.springframework.data.annotation.Id;