Merge branch 'housekeeping' into 'dev'

Housekeeping

See merge request objectbox/objectbox-java!29

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);
 
@@ -90,29 +90,31 @@ native void nativeSetParameter(long handle, int entityId, int propertyId, @Nulla
 
     final Box<T> box;
     private final BoxStore store;
-    private final boolean hasOrder;
     private final QueryPublisher<T> publisher;
     private final List<EagerRelation> eagerRelations;
     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;
 
-    Query(Box<T> box, long queryHandle, boolean hasOrder, List<EagerRelation> eagerRelations, QueryFilter<T> filter,
+    Query(Box<T> box, long queryHandle, List<EagerRelation> eagerRelations, QueryFilter<T> filter,
           Comparator<T> comparator) {
         this.box = box;
         store = box.getStore();
         queryAttempts = store.internalQueryAttempts();
         handle = queryHandle;
-        this.hasOrder = hasOrder;
         publisher = new QueryPublisher<>(this, box);
         this.eagerRelations = eagerRelations;
         this.filter = filter;
         this.comparator = comparator;
     }
 
+    /**
+     * Explicitly call {@link #close()} instead.
+     */
+    @SuppressWarnings("deprecation") // finalize()
     @Override
     protected void finalize() throws Throwable {
         close();
@@ -220,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;
             }
@@ -232,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() {
@@ -242,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) {
@@ -277,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);
     }
 
     /**
@@ -328,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();
@@ -367,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();
                 }
             }

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

@@ -28,6 +28,8 @@
 import io.objectbox.annotation.apihint.Internal;
 import io.objectbox.relation.RelationInfo;
 
+import javax.annotation.Nullable;
+
 /**
  * With QueryBuilder you define custom queries returning matching entities. Using the methods of this class you can
  * select (filter) results for specific data (for example #{@link #equal(Property, String)} and
@@ -91,8 +93,6 @@ enum Operator {
 
     private long handle;
 
-    private boolean hasOrder;
-
     private long lastCondition;
     private Operator combineNextWith = Operator.NONE;
 
@@ -190,6 +190,10 @@ private QueryBuilder(long storeHandle, long subQueryBuilderHandle) {
         isSubQuery = true;
     }
 
+    /**
+     * Explicitly call {@link #close()} instead.
+     */
+    @SuppressWarnings("deprecation") // finalize()
     @Override
     protected void finalize() throws Throwable {
         close();
@@ -215,7 +219,7 @@ public Query<T> build() {
             throw new IllegalStateException("Incomplete logic condition. Use or()/and() between two conditions only.");
         }
         long queryHandle = nativeBuild(handle);
-        Query<T> query = new Query<>(box, queryHandle, hasOrder, eagerRelations, filter, comparator);
+        Query<T> query = new Query<>(box, queryHandle, eagerRelations, filter, comparator);
         close();
         return query;
     }
@@ -281,7 +285,6 @@ public QueryBuilder<T> order(Property<T> property, int flags) {
                     "An operator is pending. Use operators like and() and or() only between two conditions.");
         }
         nativeOrder(handle, property.getId(), flags);
-        hasOrder = true;
         return this;
     }
 
@@ -368,7 +371,7 @@ public QueryBuilder<T> eager(RelationInfo relationInfo, RelationInfo... more) {
      * @param relationInfo The relation as found in the generated meta info class ("EntityName_") of class T.
      * @param more         Supply further relations to be eagerly loaded.
      */
-    public QueryBuilder<T> eager(int limit, RelationInfo relationInfo, RelationInfo... more) {
+    public QueryBuilder<T> eager(int limit, RelationInfo relationInfo, @Nullable RelationInfo... more) {
         verifyNotSubQuery();
         if (eagerRelations == null) {
             eagerRelations = new ArrayList<>();

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

@@ -35,7 +35,7 @@ class QueryPublisher<T> implements DataPublisher<List<T>> {
 
     private final Query<T> query;
     private final Box<T> box;
-    private final Set<DataObserver<List<T>>> observers = new CopyOnWriteArraySet();
+    private final Set<DataObserver<List<T>>> observers = new CopyOnWriteArraySet<>();
 
     private DataObserver<Class<T>> objectClassObserver;
     private DataSubscription objectClassSubscription;

tests/objectbox-java-test/src/test/java/io/objectbox/query/QueryObserverTest.java

@@ -91,8 +91,7 @@ public void testTransformer() throws InterruptedException {
         query.subscribe().transform(new DataTransformer<List<TestEntity>, Integer>() {
 
             @Override
-            @SuppressWarnings("NullableProblems")
-            public Integer transform(List<TestEntity> source) throws Exception {
+            public Integer transform(List<TestEntity> source) {
                 int sum = 0;
                 for (TestEntity entity : source) {
                     sum += entity.getSimpleInt();
@@ -118,8 +117,8 @@ public void onData(Integer data) {
         assertEquals(2003 + 2007 + 2002, (int) receivedSums.get(1));
     }
 
-    private List<TestEntity> putTestEntitiesScalars() {
-        return putTestEntities(10, null, 2000);
+    private void putTestEntitiesScalars() {
+        putTestEntities(10, null, 2000);
     }
 
     @Override