added Query.cursorHandle()

Author: greenrobot

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

@@ -78,9 +78,9 @@ public String[] findStrings() {
         return (String[]) query.callInReadTx(new Callable<String[]>() {
             @Override
             public String[] call() {
-                long cursorHandle = InternalAccess.getActiveTxCursorHandle(query.box);
                 boolean distinctNoCase = distinct && noCaseIfDistinct;
-                return query.nativeFindStrings(query.handle, cursorHandle, property.id, distinct, distinctNoCase);
+                long cursorHandle = query.cursorHandle();
+                return query.nativeFindStrings(query.handle, cursorHandle, property.id, distinct,distinctNoCase);
             }
         });
     }
@@ -100,8 +100,7 @@ public long[] findLongs() {
         return (long[]) query.callInReadTx(new Callable<long[]>() {
             @Override
             public long[] call() {
-                long cursorHandle = InternalAccess.getActiveTxCursorHandle(query.box);
-                return query.nativeFindLongs(query.handle, cursorHandle, property.id, distinct);
+                return query.nativeFindLongs(query.handle, query.cursorHandle(), property.id, distinct);
             }
         });
     }
@@ -119,8 +118,7 @@ public int[] findInts() {
         return (int[]) query.callInReadTx(new Callable<int[]>() {
             @Override
             public int[] call() {
-                long cursorHandle = InternalAccess.getActiveTxCursorHandle(query.box);
-                return query.nativeFindInts(query.handle, cursorHandle, property.id, distinct);
+                return query.nativeFindInts(query.handle, query.cursorHandle(), property.id, distinct);
             }
         });
     }
@@ -138,8 +136,7 @@ public short[] findShorts() {
         return (short[]) query.callInReadTx(new Callable<short[]>() {
             @Override
             public short[] call() {
-                long cursorHandle = InternalAccess.getActiveTxCursorHandle(query.box);
-                return query.nativeFindShorts(query.handle, cursorHandle, property.id, distinct);
+                return query.nativeFindShorts(query.handle, query.cursorHandle(), property.id, distinct);
             }
         });
     }
@@ -157,8 +154,7 @@ public char[] findChars() {
         return (char[]) query.callInReadTx(new Callable<char[]>() {
             @Override
             public char[] call() {
-                long cursorHandle = InternalAccess.getActiveTxCursorHandle(query.box);
-                return query.nativeFindChars(query.handle, cursorHandle, property.id, distinct);
+                return query.nativeFindChars(query.handle, query.cursorHandle(), property.id, distinct);
             }
         });
     }
@@ -174,8 +170,7 @@ public byte[] findBytes() {
         return (byte[]) query.callInReadTx(new Callable<byte[]>() {
             @Override
             public byte[] call() {
-                long cursorHandle = InternalAccess.getActiveTxCursorHandle(query.box);
-                return query.nativeFindBytes(query.handle, cursorHandle, property.id, distinct);
+                return query.nativeFindBytes(query.handle, query.cursorHandle(), property.id, distinct);
             }
         });
     }
@@ -193,8 +188,7 @@ public float[] findFloats() {
         return (float[]) query.callInReadTx(new Callable<float[]>() {
             @Override
             public float[] call() {
-                long cursorHandle = InternalAccess.getActiveTxCursorHandle(query.box);
-                return query.nativeFindFloats(query.handle, cursorHandle, property.id, distinct);
+                return query.nativeFindFloats(query.handle, query.cursorHandle(), property.id, distinct);
             }
         });
     }
@@ -212,8 +206,7 @@ public double[] findDoubles() {
         return (double[]) query.callInReadTx(new Callable<double[]>() {
             @Override
             public double[] call() {
-                long cursorHandle = InternalAccess.getActiveTxCursorHandle(query.box);
-                return query.nativeFindDoubles(query.handle, cursorHandle, property.id, distinct);
+                return query.nativeFindDoubles(query.handle, query.cursorHandle(), property.id, distinct);
             }
         });
     }

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

@@ -147,6 +147,11 @@ public synchronized void close() {
         }
     }
 
+    /** To be called inside a read TX */
+    long cursorHandle() {
+        return InternalAccess.getActiveTxCursorHandle(box);
+    }
+
     /**
      * Find the first Object matching the query.
      */
@@ -157,7 +162,7 @@ public T findFirst() {
             @Override
             public T call() {
                 @SuppressWarnings("unchecked")
-                T entity = (T) nativeFindFirst(handle, InternalAccess.getActiveTxCursorHandle(box));
+                T entity = (T) nativeFindFirst(handle, cursorHandle());
                 resolveEagerRelation(entity);
                 return entity;
             }
@@ -191,7 +196,7 @@ public T findUnique() {
             @Override
             public T call() {
                 @SuppressWarnings("unchecked")
-                T entity = (T) nativeFindUnique(handle, InternalAccess.getActiveTxCursorHandle(box));
+                T entity = (T) nativeFindUnique(handle, cursorHandle());
                 resolveEagerRelation(entity);
                 return entity;
             }
@@ -206,8 +211,7 @@ public List<T> find() {
         return callInReadTx(new Callable<List<T>>() {
             @Override
             public List<T> call() throws Exception {
-                long cursorHandle = InternalAccess.getActiveTxCursorHandle(box);
-                List<T> entities = nativeFind(Query.this.handle, cursorHandle, 0, 0);
+                List<T> entities = nativeFind(Query.this.handle, cursorHandle(), 0, 0);
                 if (filter != null) {
                     Iterator<T> iterator = entities.iterator();
                     while (iterator.hasNext()) {
@@ -235,8 +239,7 @@ public List<T> find(final long offset, final long limit) {
         return callInReadTx(new Callable<List<T>>() {
             @Override
             public List<T> call() {
-                long cursorHandle = InternalAccess.getActiveTxCursorHandle(box);
-                List entities = nativeFind(handle, cursorHandle, offset, limit);
+                List entities = nativeFind(handle, cursorHandle(), offset, limit);
                 resolveEagerRelations(entities);
                 return entities;
             }