Skip to content

fix(base-query): @Indexable on a function field implies class membership #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deer merged 1 commit into from
May 12, 2026
Merged

fix(base-query): @Indexable on a function field implies class membership #66

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 21 additions & 23 deletions base-query/src/main/java/build/base/query/AbstractHeapBasedIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,17 +119,17 @@ protected AbstractHeapBasedIndex() {
public void index(final Object object) {
final var objectClass = object.getClass();

// index the object itself if it is annotated with @Indexable
if (Introspection.hasDeclaredAnnotation(objectClass, Indexable.class)) {
this.objectByClass.compute(objectClass, (_, existing) -> {
final var objects = existing == null
? ConcurrentHashMap.newKeySet()
: existing;
// always register the object in objectByClass — an @Indexable function field is sufficient
// to make the type a class-membership participant; type-level @Indexable remains accepted
// but is no longer required
this.objectByClass.compute(objectClass, (_, existing) -> {
final var objects = existing == null
? ConcurrentHashMap.newKeySet()
: existing;

objects.add(object);
return objects;
});
}
objects.add(object);
return objects;
});

// index the values produced by public static final @Indexable Function fields
this.indexableFunctionFieldsByClass
Expand Down Expand Up @@ -235,19 +235,17 @@ public void index(final Object object) {
public void unindex(final Object object) {
final var objectClass = object.getClass();

// unindex the object itself if it is annotated with @Indexable
if (Introspection.hasDeclaredAnnotation(objectClass, Indexable.class)) {
this.objectByClass.compute(objectClass, (_, existing) -> {
if (existing == null) {
return null; // nothing to remove
} else {
existing.remove(object);
return existing.isEmpty()
? null
: existing; // return null if empty
}
});
}
// always remove from objectByClass, symmetrical with index()
this.objectByClass.compute(objectClass, (_, existing) -> {
if (existing == null) {
return null;
} else {
existing.remove(object);
return existing.isEmpty()
? null
: existing;
}
});

// unindex the values produced by public static final @Indexable Function fields
this.indexableFunctionFieldsByClass
Expand Down
Loading