PropertyQuery: added findShorts, findChars, findFloats, findDoubles

Author: greenrobot

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

@@ -125,6 +125,44 @@ public int[] call() {
         });
     }
 
+    /**
+     * Find the values for the given int property for objects matching the query.
+     * <p>
+     * Note: null values are excluded from results.
+     * <p>
+     * Note: results are not guaranteed to be in any particular order.
+     * <p>
+     * See also: {@link #distinct}
+     */
+    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);
+            }
+        });
+    }
+
+    /**
+     * Find the values for the given int property for objects matching the query.
+     * <p>
+     * Note: null values are excluded from results.
+     * <p>
+     * Note: results are not guaranteed to be in any particular order.
+     * <p>
+     * See also: {@link #distinct}
+     */
+    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);
+            }
+        });
+    }
+
     /**
      * Find the values for the given byte property for objects matching the query.
      * <p>
@@ -142,4 +180,42 @@ public byte[] call() {
         });
     }
 
+    /**
+     * Find the values for the given int property for objects matching the query.
+     * <p>
+     * Note: null values are excluded from results.
+     * <p>
+     * Note: results are not guaranteed to be in any particular order.
+     * <p>
+     * See also: {@link #distinct}
+     */
+    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);
+            }
+        });
+    }
+
+    /**
+     * Find the values for the given int property for objects matching the query.
+     * <p>
+     * Note: null values are excluded from results.
+     * <p>
+     * Note: results are not guaranteed to be in any particular order.
+     * <p>
+     * See also: {@link #distinct}
+     */
+    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);
+            }
+        });
+    }
+
 }

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

@@ -66,8 +66,16 @@ native String[] nativeFindStrings(long handle, long cursorHandle, int propertyId
 
     native int[] nativeFindInts(long handle, long cursorHandle, int propertyId, boolean distinct);
 
+    native short[] nativeFindShorts(long handle, long cursorHandle, int propertyId, boolean distinct);
+
+    native char[] nativeFindChars(long handle, long cursorHandle, int propertyId, boolean distinct);
+
     native byte[] nativeFindBytes(long handle, long cursorHandle, int propertyId, boolean distinct);
 
+    native float[] nativeFindFloats(long handle, long cursorHandle, int propertyId, boolean distinct);
+
+    native double[] nativeFindDoubles(long handle, long cursorHandle, int propertyId, boolean distinct);
+
     native long nativeCount(long handle, long cursorHandle);
 
     native long nativeSum(long handle, long cursorHandle, int propertyId);

tests/objectbox-java-test/src/main/java/io/objectbox/query/QueryPropertiesTest.java

@@ -120,6 +120,59 @@ public void testFindInts() {
         assertEquals(1, query.property(simpleInt).distinct().findInts().length);
     }
 
+    @Test
+    public void testFindShorts() {
+        putTestEntities(5);
+        Query<TestEntity> query = box.query().greater(simpleInt, 2).build();
+        short[] result = query.property(simpleShort).findShorts() ;
+        assertEquals(3, result.length);
+        assertEquals(103, result[0]);
+        assertEquals(104, result[1]);
+        assertEquals(105, result[2]);
+
+        putTestEntity(null, 5);
+
+        query = box.query().greater(simpleInt, 4).build();
+        assertEquals(2, query.property(simpleShort).findShorts().length);
+        assertEquals(1, query.property(simpleShort).distinct().findShorts().length);
+    }
+
+    // TODO @Test for findChars (no char property in entity)
+
+    @Test
+    public void testFindFloats() {
+        putTestEntities(5);
+        Query<TestEntity> query = box.query().greater(simpleInt, 2).build();
+        float[] result = query.property(simpleFloat).findFloats() ;
+        assertEquals(3, result.length);
+        assertEquals(200.3f, result[0], 0.0001f);
+        assertEquals(200.4f, result[1], 0.0001f);
+        assertEquals(200.5f, result[2], 0.0001f);
+
+        putTestEntity(null, 5);
+
+        query = box.query().greater(simpleInt, 4).build();
+        assertEquals(2, query.property(simpleFloat).findFloats().length);
+        assertEquals(1, query.property(simpleFloat).distinct().findFloats().length);
+    }
+
+    @Test
+    public void testFindDoubles() {
+        putTestEntities(5);
+        Query<TestEntity> query = box.query().greater(simpleInt, 2).build();
+        double[] result = query.property(simpleDouble).findDoubles() ;
+        assertEquals(3, result.length);
+        assertEquals(2000.03, result[0], 0.0001);
+        assertEquals(2000.04, result[1], 0.0001);
+        assertEquals(2000.05, result[2], 0.0001);
+
+        putTestEntity(null, 5);
+
+        query = box.query().greater(simpleInt, 4).build();
+        assertEquals(2, query.property(simpleDouble).findDoubles().length);
+        assertEquals(1, query.property(simpleDouble).distinct().findDoubles().length);
+    }
+
     @Test
     public void testFindBytes() {
         putTestEntities(5);
@@ -143,6 +196,18 @@ public void testFindLongs_wrongPropertyType() {
         box.query().build().property(simpleInt).findLongs();
     }
 
+    @Test(expected = IllegalArgumentException.class)
+    public void testFindInts_wrongPropertyType() {
+        putTestEntitiesStrings();
+        box.query().build().property(simpleLong).findInts();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testFindShorts_wrongPropertyType() {
+        putTestEntitiesStrings();
+        box.query().build().property(simpleInt).findShorts();
+    }
+
     private List<TestEntity> putTestEntitiesScalars() {
         return putTestEntities(10, null, 2000);
     }