Query: add missing type parameters, fix docs, resolve warnings.

Author: greenrobot-team

objectbox-java/src/main/java/io/objectbox/query/Query.java

@@ -53,7 +53,7 @@ public class Query<T> {
 
     native Object nativeFindUnique(long handle, long cursorHandle);
 
-    native List nativeFind(long handle, long cursorHandle, long offset, long limit);
+    native List<T> nativeFind(long handle, long cursorHandle, long offset, long limit) throws Exception;
 
     native long[] nativeFindIds(long handle, long cursorHandle, long offset, long limit);
 
@@ -95,7 +95,7 @@ native void nativeSetParameter(long handle, int entityId, int propertyId, @Nulla
     private final QueryFilter<T> filter;
     private final Comparator<T> comparator;
     private final int queryAttempts;
-    private final int initialRetryBackOffInMs = 10;
+    private static final int INITIAL_RETRY_BACK_OFF_IN_MS = 10;
 
     long handle;
 
@@ -111,6 +111,10 @@ native void nativeSetParameter(long handle, int entityId, int propertyId, @Nulla
         this.comparator = comparator;
     }
 
+    /**
+     * Explicitly call {@link #close()} instead.
+     */
+    @SuppressWarnings("deprecation") // finalize()
     @Override
     protected void finalize() throws Throwable {
         close();
@@ -218,8 +222,8 @@ public List<T> find(final long offset, final long limit) {
         ensureNoFilterNoComparator();
         return callInReadTx(new Callable<List<T>>() {
             @Override
-            public List<T> call() {
-                List entities = nativeFind(handle, cursorHandle(), offset, limit);
+            public List<T> call() throws Exception {
+                List<T> entities = nativeFind(handle, cursorHandle(), offset, limit);
                 resolveEagerRelations(entities);
                 return entities;
             }
@@ -230,7 +234,7 @@ public List<T> call() {
      * Very efficient way to get just the IDs without creating any objects. IDs can later be used to lookup objects
      * (lookups by ID are also very efficient in ObjectBox).
      * <p>
-     * Note: a filter set with {@link QueryBuilder#filter} will be silently ignored!
+     * Note: a filter set with {@link QueryBuilder#filter(QueryFilter)} will be silently ignored!
      */
     @Nonnull
     public long[] findIds() {
@@ -240,7 +244,7 @@ public long[] findIds() {
     /**
      * Like {@link #findIds()} but with a offset/limit param, e.g. for pagination.
      * <p>
-     * Note: a filter set with {@link QueryBuilder#filter} will be silently ignored!
+     * Note: a filter set with {@link QueryBuilder#filter(QueryFilter)} will be silently ignored!
      */
     @Nonnull
     public long[] findIds(final long offset, final long limit) {
@@ -275,7 +279,7 @@ public PropertyQuery property(Property property) {
     }
 
     <R> R callInReadTx(Callable<R> callable) {
-        return store.callInReadTxWithRetry(callable, queryAttempts, initialRetryBackOffInMs, true);
+        return store.callInReadTxWithRetry(callable, queryAttempts, INITIAL_RETRY_BACK_OFF_IN_MS, true);
     }
 
     /**
@@ -326,37 +330,38 @@ public LazyList<T> findLazyCached() {
         return new LazyList<>(box, findIds(), true);
     }
 
-    void resolveEagerRelations(List entities) {
+    void resolveEagerRelations(List<T> entities) {
         if (eagerRelations != null) {
             int entityIndex = 0;
-            for (Object entity : entities) {
+            for (T entity : entities) {
                 resolveEagerRelationForNonNullEagerRelations(entity, entityIndex);
                 entityIndex++;
             }
         }
     }
 
     /** Note: no null check on eagerRelations! */
-    void resolveEagerRelationForNonNullEagerRelations(@Nonnull Object entity, int entityIndex) {
+    void resolveEagerRelationForNonNullEagerRelations(@Nonnull T entity, int entityIndex) {
         for (EagerRelation eagerRelation : eagerRelations) {
             if (eagerRelation.limit == 0 || entityIndex < eagerRelation.limit) {
                 resolveEagerRelation(entity, eagerRelation);
             }
         }
     }
 
-    void resolveEagerRelation(@Nullable Object entity) {
+    void resolveEagerRelation(@Nullable T entity) {
         if (eagerRelations != null && entity != null) {
             for (EagerRelation eagerRelation : eagerRelations) {
                 resolveEagerRelation(entity, eagerRelation);
             }
         }
     }
 
-    void resolveEagerRelation(@Nonnull Object entity, EagerRelation eagerRelation) {
+    void resolveEagerRelation(@Nonnull T entity, EagerRelation eagerRelation) {
         if (eagerRelations != null) {
             RelationInfo relationInfo = eagerRelation.relationInfo;
             if (relationInfo.toOneGetter != null) {
+                //noinspection unchecked Can't know target entity type.
                 ToOne toOne = relationInfo.toOneGetter.getToOne(entity);
                 if (toOne != null) {
                     toOne.getTarget();
@@ -365,8 +370,10 @@ void resolveEagerRelation(@Nonnull Object entity, EagerRelation eagerRelation) {
                 if (relationInfo.toManyGetter == null) {
                     throw new IllegalStateException("Relation info without relation getter: " + relationInfo);
                 }
+                //noinspection unchecked Can't know target entity type.
                 List toMany = relationInfo.toManyGetter.getToMany(entity);
                 if (toMany != null) {
+                    //noinspection ResultOfMethodCallIgnored Triggers fetching target entities.
                     toMany.size();
                 }
             }