Remove generic type parameter from PropertyQuery

Author: greenrobot

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ObjectBox Ltd. All rights reserved.
+ * Copyright 2017-2020 ObjectBox Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,10 +25,10 @@
  * (subject to change in a future version).
  */
 @SuppressWarnings("WeakerAccess") // WeakerAccess: allow inner class access without accessor
-public class PropertyQuery<T> {
-    final Query<T> query;
+public class PropertyQuery {
+    final Query<?> query;
     final long queryHandle;
-    final Property<T> property;
+    final Property<?> property;
     final int propertyId;
 
     boolean distinct;
@@ -41,7 +41,7 @@ public class PropertyQuery<T> {
     String nullValueString;
     long nullValueLong;
 
-    PropertyQuery(Query<T> query, Property<T> property) {
+    PropertyQuery(Query<?> query, Property<?> property) {
         this.query = query;
         queryHandle = query.handle;
         this.property = property;
@@ -97,7 +97,7 @@ native String nativeFindString(long handle, long cursorHandle, int propertyId, b
     native long nativeCount(long handle, long cursorHandle, int propertyId, boolean distinct);
 
     /** Clears all values (e.g. distinct and null value). */
-    public PropertyQuery<T> reset() {
+    public PropertyQuery reset() {
         distinct = false;
         noCaseIfDistinct = true;
         unique = false;
@@ -115,7 +115,7 @@ public PropertyQuery<T> reset() {
      * Note: strings default to case-insensitive comparision;
      * to change that call {@link #distinct(QueryBuilder.StringOrder)}.
      */
-    public PropertyQuery<T> distinct() {
+    public PropertyQuery distinct() {
         distinct = true;
         return this;
     }
@@ -124,7 +124,7 @@ public PropertyQuery<T> distinct() {
      * For string properties you can specify {@link io.objectbox.query.QueryBuilder.StringOrder#CASE_SENSITIVE} if you
      * want to have case sensitive distinct values (e.g. returning "foo","Foo","FOO" instead of "foo").
      */
-    public PropertyQuery<T> distinct(QueryBuilder.StringOrder stringOrder) {
+    public PropertyQuery distinct(QueryBuilder.StringOrder stringOrder) {
         if (property.type != String.class) {
             throw new RuntimeException("Reserved for string properties, but got " + property);
         }
@@ -142,7 +142,7 @@ public PropertyQuery<T> distinct(QueryBuilder.StringOrder stringOrder) {
      * <p>
      * Will be ignored for find methods returning multiple values, e.g. {@link #findInts()}.
      */
-    public PropertyQuery<T> unique() {
+    public PropertyQuery unique() {
         unique = true;
         return this;
     }
@@ -152,7 +152,7 @@ public PropertyQuery<T> unique() {
      * However, using this function, you can define an alternative value that will be returned for null values.
      * E.g. -1 for ins/longs or "NULL" for strings.
      */
-    public PropertyQuery<T> nullValue(Object nullValue) {
+    public PropertyQuery nullValue(Object nullValue) {
         //noinspection ConstantConditions Annotation can not enforce non-null.
         if (nullValue == null) {
             throw new IllegalArgumentException("Null values are not allowed");

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 ObjectBox Ltd. All rights reserved.
+ * Copyright 2017-2020 ObjectBox Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -267,8 +267,8 @@ public LazyList<T> findLazy() {
      *
      * @param property the property for which to return values
      */
-    public PropertyQuery<T> property(Property<T> property) {
-        return new PropertyQuery<>(this, property);
+    public PropertyQuery property(Property<T> property) {
+        return new PropertyQuery(this, property);
     }
 
     <R> R callInReadTx(Callable<R> callable) {

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

@@ -161,7 +161,7 @@ public void testFindStrings_wrongPropertyType() {
     @Test
     public void testFindString() {
         Query<TestEntity> query = box.query().greater(simpleLong, 1002).build();
-        PropertyQuery<TestEntity> propertyQuery = query.property(simpleString);
+        PropertyQuery propertyQuery = query.property(simpleString);
         assertNull(propertyQuery.findString());
         assertNull(propertyQuery.reset().unique().findString());
         putTestEntities(5);
@@ -457,7 +457,7 @@ public void testFindShorts_wrongPropertyType() {
     @Test
     public void testCount() {
         Query<TestEntity> query = box.query().build();
-        PropertyQuery<TestEntity> stringQuery = query.property(simpleString);
+        PropertyQuery stringQuery = query.property(simpleString);
 
         assertEquals(0, stringQuery.count());
 
@@ -831,16 +831,16 @@ public void sumDouble_NaN() {
     public void testAggregates() {
         putTestEntitiesScalars();
         Query<TestEntity> query = box.query().less(simpleInt, 2002).build(); // 2 results.
-        PropertyQuery<TestEntity> booleanQuery = query.property(simpleBoolean);
-        PropertyQuery<TestEntity> byteQuery = query.property(simpleByte);
-        PropertyQuery<TestEntity> shortQuery = query.property(simpleShort);
-        PropertyQuery<TestEntity> intQuery = query.property(simpleInt);
-        PropertyQuery<TestEntity> longQuery = query.property(simpleLong);
-        PropertyQuery<TestEntity> floatQuery = query.property(simpleFloat);
-        PropertyQuery<TestEntity> doubleQuery = query.property(simpleDouble);
-        PropertyQuery<TestEntity> shortUQuery = query.property(simpleShortU);
-        PropertyQuery<TestEntity> intUQuery = query.property(simpleIntU);
-        PropertyQuery<TestEntity> longUQuery = query.property(simpleLongU);
+        PropertyQuery booleanQuery = query.property(simpleBoolean);
+        PropertyQuery byteQuery = query.property(simpleByte);
+        PropertyQuery shortQuery = query.property(simpleShort);
+        PropertyQuery intQuery = query.property(simpleInt);
+        PropertyQuery longQuery = query.property(simpleLong);
+        PropertyQuery floatQuery = query.property(simpleFloat);
+        PropertyQuery doubleQuery = query.property(simpleDouble);
+        PropertyQuery shortUQuery = query.property(simpleShortU);
+        PropertyQuery intUQuery = query.property(simpleIntU);
+        PropertyQuery longUQuery = query.property(simpleLongU);
         // avg
         assertEquals(0.5, booleanQuery.avg(), 0.0001);
         assertEquals(-37.5, byteQuery.avg(), 0.0001);