Merge branch 'fix-generic-type-usage' into 'dev'

Resolve generic type issues

See merge request objectbox/objectbox-java!60

Author: greenrobot-team

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

@@ -56,7 +56,7 @@ public class Box<T> {
 
     private final IdGetter<T> idGetter;
 
-    private EntityInfo entityInfo;
+    private EntityInfo<T> entityInfo;
     private volatile Field boxStoreField;
 
     Box(BoxStore store, Class<T> entityClass) {
@@ -339,7 +339,8 @@ public long put(T entity) {
     /**
      * Puts the given entities in a box using a single transaction.
      */
-    public void put(@Nullable T... entities) {
+    @SafeVarargs // Not using T... as Object[], no ClassCastException expected.
+    public final void put(@Nullable T... entities) {
         if (entities == null || entities.length == 0) {
             return;
         }
@@ -488,8 +489,9 @@ public boolean remove(T object) {
     /**
      * Removes (deletes) the given Objects in a single transaction.
      */
+    @SafeVarargs // Not using T... as Object[], no ClassCastException expected.
     @SuppressWarnings("Duplicates") // Detected duplicate has different type
-    public void remove(@Nullable T... objects) {
+    public final void remove(@Nullable T... objects) {
         if (objects == null || objects.length == 0) {
             return;
         }
@@ -560,7 +562,7 @@ public BoxStore getStore() {
         return store;
     }
 
-    public synchronized EntityInfo getEntityInfo() {
+    public synchronized EntityInfo<T> getEntityInfo() {
         if (entityInfo == null) {
             Cursor<T> reader = getReader();
             try {
@@ -604,7 +606,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

@@ -136,11 +136,11 @@ public static String getVersionNative() {
 
     /** @return entity ID */
     // TODO only use ids once we have them in Java
-    static native int nativeRegisterEntityClass(long store, String entityName, Class entityClass);
+    static native int nativeRegisterEntityClass(long store, String entityName, Class<?> entityClass);
 
     // TODO only use ids once we have them in Java
     static native void nativeRegisterCustomType(long store, int entityId, int propertyId, String propertyName,
-                                                Class<? extends PropertyConverter> converterClass, Class customType);
+                                                Class<? extends PropertyConverter> converterClass, Class<?> customType);
 
     static native String nativeDiagnose(long store);
 
@@ -164,12 +164,12 @@ public static boolean isObjectBrowserAvailable() {
     private final File directory;
     private final String canonicalPath;
     private final long handle;
-    private final Map<Class, String> dbNameByClass = new HashMap<>();
-    private final Map<Class, Integer> entityTypeIdByClass = new HashMap<>();
-    private final Map<Class, EntityInfo> propertiesByClass = new HashMap<>();
-    private final LongHashMap<Class> classByEntityTypeId = new LongHashMap<>();
+    private final Map<Class<?>, String> dbNameByClass = new HashMap<>();
+    private final Map<Class<?>, Integer> entityTypeIdByClass = new HashMap<>();
+    private final Map<Class<?>, EntityInfo<?>> propertiesByClass = new HashMap<>();
+    private final LongHashMap<Class<?>> classByEntityTypeId = new LongHashMap<>();
     private final int[] allEntityTypeIds;
-    private final Map<Class, Box> boxes = new ConcurrentHashMap<>();
+    private final Map<Class<?>, Box<?>> boxes = new ConcurrentHashMap<>();
     private final Set<Transaction> transactions = Collections.newSetFromMap(new WeakHashMap<>());
     private final ExecutorService threadPool = new ObjectBoxThreadPool(this);
     private final ObjectClassPublisher objectClassPublisher;
@@ -191,7 +191,7 @@ public static boolean isObjectBrowserAvailable() {
 
     private final int queryAttempts;
 
-    private final TxCallback failedReadTxAttemptCallback;
+    private final TxCallback<?> failedReadTxAttemptCallback;
 
     BoxStore(BoxStoreBuilder builder) {
         context = builder.context;
@@ -213,14 +213,14 @@ public static boolean isObjectBrowserAvailable() {
         }
         debugRelations = builder.debugRelations;
 
-        for (EntityInfo entityInfo : builder.entityInfoList) {
+        for (EntityInfo<?> entityInfo : builder.entityInfoList) {
             try {
                 dbNameByClass.put(entityInfo.getEntityClass(), entityInfo.getDbName());
                 int entityId = nativeRegisterEntityClass(handle, entityInfo.getDbName(), entityInfo.getEntityClass());
                 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);
@@ -333,24 +333,24 @@ private void checkOpen() {
         }
     }
 
-    String getDbName(Class entityClass) {
+    String getDbName(Class<?> entityClass) {
         return dbNameByClass.get(entityClass);
     }
 
-    Integer getEntityTypeId(Class entityClass) {
+    Integer getEntityTypeId(Class<?> entityClass) {
         return entityTypeIdByClass.get(entityClass);
     }
 
     @Internal
-    public int getEntityTypeIdOrThrow(Class entityClass) {
+    public int getEntityTypeIdOrThrow(Class<?> entityClass) {
         Integer id = entityTypeIdByClass.get(entityClass);
         if (id == null) {
             throw new DbSchemaException("No entity registered for " + entityClass);
         }
         return id;
     }
 
-    public Collection<Class> getAllEntityClasses() {
+    public Collection<Class<?>> getAllEntityClasses() {
         return dbNameByClass.keySet();
     }
 
@@ -360,17 +360,18 @@ int[] getAllEntityTypeIds() {
     }
 
     @Internal
-    Class getEntityClassOrThrow(int entityTypeId) {
-        Class clazz = classByEntityTypeId.get(entityTypeId);
+    Class<?> getEntityClassOrThrow(int entityTypeId) {
+        Class<?> clazz = classByEntityTypeId.get(entityTypeId);
         if (clazz == null) {
             throw new DbSchemaException("No entity registered for type ID " + entityTypeId);
         }
         return clazz;
     }
 
+    @SuppressWarnings("unchecked") // Casting is easier than writing a custom Map.
     @Internal
-    EntityInfo getEntityInfo(Class entityClass) {
-        return propertiesByClass.get(entityClass);
+    <T> EntityInfo<T> getEntityInfo(Class<T> entityClass) {
+        return (EntityInfo<T>) propertiesByClass.get(entityClass);
     }
 
     /**
@@ -608,7 +609,7 @@ void txCommitted(Transaction tx, @Nullable int[] entityTypeIdsAffected) {
             }
         }
 
-        for (Box box : boxes.values()) {
+        for (Box<?> box : boxes.values()) {
             box.txCommitted(tx);
         }
 
@@ -622,17 +623,17 @@ void txCommitted(Transaction tx, @Nullable int[] entityTypeIdsAffected) {
      * <p>
      * Creates a Box only once and then always returns the cached instance.
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("unchecked") // Casting is easier than writing a custom Map.
     public <T> Box<T> boxFor(Class<T> entityClass) {
-        Box box = boxes.get(entityClass);
+        Box<T> box = (Box<T>) boxes.get(entityClass);
         if (box == null) {
             if (!dbNameByClass.containsKey(entityClass)) {
                 throw new IllegalArgumentException(entityClass +
                         " is not a known entity. Please add it and trigger generation again.");
             }
             // Ensure a box is created just once
             synchronized (boxes) {
-                box = boxes.get(entityClass);
+                box = (Box<T>) boxes.get(entityClass);
                 if (box == null) {
                     box = new Box<>(this, entityClass);
                     boxes.put(entityClass, box);
@@ -688,7 +689,7 @@ public void runInReadTx(Runnable runnable) {
 
                 // TODO That's rather a quick fix, replace with a more general solution
                 // (that could maybe be a TX listener with abort callback?)
-                for (Box box : boxes.values()) {
+                for (Box<?> box : boxes.values()) {
                     box.readTxFinished(tx);
                 }
 
@@ -732,7 +733,6 @@ public <T> T callInReadTxWithRetry(Callable<T> callable, int attempts, int initi
                     cleanStaleReadTransactions();
                 }
                 if (failedReadTxAttemptCallback != null) {
-                    //noinspection unchecked
                     failedReadTxAttemptCallback.txFinished(null, new DbException(message + " \n" + diagnose, e));
                 }
                 try {
@@ -772,7 +772,7 @@ public <T> T callInReadTx(Callable<T> callable) {
 
                 // TODO That's rather a quick fix, replace with a more general solution
                 // (that could maybe be a TX listener with abort callback?)
-                for (Box box : boxes.values()) {
+                for (Box<?> box : boxes.values()) {
                     box.readTxFinished(tx);
                 }
 
@@ -885,7 +885,7 @@ public int cleanStaleReadTransactions() {
      * {@link Box#closeThreadResources()} for all initiated boxes ({@link #boxFor(Class)}).
      */
     public void closeThreadResources() {
-        for (Box box : boxes.values()) {
+        for (Box<?> box : boxes.values()) {
             box.closeThreadResources();
         }
         // activeTx is cleaned up in finally blocks, so do not free them here
@@ -972,7 +972,7 @@ public <T> SubscriptionBuilder<Class<T>> subscribe(Class<T> forClass) {
     }
 
     @Internal
-    public Future internalScheduleThread(Runnable runnable) {
+    public Future<?> internalScheduleThread(Runnable runnable) {
         return threadPool.submit(runnable);
     }
 
@@ -992,7 +992,7 @@ public int internalQueryAttempts() {
     }
 
     @Internal
-    public TxCallback internalFailedReadTxAttemptCallback() {
+    public TxCallback<?> internalFailedReadTxAttemptCallback() {
         return failedReadTxAttemptCallback;
     }
 

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

@@ -90,9 +90,9 @@ public class BoxStoreBuilder {
 
     int queryAttempts;
 
-    TxCallback failedReadTxAttemptCallback;
+    TxCallback<?> failedReadTxAttemptCallback;
 
-    final List<EntityInfo> entityInfoList = new ArrayList<>();
+    final List<EntityInfo<?>> entityInfoList = new ArrayList<>();
     private Factory<InputStream> initialDbFileFactory;
 
     /** Not for application use. */
@@ -274,7 +274,7 @@ public BoxStoreBuilder maxReaders(int maxReaders) {
     }
 
     @Internal
-    public void entity(EntityInfo entityInfo) {
+    public void entity(EntityInfo<?> entityInfo) {
         entityInfoList.add(entityInfo);
     }
 
@@ -345,7 +345,7 @@ public BoxStoreBuilder queryAttempts(int queryAttempts) {
      * Useful for e.g. logging.
      */
     @Experimental
-    public BoxStoreBuilder failedReadTxAttemptCallback(TxCallback failedReadTxAttemptCallback) {
+    public BoxStoreBuilder failedReadTxAttemptCallback(TxCallback<?> failedReadTxAttemptCallback) {
         this.failedReadTxAttemptCallback = failedReadTxAttemptCallback;
         return this;
     }

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

@@ -50,7 +50,7 @@ public abstract class Cursor<T> implements Closeable {
 
     static native boolean nativeSeek(long cursor, long key);
 
-    native Object nativeGetAllEntities(long cursor);
+    native List<T> nativeGetAllEntities(long cursor);
 
     static native Object nativeGetEntity(long cursor, long key);
 
@@ -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);
 
@@ -126,15 +126,15 @@ protected static native long collect004000(long cursor, long keyIfComplete, int
 
     protected final Transaction tx;
     protected final long cursor;
-    protected final EntityInfo entityInfo;
+    protected final EntityInfo<T> entityInfo;
     protected final BoxStore boxStoreForEntities;
 
     protected final boolean readOnly;
     protected boolean closed;
 
     private final Throwable creationThrowable;
 
-    protected Cursor(Transaction tx, long cursor, EntityInfo entityInfo, BoxStore boxStore) {
+    protected Cursor(Transaction tx, long cursor, EntityInfo<T> entityInfo, BoxStore boxStore) {
         if (tx == null) {
             throw new IllegalArgumentException("Transaction is null");
         }
@@ -144,8 +144,8 @@ protected Cursor(Transaction tx, long cursor, EntityInfo entityInfo, BoxStore bo
         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);
@@ -181,7 +181,7 @@ protected void finalize() throws Throwable {
 
     public abstract long put(T entity);
 
-    public EntityInfo getEntityInfo() {
+    public EntityInfo<T> getEntityInfo() {
         return entityInfo;
     }
 
@@ -199,7 +199,7 @@ public T first() {
 
     /** ~10% slower than iterating with {@link #first()} and {@link #next()} as done by {@link Box#getAll()}. */
     public List<T> getAll() {
-        return (List) nativeGetAllEntities(cursor);
+        return nativeGetAllEntities(cursor);
     }
 
     public boolean deleteEntity(long key) {
@@ -262,7 +262,7 @@ public boolean isClosed() {
      * Thus, use it only locally and don't store it long term.
      */
     protected <TARGET> Cursor<TARGET> getRelationTargetCursor(Class<TARGET> targetClass) {
-        EntityInfo entityInfo = boxStoreForEntities.getEntityInfo(targetClass);
+        EntityInfo<TARGET> entityInfo = boxStoreForEntities.getEntityInfo(targetClass);
         long cursorHandle = nativeGetCursorFor(cursor, entityInfo.getEntityId());
         CursorFactory<TARGET> factory = entityInfo.getCursorFactory();
         return factory.createCursor(tx, cursorHandle, boxStoreForEntities);
@@ -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) {