Merge branch 'master' into dev

Author: greenrobot

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

@@ -30,7 +30,6 @@
 import io.objectbox.BoxStore;
 import io.objectbox.InternalAccess;
 import io.objectbox.Property;
-import io.objectbox.annotation.apihint.Beta;
 import io.objectbox.internal.CallWithHandle;
 import io.objectbox.reactive.DataObserver;
 import io.objectbox.reactive.DataSubscriptionList;
@@ -379,48 +378,6 @@ public Long call(long cursorHandle) {
         });
     }
 
-    /** @deprecated Use {@link #property(Property)} to get a {@link PropertyQuery} for aggregate functions. */
-    @Deprecated
-    public long sum(final Property property) {
-        return property(property).sum();
-    }
-
-    /** @deprecated Use {@link #property(Property)} to get a {@link PropertyQuery} for aggregate functions. */
-    @Deprecated
-    public double sumDouble(final Property property) {
-        return property(property).sumDouble();
-    }
-
-    /** @deprecated Use {@link #property(Property)} to get a {@link PropertyQuery} for aggregate functions. */
-    @Deprecated
-    public long max(final Property property) {
-        return property(property).max();
-    }
-
-    /** @deprecated Use {@link #property(Property)} to get a {@link PropertyQuery} for aggregate functions. */
-    @Deprecated
-    public double maxDouble(final Property property) {
-        return property(property).maxDouble();
-    }
-
-    /** @deprecated Use {@link #property(Property)} to get a {@link PropertyQuery} for aggregate functions. */
-    @Deprecated
-    public long min(final Property property) {
-        return property(property).min();
-    }
-
-    /** @deprecated Use {@link #property(Property)} to get a {@link PropertyQuery} for aggregate functions. */
-    @Deprecated
-    public double minDouble(final Property property) {
-        return property(property).minDouble();
-    }
-
-    /** @deprecated Use {@link #property(Property)} to get a {@link PropertyQuery} for aggregate functions. */
-    @Deprecated
-    public double avg(final Property property) {
-        return property(property).avg();
-    }
-
     /**
      * Sets a parameter previously given to the {@link QueryBuilder} to a new value.
      */

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

@@ -433,4 +433,31 @@ public void testCount() {
         assertEquals(6, stringQuery.distinct().count());
     }
 
+
+    @Test
+    public void testAggregates() {
+        putTestEntitiesScalars();
+        Query<TestEntity> query = box.query().less(simpleInt, 2002).build();
+        PropertyQuery intQuery = query.property(simpleInt);
+        PropertyQuery floatQuery = query.property(simpleFloat);
+        assertEquals(2000.5, intQuery.avg(), 0.0001);
+        assertEquals(2000, intQuery.min(), 0.0001);
+        assertEquals(400, floatQuery.minDouble(), 0.001);
+        assertEquals(2001, intQuery.max(), 0.0001);
+        assertEquals(400.1, floatQuery.maxDouble(), 0.001);
+        assertEquals(4001, intQuery.sum(), 0.0001);
+        assertEquals(800.1, floatQuery.sumDouble(), 0.001);
+    }
+
+    @Test
+    public void testSumDoubleOfFloats() {
+        TestEntity entity = new TestEntity();
+        entity.setSimpleFloat(0);
+        TestEntity entity2 = new TestEntity();
+        entity2.setSimpleFloat(-2.05f);
+        box.put(entity, entity2);
+        double sum = box.query().build().property(simpleFloat).sumDouble();
+        assertEquals(-2.05, sum, 0.0001);
+    }
+
 }

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

@@ -233,30 +233,6 @@ public void testOffsetLimit() {
         assertEquals(2005, list.get(1).getSimpleInt());
     }
 
-    @Test
-    public void testAggregates() {
-        putTestEntitiesScalars();
-        Query<TestEntity> query = box.query().less(simpleInt, 2002).build();
-        assertEquals(2000.5, query.avg(simpleInt), 0.0001);
-        assertEquals(2000, query.min(simpleInt), 0.0001);
-        assertEquals(400, query.minDouble(simpleFloat), 0.001);
-        assertEquals(2001, query.max(simpleInt), 0.0001);
-        assertEquals(400.1, query.maxDouble(simpleFloat), 0.001);
-        assertEquals(4001, query.sum(simpleInt), 0.0001);
-        assertEquals(800.1, query.sumDouble(simpleFloat), 0.001);
-    }
-
-    @Test
-    public void testSumDoubleOfFloats() {
-        TestEntity entity = new TestEntity();
-        entity.setSimpleFloat(0);
-        TestEntity entity2 = new TestEntity();
-        entity2.setSimpleFloat(-2.05f);
-        box.put(entity, entity2);
-        double sum = box.query().build().sumDouble(simpleFloat);
-        assertEquals(-2.05, sum, 0.0001);
-    }
-
     @Test
     public void testString() {
         List<TestEntity> entities = putTestEntitiesStrings();