Skip to content

[OPENJPA-2957] Resolve embeddables through the metadata repository instead of annotation names #159

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
cristof merged 1 commit into from
Aug 24, 2026
Merged

[OPENJPA-2957] Resolve embeddables through the metadata repository instead of annotation names #159

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
23 changes: 10 additions & 13 deletions openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/AbstractExpressionBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,8 +305,7 @@ protected Value traversePath(Path path, String field, boolean pcOnly,
meta = fmd.getEmbeddedMetaData();
else
meta = fmd.getDeclaredTypeMetaData();
if (meta == null && fmd.isEmbedded()
&& !hasEmbeddableAnnotation(fmd.getDeclaredType())) {
if (meta == null && fmd.isEmbedded() && !isEmbeddable(fmd)) {
// Non-@Embeddable @IdClass field inside @EmbeddedId (JPA 2.4.1.3
// ex2b). Resolve via the @MapsId @ManyToOne target entity.
meta = resolveMapsIdTargetMeta(fmd);
Expand Down Expand Up @@ -352,18 +351,16 @@ private boolean isMultiValuedTraversalAttempt(Path path, String field) {
}

/**
* Checks whether a class has an @Embeddable annotation via reflection.
* Uses annotation simple name to avoid compile-time dependency on
* jakarta.persistence.
* Whether the declared type of the given field is known to the metadata
* repository as an embeddable. Asking the repository rather than the type's
* annotations also covers embeddables that are declared in orm.xml only.
*/
private static boolean hasEmbeddableAnnotation(Class<?> type) {
if (type == null) return false;
for (java.lang.annotation.Annotation ann : type.getAnnotations()) {
if ("Embeddable".equals(ann.annotationType().getSimpleName())) {
return true;
}
}
return false;
private static boolean isEmbeddable(FieldMetaData fmd) {
Class<?> type = fmd.getDeclaredType();
if (type == null)
return false;
ClassMetaData typeMeta = fmd.getRepository().getMetaData(type, null, false);
return typeMeta != null && typeMeta.isEmbeddable();
}

/**
Expand Down
Loading