fixed #101

Author: anidotnet

nitrite/src/main/java/org/dizitart/no2/util/ObjectUtils.java

@@ -38,6 +38,7 @@
 import static org.dizitart.no2.objects.filters.ObjectFilters.eq;
 import static org.dizitart.no2.util.ReflectionUtils.findAnnotations;
 import static org.dizitart.no2.util.ReflectionUtils.getField;
+import static org.dizitart.no2.util.ReflectionUtils.getFieldsUpto;
 import static org.dizitart.no2.util.StringUtils.isNullOrEmpty;
 import static org.dizitart.no2.util.ValidationUtils.notEmpty;
 import static org.dizitart.no2.util.ValidationUtils.notNull;
@@ -132,11 +133,11 @@ public static <T> Set<Index> extractIndices(NitriteMapper nitriteMapper, Class<T
      * @return the id field
      */
     public static <T> Field getIdField(NitriteMapper nitriteMapper, Class<T> type) {
-        Field[] fields;
+        List<Field> fields;
         if (type.isAnnotationPresent(InheritIndices.class)) {
-            fields = type.getFields();
+            fields = getFieldsUpto(type, Object.class);
         } else {
-            fields = type.getDeclaredFields();
+            fields = Arrays.asList(type.getDeclaredFields());
         }
 
         boolean alreadyIdFound = false;

nitrite/src/main/java/org/dizitart/no2/util/ReflectionUtils.java

@@ -20,7 +20,6 @@
 
 import lombok.experimental.UtilityClass;
 import org.dizitart.no2.exceptions.ValidationException;
-import org.dizitart.no2.objects.InheritIndices;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
@@ -58,7 +57,7 @@ public static List<Field> getFieldsUpto(Class<?> startClass, Class<?> exclusiveP
         filterSynthetics(currentClassFields);
         Class<?> parentClass = startClass.getSuperclass();
 
-        if (parentClass != null && (exclusiveParent == null || !(parentClass.equals(exclusiveParent)))) {
+        if (parentClass != null && !(parentClass.equals(exclusiveParent))) {
             List<Field> parentClassFields = getFieldsUpto(parentClass, exclusiveParent);
             currentClassFields.addAll(parentClassFields);
         }
@@ -125,8 +124,9 @@ static <T> Field getField(Class<T> type, String name, boolean recursive) {
                     break;
                 }
             }
+
             if (field == null && recursive) {
-                Field[] fields = type.getFields();
+                List<Field> fields = getFieldsUpto(type, Object.class);
                 for (Field recursiveField : fields) {
                     if (recursiveField.getName().equals(name)) {
                         field = recursiveField;

nitrite/src/test/java/org/dizitart/no2/objects/ObjectRepositoryTest.java

@@ -34,6 +34,7 @@
 
 import static org.dizitart.no2.DbTestOperations.getRandomTempDbFile;
 import static org.dizitart.no2.objects.filters.ObjectFilters.eq;
+import static org.dizitart.no2.objects.filters.ObjectFilters.text;
 import static org.junit.Assert.*;
 
 /**
@@ -223,5 +224,31 @@ public void testWithIdInheritance() {
         assertTrue(repository.hasIndex("id"));
         assertTrue(repository.hasIndex("date"));
         assertTrue(repository.hasIndex("text"));
+
+        ChildClass childClass = new ChildClass();
+        childClass.setName("first");
+        childClass.setDate(new Date(100000L));
+        childClass.setId(1L);
+        childClass.setText("I am first class");
+        repository.insert(childClass);
+
+        childClass = new ChildClass();
+        childClass.setName("seconds");
+        childClass.setDate(new Date(100001L));
+        childClass.setId(2L);
+        childClass.setText("I am second class");
+        repository.insert(childClass);
+
+        childClass = new ChildClass();
+        childClass.setName("third");
+        childClass.setDate(new Date(100002L));
+        childClass.setId(3L);
+        childClass.setText("I am third class");
+        repository.insert(childClass);
+
+        assertEquals(repository.find(text("text", "class")).size(), 3);
+        assertEquals(repository.find(text("text", "second")).size(), 0); // filtered in stop words
+        assertEquals(repository.find(eq("date", new Date(100000L))).size(), 1);
+        assertEquals(repository.find(eq("id", 1L)).size(), 1);
     }
 }

nitrite/src/test/java/org/dizitart/no2/objects/data/ChildClass.java

@@ -18,12 +18,16 @@
 
 package org.dizitart.no2.objects.data;
 
+import lombok.Getter;
+import lombok.Setter;
 import org.dizitart.no2.objects.InheritIndices;
 
 /**
  * @author Anindya Chatterjee
  */
+@Getter
+@Setter
 @InheritIndices
 public class ChildClass extends ParentClass {
-    public String name;
+    private String name;
 }

nitrite/src/test/java/org/dizitart/no2/objects/data/ParentClass.java

@@ -18,6 +18,8 @@
 
 package org.dizitart.no2.objects.data;
 
+import lombok.Getter;
+import lombok.Setter;
 import org.dizitart.no2.IndexType;
 import org.dizitart.no2.objects.Id;
 import org.dizitart.no2.objects.Index;
@@ -28,11 +30,13 @@
 /**
  * @author Anindya Chatterjee
  */
+@Getter
+@Setter
 @Indices(
         @Index(value = "date", type = IndexType.Unique)
 )
 public class ParentClass extends SuperDuperClass {
     @Id
-    public Long id;
-    public Date date;
+    protected Long id;
+    private Date date;
 }

nitrite/src/test/java/org/dizitart/no2/objects/data/SuperDuperClass.java

@@ -18,13 +18,17 @@
 
 package org.dizitart.no2.objects.data;
 
+import lombok.Getter;
+import lombok.Setter;
 import org.dizitart.no2.IndexType;
 import org.dizitart.no2.objects.Index;
 
 /**
  * @author Anindya Chatterjee
  */
+@Getter
+@Setter
 @Index(value = "text", type = IndexType.Fulltext)
 public class SuperDuperClass {
-    public String text;
+    private String text;
 }