Add type parameters for all Property<T> usage.

- Note: Query.setParameter also works with link queries, so allow any Property type.

Author: greenrobot-team

objectbox-java/src/main/java/io/objectbox/Box.java

@@ -604,7 +604,7 @@ public Class<T> getEntityClass() {
     }
 
     @Internal
-    public List<T> internalGetBacklinkEntities(int entityId, Property relationIdProperty, long key) {
+    public List<T> internalGetBacklinkEntities(int entityId, Property<?> relationIdProperty, long key) {
         Cursor<T> reader = getReader();
         try {
             return reader.getBacklinkEntities(entityId, relationIdProperty, key);

objectbox-java/src/main/java/io/objectbox/BoxStore.java

@@ -220,7 +220,7 @@ public static boolean isObjectBrowserAvailable() {
                 entityTypeIdByClass.put(entityInfo.getEntityClass(), entityId);
                 classByEntityTypeId.put(entityId, entityInfo.getEntityClass());
                 propertiesByClass.put(entityInfo.getEntityClass(), entityInfo);
-                for (Property property : entityInfo.getAllProperties()) {
+                for (Property<?> property : entityInfo.getAllProperties()) {
                     if (property.customType != null) {
                         if (property.converterClass == null) {
                             throw new RuntimeException("No converter class for custom type of " + property);

objectbox-java/src/main/java/io/objectbox/Cursor.java

@@ -108,11 +108,11 @@ protected static native long collect004000(long cursor, long keyIfComplete, int
 
     native int nativePropertyId(long cursor, String propertyValue);
 
-    native List nativeGetBacklinkEntities(long cursor, int entityId, int propertyId, long key);
+    native List<T> nativeGetBacklinkEntities(long cursor, int entityId, int propertyId, long key);
 
     native long[] nativeGetBacklinkIds(long cursor, int entityId, int propertyId, long key);
 
-    native List nativeGetRelationEntities(long cursor, int sourceEntityId, int relationId, long key, boolean backlink);
+    native List<T> nativeGetRelationEntities(long cursor, int sourceEntityId, int relationId, long key, boolean backlink);
 
     native long[] nativeGetRelationIds(long cursor, int sourceEntityId, int relationId, long key, boolean backlink);
 
@@ -144,8 +144,8 @@ protected Cursor(Transaction tx, long cursor, EntityInfo<T> entityInfo, BoxStore
         this.entityInfo = entityInfo;
         this.boxStoreForEntities = boxStore;
 
-        Property[] allProperties = entityInfo.getAllProperties();
-        for (Property property : allProperties) {
+        Property<T>[] allProperties = entityInfo.getAllProperties();
+        for (Property<T> property : allProperties) {
             if (!property.isIdVerified()) {
                 int id = getPropertyId(property.dbName);
                 property.verifyId(id);
@@ -281,7 +281,7 @@ long internalHandle() {
     }
 
     @Internal
-    List<T> getBacklinkEntities(int entityId, Property relationIdProperty, long key) {
+    List<T> getBacklinkEntities(int entityId, Property<?> relationIdProperty, long key) {
         try {
             return nativeGetBacklinkEntities(cursor, entityId, relationIdProperty.getId(), key);
         } catch (IllegalArgumentException e) {
@@ -291,7 +291,7 @@ List<T> getBacklinkEntities(int entityId, Property relationIdProperty, long key)
     }
 
     @Internal
-    long[] getBacklinkIds(int entityId, Property relationIdProperty, long key) {
+    long[] getBacklinkIds(int entityId, Property<?> relationIdProperty, long key) {
         try {
             return nativeGetBacklinkIds(cursor, entityId, relationIdProperty.getId(), key);
         } catch (IllegalArgumentException e) {

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

@@ -25,10 +25,10 @@
  * (subject to change in a future version).
  */
 @SuppressWarnings("WeakerAccess") // WeakerAccess: allow inner class access without accessor
-public class PropertyQuery {
-    final Query query;
+public class PropertyQuery<T> {
+    final Query<T> query;
     final long queryHandle;
-    final Property property;
+    final Property<T> property;
     final int propertyId;
 
     boolean distinct;
@@ -41,7 +41,7 @@ public class PropertyQuery {
     String nullValueString;
     long nullValueLong;
 
-    PropertyQuery(Query query, Property property) {
+    PropertyQuery(Query<T> query, Property<T> 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 reset() {
+    public PropertyQuery<T> reset() {
         distinct = false;
         noCaseIfDistinct = true;
         unique = false;
@@ -115,7 +115,7 @@ public PropertyQuery reset() {
      * Note: strings default to case-insensitive comparision;
      * to change that call {@link #distinct(QueryBuilder.StringOrder)}.
      */
-    public PropertyQuery distinct() {
+    public PropertyQuery<T> distinct() {
         distinct = true;
         return this;
     }
@@ -124,7 +124,7 @@ public PropertyQuery 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 distinct(QueryBuilder.StringOrder stringOrder) {
+    public PropertyQuery<T> 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 distinct(QueryBuilder.StringOrder stringOrder) {
      * <p>
      * Will be ignored for find methods returning multiple values, e.g. {@link #findInts()}.
      */
-    public PropertyQuery unique() {
+    public PropertyQuery<T> unique() {
         unique = true;
         return this;
     }
@@ -152,7 +152,7 @@ public PropertyQuery 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 nullValue(Object nullValue) {
+    public PropertyQuery<T> nullValue(Object nullValue) {
         //noinspection ConstantConditions Annotation can not enforce non-null.
         if (nullValue == null) {
             throw new IllegalArgumentException("Null values are not allowed");
@@ -185,7 +185,7 @@ public PropertyQuery nullValue(Object nullValue) {
      * @return Found strings
      */
     public String[] findStrings() {
-        return (String[]) query.callInReadTx(() -> {
+        return query.callInReadTx(() -> {
             boolean distinctNoCase = distinct && noCaseIfDistinct;
             long cursorHandle = query.cursorHandle();
             return nativeFindStrings(queryHandle, cursorHandle, propertyId, distinct, distinctNoCase,
@@ -205,7 +205,7 @@ public String[] findStrings() {
      * @return Found longs
      */
     public long[] findLongs() {
-        return (long[]) query.callInReadTx(() ->
+        return query.callInReadTx(() ->
                 nativeFindLongs(queryHandle, query.cursorHandle(), propertyId, distinct, enableNull, nullValueLong)
         );
     }
@@ -220,7 +220,7 @@ public long[] findLongs() {
      * See also: {@link #distinct()}
      */
     public int[] findInts() {
-        return (int[]) query.callInReadTx(() ->
+        return query.callInReadTx(() ->
                 nativeFindInts(queryHandle, query.cursorHandle(), propertyId, distinct, enableNull, (int) nullValueLong)
         );
     }
@@ -235,7 +235,7 @@ public int[] findInts() {
      * See also: {@link #distinct()}
      */
     public short[] findShorts() {
-        return (short[]) query.callInReadTx(() ->
+        return query.callInReadTx(() ->
                 nativeFindShorts(queryHandle, query.cursorHandle(), propertyId, distinct, enableNull, (short) nullValueLong)
         );
     }
@@ -250,7 +250,7 @@ public short[] findShorts() {
      * See also: {@link #distinct()}
      */
     public char[] findChars() {
-        return (char[]) query.callInReadTx(() ->
+        return query.callInReadTx(() ->
                 nativeFindChars(queryHandle, query.cursorHandle(), propertyId, distinct, enableNull, (char) nullValueLong)
         );
     }
@@ -263,7 +263,7 @@ public char[] findChars() {
      * Note: results are not guaranteed to be in any particular order.
      */
     public byte[] findBytes() {
-        return (byte[]) query.callInReadTx(() ->
+        return query.callInReadTx(() ->
                 nativeFindBytes(queryHandle, query.cursorHandle(), propertyId, distinct, enableNull, (byte) nullValueLong)
         );
     }
@@ -278,7 +278,7 @@ public byte[] findBytes() {
      * See also: {@link #distinct()}
      */
     public float[] findFloats() {
-        return (float[]) query.callInReadTx(() ->
+        return query.callInReadTx(() ->
                 nativeFindFloats(queryHandle, query.cursorHandle(), propertyId, distinct, enableNull, nullValueFloat)
         );
     }
@@ -293,13 +293,13 @@ public float[] findFloats() {
      * See also: {@link #distinct()}
      */
     public double[] findDoubles() {
-        return (double[]) query.callInReadTx(() ->
+        return query.callInReadTx(() ->
                 nativeFindDoubles(queryHandle, query.cursorHandle(), propertyId, distinct, enableNull, nullValueDouble)
         );
     }
 
     public String findString() {
-        return (String) query.callInReadTx(() -> {
+        return query.callInReadTx(() -> {
             boolean distinctCase = distinct && !noCaseIfDistinct;
             return nativeFindString(queryHandle, query.cursorHandle(), propertyId, unique, distinct,
                     distinctCase, enableNull, nullValueString);
@@ -357,7 +357,7 @@ public Double findDouble() {
      * This is different from Java arithmetic where it would "wrap around" (e.g. max. value + 1 = min. value).
      */
     public long sum() {
-        return (Long) query.callInReadTx(
+        return query.callInReadTx(
                 () -> nativeSum(queryHandle, query.cursorHandle(), propertyId)
         );
     }
@@ -370,7 +370,7 @@ public long sum() {
      * @return 0 in case no elements matched the query
      */
     public double sumDouble() {
-        return (Double) query.callInReadTx(
+        return query.callInReadTx(
                 () -> nativeSumDouble(queryHandle, query.cursorHandle(), propertyId)
         );
     }
@@ -381,7 +381,7 @@ public double sumDouble() {
      * @return Long.MIN_VALUE in case no elements matched the query
      */
     public long max() {
-        return (Long) query.callInReadTx(
+        return query.callInReadTx(
                 () -> nativeMax(queryHandle, query.cursorHandle(), propertyId)
         );
     }
@@ -392,7 +392,7 @@ public long max() {
      * @return NaN in case no elements matched the query
      */
     public double maxDouble() {
-        return (Double) query.callInReadTx(
+        return query.callInReadTx(
                 () -> nativeMaxDouble(queryHandle, query.cursorHandle(), propertyId)
         );
     }
@@ -403,7 +403,7 @@ public double maxDouble() {
      * @return Long.MAX_VALUE in case no elements matched the query
      */
     public long min() {
-        return (Long) query.callInReadTx(
+        return query.callInReadTx(
                 () -> nativeMin(queryHandle, query.cursorHandle(), propertyId)
         );
     }
@@ -414,7 +414,7 @@ public long min() {
      * @return NaN in case no elements matched the query
      */
     public double minDouble() {
-        return (Double) query.callInReadTx(
+        return query.callInReadTx(
                 () -> nativeMinDouble(queryHandle, query.cursorHandle(), propertyId)
         );
     }
@@ -427,7 +427,7 @@ public double minDouble() {
      * @return NaN in case no elements matched the query
      */
     public double avg() {
-        return (Double) query.callInReadTx(
+        return query.callInReadTx(
                 () -> nativeAvg(queryHandle, query.cursorHandle(), propertyId)
         );
     }
@@ -440,7 +440,7 @@ public double avg() {
      * @return 0 in case no elements matched the query
      */
     public long avgLong() {
-        return (Long) query.callInReadTx(
+        return query.callInReadTx(
                 () -> nativeAvgLong(queryHandle, query.cursorHandle(), propertyId)
         );
     }
@@ -451,7 +451,7 @@ public long avgLong() {
      * See also: {@link #distinct()}
      */
     public long count() {
-        return (Long) query.callInReadTx(
+        return query.callInReadTx(
                 () -> nativeCount(queryHandle, query.cursorHandle(), propertyId, distinct)
         );
     }

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

@@ -267,8 +267,8 @@ public LazyList<T> findLazy() {
      *
      * @param property the property for which to return values
      */
-    public PropertyQuery property(Property property) {
-        return new PropertyQuery(this, property);
+    public PropertyQuery<T> property(Property<T> property) {
+        return new PropertyQuery<>(this, property);
     }
 
     <R> R callInReadTx(Callable<R> callable) {
@@ -380,7 +380,7 @@ public long count() {
     /**
      * Sets a parameter previously given to the {@link QueryBuilder} to a new value.
      */
-    public Query<T> setParameter(Property property, String value) {
+    public Query<T> setParameter(Property<?> property, String value) {
         nativeSetParameter(handle, property.getEntityId(), property.getId(), null, value);
         return this;
     }
@@ -398,7 +398,7 @@ public Query<T> setParameter(String alias, String value) {
     /**
      * Sets a parameter previously given to the {@link QueryBuilder} to a new value.
      */
-    public Query<T> setParameter(Property property, long value) {
+    public Query<T> setParameter(Property<?> property, long value) {
         nativeSetParameter(handle, property.getEntityId(), property.getId(), null, value);
         return this;
     }
@@ -416,7 +416,7 @@ public Query<T> setParameter(String alias, long value) {
     /**
      * Sets a parameter previously given to the {@link QueryBuilder} to a new value.
      */
-    public Query<T> setParameter(Property property, double value) {
+    public Query<T> setParameter(Property<?> property, double value) {
         nativeSetParameter(handle, property.getEntityId(), property.getId(), null, value);
         return this;
     }
@@ -436,7 +436,7 @@ public Query<T> setParameter(String alias, double value) {
      *
      * @throws NullPointerException if given date is null
      */
-    public Query<T> setParameter(Property property, Date value) {
+    public Query<T> setParameter(Property<?> property, Date value) {
         return setParameter(property, value.getTime());
     }
 
@@ -453,7 +453,7 @@ public Query<T> setParameter(String alias, Date value) {
     /**
      * Sets a parameter previously given to the {@link QueryBuilder} to a new value.
      */
-    public Query<T> setParameter(Property property, boolean value) {
+    public Query<T> setParameter(Property<?> property, boolean value) {
         return setParameter(property, value ? 1 : 0);
     }
 
@@ -469,7 +469,7 @@ public Query<T> setParameter(String alias, boolean value) {
     /**
      * Sets a parameter previously given to the {@link QueryBuilder} to new values.
      */
-    public Query<T> setParameters(Property property, long value1, long value2) {
+    public Query<T> setParameters(Property<?> property, long value1, long value2) {
         nativeSetParameters(handle, property.getEntityId(), property.getId(), null, value1, value2);
         return this;
     }
@@ -487,7 +487,7 @@ public Query<T> setParameters(String alias, long value1, long value2) {
     /**
      * Sets a parameter previously given to the {@link QueryBuilder} to new values.
      */
-    public Query<T> setParameters(Property property, int[] values) {
+    public Query<T> setParameters(Property<?> property, int[] values) {
         nativeSetParameters(handle, property.getEntityId(), property.getId(), null, values);
         return this;
     }
@@ -505,7 +505,7 @@ public Query<T> setParameters(String alias, int[] values) {
     /**
      * Sets a parameter previously given to the {@link QueryBuilder} to new values.
      */
-    public Query<T> setParameters(Property property, long[] values) {
+    public Query<T> setParameters(Property<?> property, long[] values) {
         nativeSetParameters(handle, property.getEntityId(), property.getId(), null, values);
         return this;
     }
@@ -523,7 +523,7 @@ public Query<T> setParameters(String alias, long[] values) {
     /**
      * Sets a parameter previously given to the {@link QueryBuilder} to new values.
      */
-    public Query<T> setParameters(Property property, double value1, double value2) {
+    public Query<T> setParameters(Property<?> property, double value1, double value2) {
         nativeSetParameters(handle, property.getEntityId(), property.getId(), null, value1, value2);
         return this;
     }
@@ -541,7 +541,7 @@ public Query<T> setParameters(String alias, double value1, double value2) {
     /**
      * Sets a parameter previously given to the {@link QueryBuilder} to new values.
      */
-    public Query<T> setParameters(Property property, String[] values) {
+    public Query<T> setParameters(Property<?> property, String[] values) {
         nativeSetParameters(handle, property.getEntityId(), property.getId(), null, values);
         return this;
     }
@@ -559,7 +559,7 @@ public Query<T> setParameters(String alias, String[] values) {
     /**
      * Sets a parameter previously given to the {@link QueryBuilder} to new values.
      */
-    public Query<T> setParameter(Property property, byte[] value) {
+    public Query<T> setParameter(Property<?> property, byte[] value) {
         nativeSetParameter(handle, property.getEntityId(), property.getId(), null, value);
         return this;
     }