Add type parameters for all Class<T> usage in BoxStore and ObjectClassPublisher.

Author: greenrobot-team

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,10 +164,10 @@ 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<?>, 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 LongHashMap<Class<?>> classByEntityTypeId = new LongHashMap<>();
     private final int[] allEntityTypeIds;
     private final Map<Class<?>, Box<?>> boxes = new ConcurrentHashMap<>();
     private final Set<Transaction> transactions = Collections.newSetFromMap(new WeakHashMap<>());
@@ -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,8 +360,8 @@ 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);
         }

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

@@ -47,11 +47,11 @@ class ObjectClassPublisher implements DataPublisher<Class>, Runnable {
     public void subscribe(DataObserver<Class> observer, @Nullable Object forClass) {
         if (forClass == null) {
             for (int entityTypeId : boxStore.getAllEntityTypeIds()) {
-                observersByEntityTypeId.putElement(entityTypeId, (DataObserver) observer);
+                observersByEntityTypeId.putElement(entityTypeId, observer);
             }
         } else {
-            int entityTypeId = boxStore.getEntityTypeIdOrThrow((Class) forClass);
-            observersByEntityTypeId.putElement(entityTypeId, (DataObserver) observer);
+            int entityTypeId = boxStore.getEntityTypeIdOrThrow((Class<?>) forClass);
+            observersByEntityTypeId.putElement(entityTypeId, observer);
         }
     }
 
@@ -61,7 +61,7 @@ public void subscribe(DataObserver<Class> observer, @Nullable Object forClass) {
      */
     public void unsubscribe(DataObserver<Class> observer, @Nullable Object forClass) {
         if (forClass != null) {
-            int entityTypeId = boxStore.getEntityTypeIdOrThrow((Class) forClass);
+            int entityTypeId = boxStore.getEntityTypeIdOrThrow((Class<?>) forClass);
             unsubscribe(observer, entityTypeId);
         } else {
             for (int entityTypeId : boxStore.getAllEntityTypeIds()) {
@@ -78,9 +78,9 @@ private void unsubscribe(DataObserver<Class> observer, int entityTypeId) {
     @Override
     public void publishSingle(final DataObserver<Class> observer, @Nullable final Object forClass) {
         boxStore.internalScheduleThread(() -> {
-            Collection<Class> entityClasses = forClass != null ? Collections.singletonList((Class) forClass) :
+            Collection<Class<?>> entityClasses = forClass != null ? Collections.singletonList((Class<?>) forClass) :
                     boxStore.getAllEntityClasses();
-            for (Class entityClass : entityClasses) {
+            for (Class<?> entityClass : entityClasses) {
                 try {
                     observer.onData(entityClass);
                 } catch (RuntimeException e) {
@@ -129,7 +129,7 @@ public void run() {
                 for (int entityTypeId : entityTypeIdsAffected) {
                     Collection<DataObserver<Class>> observers = observersByEntityTypeId.get(entityTypeId);
                     if (observers != null && !observers.isEmpty()) {
-                        Class objectClass = boxStore.getEntityClassOrThrow(entityTypeId);
+                        Class<?> objectClass = boxStore.getEntityClassOrThrow(entityTypeId);
                         try {
                             for (DataObserver<Class> observer : observers) {
                                 observer.onData(objectClass);