Enable Metamodel Fields Generation for Non-Indexed Fields (resolves gh-327)

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

@@ -0,0 +1,9 @@
+package com.redis.om.spring.annotations;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.FIELD, ElementType.ANNOTATION_TYPE })
+public @interface Metamodel {
+}

redis-om-spring/src/main/java/com/redis/om/spring/metamodel/MetamodelGenerator.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.function.Function;
 import java.util.stream.Collectors;
@@ -317,7 +318,7 @@ else if (Number.class.isAssignableFrom(targetCls)) {
                 // Any Date/Time Types
                 //
                 else if ((targetCls == LocalDateTime.class) || (targetCls == LocalDate.class) //
-                        || (targetCls == Date.class) || (targetCls == Instant.class)) {
+                        || (targetCls == Date.class) || (targetCls == Instant.class) || (targetCls == OffsetDateTime.class)) {
                     targetInterceptor = DateField.class;
                 }
                 //
@@ -362,8 +363,10 @@ else if (targetCls == Boolean.class) {
                 searchSchemaAlias = indexed.alias();
             }
         } else {
+            var metamodel = field.getAnnotation(Metamodel.class);
             try {
                 targetCls = ClassUtils.forName(cls, MetamodelGenerator.class.getClassLoader());
+
                 //
                 // Any Character class
                 //
@@ -381,7 +384,7 @@ else if (targetCls == Boolean.class) {
                 //
                 else if (Number.class.isAssignableFrom(targetCls) || (targetCls == LocalDateTime.class)
                         || (targetCls == LocalDate.class) || (targetCls == Date.class)
-                        || (targetCls == Instant.class)) {
+                        || (targetCls == Instant.class) || (targetCls == OffsetDateTime.class)) {
                     targetInterceptor = NonIndexedNumericField.class;
                 }
                 //
@@ -397,8 +400,12 @@ else if (targetCls == Point.class) {
                     targetInterceptor = NonIndexedGeoField.class;
                 }
             } catch (ClassNotFoundException cnfe) {
-                messager.printMessage(Diagnostic.Kind.WARNING,
-                        "Processing class " + entityName + " could not resolve " + cls);
+                if (metamodel != null) {
+                  messager.printMessage(Kind.NOTE,
+                      "Processing class " + entityName + ", generating nested class " + cls
+                        + " metamodel (@Metamodel)");
+                  fieldMetamodelSpec.addAll(processNestedIndexableFields(entity, chain));
+                }
             }
         }
 
@@ -539,8 +546,9 @@ private List<Triple<ObjectGraphFieldSpec, FieldSpec, CodeBlock>> processNestedIn
         enclosedFields.forEach((field, getter) -> {
             boolean fieldIsIndexed = (field.getAnnotation(Indexed.class) != null)
                     || (field.getAnnotation(Searchable.class) != null);
+            boolean generateMetamodel = field.getAnnotation(Metamodel.class) != null;
 
-            if (fieldIsIndexed) {
+            if (fieldIsIndexed || generateMetamodel) {
                 List<Element> newChain = new ArrayList<>(chain);
                 newChain.add(field);
                 fieldMetamodels.addAll(processFieldMetamodel(entity, entityFieldName, newChain));
@@ -705,7 +713,7 @@ private Triple<ObjectGraphFieldSpec, FieldSpec, CodeBlock> generateFieldMetamode
                 .builder(interceptor, fieldAccessor).addModifiers(Modifier.PUBLIC, Modifier.STATIC) //
                 .build();
 
-        String alias = "";
+        String alias;
         if (!isEmpty(searchSchemaAlias)) {
             alias = searchSchemaAlias;
         } else {

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

@@ -344,15 +344,7 @@ private List<T> toResultTuple(List<E> entities, String[] returnFields) {
     entities.forEach(entity -> {
       List<Object> mappedResults = new ArrayList<>();
       returning.forEach(foi -> {
-        String getterName = "get" + ObjectUtils.ucfirst(foi.getSearchAlias());
-        Method getter = ReflectionUtils.findMethod(entitySearchStream.getEntityClass(), getterName);
-        // No "getXXX", maybe there is a "isXXX"
-        if (getter == null) {
-          getterName = "is" + ObjectUtils.ucfirst(foi.getSearchAlias());
-          getter = ReflectionUtils.findMethod(entitySearchStream.getEntityClass(), getterName);
-        }
-        //TODO: if getter is still null then field access?
-        mappedResults.add(ReflectionUtils.invokeMethod(getter, entity));
+        mappedResults.add(ObjectUtils.getValueByPath(entity, foi.getJSONPath()));
       });
 
       if (returning.size() > 1) {

redis-om-spring/src/main/java/com/redis/om/spring/util/ObjectUtils.java

@@ -177,7 +177,7 @@ public static String ucfirst(String input) {
   public static String withFirst(String input, Function<Character, String> callback) {
     if (input == null) {
       return null;
-    } else if (input.length() == 0) {
+    } else if (input.isEmpty()) {
       return "";
     } else {
       return String.join("", callback.apply(input.charAt(0)), input.subSequence(1, input.length()));
@@ -226,7 +226,7 @@ public static String toUnderscoreSeparated(final String javaName) {
     final String input = unQuote(javaName.trim());
     for (int i = 0; i < input.length(); i++) {
       final char c = input.charAt(i);
-      if (result.length() == 0) {
+      if (result.isEmpty()) {
         result.append(Character.toLowerCase(c));
       } else if (Character.isUpperCase(c)) {
         result.append("_").append(Character.toLowerCase(c));
@@ -540,7 +540,6 @@ public static Object getValueByPath(Object target, String path) {
 
     if (!hasNestedObject) {
       safeSpelPath = safeSpelPath //
-          .replace(".", "?.") //
           .replace("[*]", "") //
           .replace(".", "?.");
 

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

@@ -0,0 +1,25 @@
+package com.redis.om.spring.annotations.document.fixtures;
+
+import com.redis.om.spring.annotations.Document;
+import com.redis.om.spring.annotations.Indexed;
+import com.redis.om.spring.annotations.Metamodel;
+import lombok.*;
+import org.springframework.data.annotation.Id;
+
+@Data
+@RequiredArgsConstructor(staticName = "of")
+@NoArgsConstructor
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@Document
+public class DeepNestNonIndexed {
+  @Id
+  private String id;
+
+  @NonNull
+  @Indexed
+  private String name;
+
+  @NonNull
+  @Metamodel
+  private NestLevelNonIndexed1 nestLevel1;
+}

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

@@ -0,0 +1,8 @@
+package com.redis.om.spring.annotations.document.fixtures;
+
+import com.redis.om.spring.repository.RedisDocumentRepository;
+
+import java.util.Optional;
+
+@SuppressWarnings("unused") public interface DeepNestNonIndexedRepository extends RedisDocumentRepository<DeepNestNonIndexed, String> {
+}

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

@@ -0,0 +1,24 @@
+package com.redis.om.spring.annotations.document.fixtures;
+
+import com.redis.om.spring.annotations.Indexed;
+import com.redis.om.spring.annotations.Metamodel;
+import com.redis.om.spring.annotations.Searchable;
+import lombok.Data;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+@Data
+@RequiredArgsConstructor(staticName = "of")
+public class NestLevelNonIndexed1 {
+  @NonNull
+  @Metamodel
+  private String name;
+
+  @NonNull
+  @Metamodel
+  private String block;
+
+  @NonNull
+  @Metamodel
+  private NestLevelNonIndexed2 nestLevel2;
+}

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

@@ -0,0 +1,20 @@
+package com.redis.om.spring.annotations.document.fixtures;
+
+import com.redis.om.spring.annotations.Indexed;
+import com.redis.om.spring.annotations.Metamodel;
+import com.redis.om.spring.annotations.Searchable;
+import lombok.Data;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+@Data
+@RequiredArgsConstructor(staticName = "of")
+public class NestLevelNonIndexed2 {
+  @NonNull
+  @Metamodel
+  private String name;
+
+  @NonNull
+  @Metamodel
+  private String block;
+}