fix: serialize java.time.Instant as milliseconds (resolves gh-275)

Author: bsbodden

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

@@ -31,6 +31,7 @@
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -225,7 +226,7 @@ private List<Field> findIndexFields(java.lang.reflect.Field field, String prefix
         //
         else if (Number.class.isAssignableFrom(fieldType) || (fieldType == LocalDateTime.class)
             || (field.getType() == LocalDate.class) || (field.getType() == Date.class)
-            || (field.getType() == Instant.class)) {
+            || (field.getType() == Instant.class) || (field.getType() == OffsetDateTime.class)) {
           fields.add(indexAsNumericFieldFor(field, isDocument, prefix, indexed.sortable(), indexed.noindex()));
         }
         //

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

@@ -288,7 +288,7 @@ RedisJSONKeyValueAdapter getRedisJSONKeyValueAdapter( //
       RedisModulesOperations<?> redisModulesOperations, //
       RedisMappingContext mappingContext, //
       RediSearchIndexer indexer, //
-      GsonBuilder gsonBuilder, //
+      @Qualifier("omGsonBuilder") GsonBuilder gsonBuilder, //
       RedisOMSpringProperties properties //
   ) {
     return new RedisJSONKeyValueAdapter(redisOps, redisModulesOperations, mappingContext, indexer, gsonBuilder, properties);
@@ -300,7 +300,7 @@ public CustomRedisKeyValueTemplate getRedisJSONKeyValueTemplate( //
       RedisModulesOperations<?> redisModulesOperations, //
       RedisMappingContext mappingContext, //
       RediSearchIndexer indexer, //
-      GsonBuilder gsonBuilder, //
+      @Qualifier("omGsonBuilder") GsonBuilder gsonBuilder, //
       RedisOMSpringProperties properties //
   ) {
     return new CustomRedisKeyValueTemplate(
@@ -323,8 +323,11 @@ public CustomRedisKeyValueTemplate getKeyValueTemplate( //
   }
 
   @Bean(name = "streamingQueryBuilder")
-  EntityStream streamingQueryBuilder(RedisModulesOperations<?> redisModulesOperations, Gson gson) {
-    return new EntityStreamImpl(redisModulesOperations, gson);
+  EntityStream streamingQueryBuilder(
+      RedisModulesOperations<?> redisModulesOperations,
+      @Qualifier("omGsonBuilder") GsonBuilder gsonBuilder
+  ) {
+    return new EntityStreamImpl(redisModulesOperations, gsonBuilder);
   }
 
   @EventListener(ContextRefreshedEvent.class)

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

@@ -46,7 +46,7 @@ private ReducerFieldPair(Reducer reducer, MetamodelField<?, ?> field) {
       this.field = field;
     }
 
-    public static ReducerFieldPair of( Reducer reducer, MetamodelField<?, ?> field) {
+    public static ReducerFieldPair of(Reducer reducer, MetamodelField<?, ?> field) {
       return new ReducerFieldPair(reducer, field);
     }
 

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

@@ -1,22 +1,23 @@
 package com.redis.om.spring.search.stream;
 
 import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import com.redis.om.spring.ops.RedisModulesOperations;
 
 public class EntityStreamImpl implements EntityStream {
 
   final RedisModulesOperations<String> modulesOperations;
-  final Gson gson;
+  final GsonBuilder gsonBuilder;
 
   @SuppressWarnings("unchecked")
-  public EntityStreamImpl(RedisModulesOperations<?> rmo, Gson gson) {
+  public EntityStreamImpl(RedisModulesOperations<?> rmo, GsonBuilder gsonBuilder) {
     this.modulesOperations = (RedisModulesOperations<String>) rmo;
-    this.gson = gson;
+    this.gsonBuilder = gsonBuilder;
   }
 
   @Override
   public <E> SearchStream<E> of(Class<E> entityClass) {
-    return new SearchStreamImpl<>(entityClass, modulesOperations, gson);
+    return new SearchStreamImpl<>(entityClass, modulesOperations, gsonBuilder.create());
   }
 
 }

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

@@ -6,6 +6,7 @@
 import redis.clients.jedis.search.Schema.FieldType;
 
 import java.lang.reflect.Field;
+import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Date;
@@ -71,7 +72,7 @@ else if (field.isAnnotationPresent(NumericIndexed.class)) {
       // Any Numeric class -> Numeric Search Field
       //
       else if (Number.class.isAssignableFrom(field.getType()) || (field.getType() == LocalDateTime.class)
-          || (field.getType() == LocalDate.class) || (field.getType() == Date.class)) {
+          || (field.getType() == LocalDate.class) || (field.getType() == Date.class) || (field.getType() == Instant.class)) {
         result = FieldType.NUMERIC;
       }
       //

redis-om-spring/src/main/java/com/redis/om/spring/search/stream/predicates/jedis/InstantRangeValue.java

@@ -24,7 +24,7 @@ private static void appendInstant(StringBuilder sb, Instant instant, boolean inc
     } else if (instant == Instant.MAX) {
       sb.append("inf");
     } else {
-      long timeInMillis = instant.getEpochSecond();
+      long timeInMillis = instant.toEpochMilli();
       sb.append(new JsonPrimitive(timeInMillis));
     }
 

redis-om-spring/src/main/java/com/redis/om/spring/serialization/gson/InstantTypeAdapter.java

@@ -9,14 +9,14 @@ public class InstantTypeAdapter implements JsonSerializer<Instant>, JsonDeserial
 
   @Override
   public JsonElement serialize(Instant instant, Type typeOfSrc, JsonSerializationContext context) {
-    long timeInMillis = instant.getEpochSecond();
+    long timeInMillis = instant.toEpochMilli();
     return new JsonPrimitive(timeInMillis);
   }
 
   @Override
   public Instant deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
       throws JsonParseException {
-    return Instant.ofEpochSecond(json.getAsLong());
+    return Instant.ofEpochMilli(json.getAsLong());
   }
 
   public static InstantTypeAdapter getInstance() {

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

@@ -123,7 +123,7 @@ void testJSONSerialization() {
     String redisGeo = "33.62826024782707,-111.83592170193586";
 
     // Instant
-    long instantInMillis = instant.getEpochSecond();
+    long instantInMillis = instant.toEpochMilli();
 
     JsonObject rawJSON = ops.get(KitchenSink.class.getName() + ":" + ks.getId(), JsonObject.class);
 

redis-om-spring/src/test/java/com/redis/om/spring/search/stream/EntityStreamsAggregationsDocsTest.java

@@ -867,7 +867,7 @@ void testCalculateTotalOrderValueandAverageOrderQuantity() {
     List<Triple<String,Double,Integer>> totalOrderQuanties = stream //
         .filter(PizzaOrder$.DATE.onOrAfter(Instant.parse("2020-01-30T00:00:00.00Z"))) //
         .filter(PizzaOrder$.DATE.before(Instant.parse("2022-01-30T00:00:00.00Z"))) //
-        .apply("timefmt(@date, '%Y-%m-%d') ", "_id") //
+        .apply("timefmt(@date / 1000, '%Y-%m-%d') ", "_id") //
         .apply("@price * @quantity", "total") //
         .groupBy(Alias.of("_id")) //
         .reduce(ReducerFunction.SUM,  "@total").as("totalOrderValue") //