Add type parameters for all EntityInfo<T> usage.

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) {
@@ -560,7 +560,7 @@ public BoxStore getStore() {
         return store;
     }
 
-    public synchronized EntityInfo getEntityInfo() {
+    public synchronized EntityInfo<T> getEntityInfo() {
         if (entityInfo == null) {
             Cursor<T> reader = getReader();
             try {

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

@@ -166,7 +166,7 @@ public static boolean isObjectBrowserAvailable() {
     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 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<>();
@@ -213,7 +213,7 @@ 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());
@@ -368,9 +368,10 @@ Class getEntityClassOrThrow(int entityTypeId) {
         return clazz;
     }
 
+    @SuppressWarnings("unchecked") // Shortcut to implementing a Map<Class<? extends B>, B>.
     @Internal
-    EntityInfo getEntityInfo(Class entityClass) {
-        return propertiesByClass.get(entityClass);
+    <T> EntityInfo<T> getEntityInfo(Class<T> entityClass) {
+        return (EntityInfo<T>) propertiesByClass.get(entityClass);
     }
 
     /**

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

@@ -92,7 +92,7 @@ public class BoxStoreBuilder {
 
     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);
     }
 

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

@@ -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");
         }
@@ -181,7 +181,7 @@ protected void finalize() throws Throwable {
 
     public abstract long put(T entity);
 
-    public EntityInfo getEntityInfo() {
+    public EntityInfo<T> getEntityInfo() {
         return entityInfo;
     }
 
@@ -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);

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

@@ -180,7 +180,7 @@ public KeyValueCursor createKeyValueCursor() {
 
     public <T> Cursor<T> createCursor(Class<T> entityClass) {
         checkOpen();
-        EntityInfo entityInfo = store.getEntityInfo(entityClass);
+        EntityInfo<T> entityInfo = store.getEntityInfo(entityClass);
         CursorFactory<T> factory = entityInfo.getCursorFactory();
         long cursorHandle = nativeCreateCursor(transaction, entityInfo.getDbName(), entityClass);
         return factory.createCursor(this, cursorHandle, store);

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

@@ -325,12 +325,12 @@ public QueryBuilder<T> parameterAlias(String alias) {
      */
     public <TARGET> QueryBuilder<TARGET> link(RelationInfo<?, TARGET> relationInfo) {
         boolean backlink = relationInfo.isBacklink();
-        EntityInfo relationOwner = backlink ? relationInfo.targetInfo : relationInfo.sourceInfo;
+        EntityInfo<?> relationOwner = backlink ? relationInfo.targetInfo : relationInfo.sourceInfo;
         return link(relationInfo, relationOwner, relationInfo.targetInfo, backlink);
     }
 
-    private <TARGET> QueryBuilder<TARGET> link(RelationInfo relationInfo, EntityInfo relationOwner, EntityInfo target,
-                                               boolean backlink) {
+    private <TARGET> QueryBuilder<TARGET> link(RelationInfo<?, ?> relationInfo, EntityInfo<?> relationOwner,
+                                               EntityInfo<?> target, boolean backlink) {
         int propertyId = relationInfo.targetIdProperty != null ? relationInfo.targetIdProperty.id : 0;
         int relationId = relationInfo.targetRelationId != 0 ? relationInfo.targetRelationId : relationInfo.relationId;
         long linkQBHandle = nativeLink(handle, storeHandle, relationOwner.getEntityId(), target.getEntityId(),