Skip to content

Commit c7b8a75

Browse files
greenrobot-teamgreenrobot-team
committed
Add type parameters for all Class<T> usage in BoxStore and ObjectClassPublisher.
1 parent 9abe891 commit c7b8a75

2 files changed

Lines changed: 18 additions & 18 deletions

File tree

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,11 @@ public static String getVersionNative() {
136136

137137
/** @return entity ID */
138138
// TODO only use ids once we have them in Java
139-
static native int nativeRegisterEntityClass(long store, String entityName, Class entityClass);
139+
static native int nativeRegisterEntityClass(long store, String entityName, Class<?> entityClass);
140140

141141
// TODO only use ids once we have them in Java
142142
static native void nativeRegisterCustomType(long store, int entityId, int propertyId, String propertyName,
143-
Class<? extends PropertyConverter> converterClass, Class customType);
143+
Class<? extends PropertyConverter> converterClass, Class<?> customType);
144144

145145
static native String nativeDiagnose(long store);
146146

@@ -164,10 +164,10 @@ public static boolean isObjectBrowserAvailable() {
164164
private final File directory;
165165
private final String canonicalPath;
166166
private final long handle;
167-
private final Map<Class, String> dbNameByClass = new HashMap<>();
168-
private final Map<Class, Integer> entityTypeIdByClass = new HashMap<>();
167+
private final Map<Class<?>, String> dbNameByClass = new HashMap<>();
168+
private final Map<Class<?>, Integer> entityTypeIdByClass = new HashMap<>();
169169
private final Map<Class<?>, EntityInfo<?>> propertiesByClass = new HashMap<>();
170-
private final LongHashMap<Class> classByEntityTypeId = new LongHashMap<>();
170+
private final LongHashMap<Class<?>> classByEntityTypeId = new LongHashMap<>();
171171
private final int[] allEntityTypeIds;
172172
private final Map<Class<?>, Box<?>> boxes = new ConcurrentHashMap<>();
173173
private final Set<Transaction> transactions = Collections.newSetFromMap(new WeakHashMap<>());
@@ -333,24 +333,24 @@ private void checkOpen() {
333333
}
334334
}
335335

336-
String getDbName(Class entityClass) {
336+
String getDbName(Class<?> entityClass) {
337337
return dbNameByClass.get(entityClass);
338338
}
339339

340-
Integer getEntityTypeId(Class entityClass) {
340+
Integer getEntityTypeId(Class<?> entityClass) {
341341
return entityTypeIdByClass.get(entityClass);
342342
}
343343

344344
@Internal
345-
public int getEntityTypeIdOrThrow(Class entityClass) {
345+
public int getEntityTypeIdOrThrow(Class<?> entityClass) {
346346
Integer id = entityTypeIdByClass.get(entityClass);
347347
if (id == null) {
348348
throw new DbSchemaException("No entity registered for " + entityClass);
349349
}
350350
return id;
351351
}
352352

353-
public Collection<Class> getAllEntityClasses() {
353+
public Collection<Class<?>> getAllEntityClasses() {
354354
return dbNameByClass.keySet();
355355
}
356356

@@ -360,8 +360,8 @@ int[] getAllEntityTypeIds() {
360360
}
361361

362362
@Internal
363-
Class getEntityClassOrThrow(int entityTypeId) {
364-
Class clazz = classByEntityTypeId.get(entityTypeId);
363+
Class<?> getEntityClassOrThrow(int entityTypeId) {
364+
Class<?> clazz = classByEntityTypeId.get(entityTypeId);
365365
if (clazz == null) {
366366
throw new DbSchemaException("No entity registered for type ID " + entityTypeId);
367367
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ class ObjectClassPublisher implements DataPublisher<Class>, Runnable {
4747
public void subscribe(DataObserver<Class> observer, @Nullable Object forClass) {
4848
if (forClass == null) {
4949
for (int entityTypeId : boxStore.getAllEntityTypeIds()) {
50-
observersByEntityTypeId.putElement(entityTypeId, (DataObserver) observer);
50+
observersByEntityTypeId.putElement(entityTypeId, observer);
5151
}
5252
} else {
53-
int entityTypeId = boxStore.getEntityTypeIdOrThrow((Class) forClass);
54-
observersByEntityTypeId.putElement(entityTypeId, (DataObserver) observer);
53+
int entityTypeId = boxStore.getEntityTypeIdOrThrow((Class<?>) forClass);
54+
observersByEntityTypeId.putElement(entityTypeId, observer);
5555
}
5656
}
5757

@@ -61,7 +61,7 @@ public void subscribe(DataObserver<Class> observer, @Nullable Object forClass) {
6161
*/
6262
public void unsubscribe(DataObserver<Class> observer, @Nullable Object forClass) {
6363
if (forClass != null) {
64-
int entityTypeId = boxStore.getEntityTypeIdOrThrow((Class) forClass);
64+
int entityTypeId = boxStore.getEntityTypeIdOrThrow((Class<?>) forClass);
6565
unsubscribe(observer, entityTypeId);
6666
} else {
6767
for (int entityTypeId : boxStore.getAllEntityTypeIds()) {
@@ -78,9 +78,9 @@ private void unsubscribe(DataObserver<Class> observer, int entityTypeId) {
7878
@Override
7979
public void publishSingle(final DataObserver<Class> observer, @Nullable final Object forClass) {
8080
boxStore.internalScheduleThread(() -> {
81-
Collection<Class> entityClasses = forClass != null ? Collections.singletonList((Class) forClass) :
81+
Collection<Class<?>> entityClasses = forClass != null ? Collections.singletonList((Class<?>) forClass) :
8282
boxStore.getAllEntityClasses();
83-
for (Class entityClass : entityClasses) {
83+
for (Class<?> entityClass : entityClasses) {
8484
try {
8585
observer.onData(entityClass);
8686
} catch (RuntimeException e) {
@@ -129,7 +129,7 @@ public void run() {
129129
for (int entityTypeId : entityTypeIdsAffected) {
130130
Collection<DataObserver<Class>> observers = observersByEntityTypeId.get(entityTypeId);
131131
if (observers != null && !observers.isEmpty()) {
132-
Class objectClass = boxStore.getEntityClassOrThrow(entityTypeId);
132+
Class<?> objectClass = boxStore.getEntityClassOrThrow(entityTypeId);
133133
try {
134134
for (DataObserver<Class> observer : observers) {
135135
observer.onData(objectClass);

0 commit comments

Comments
 (0)