Skip to content

Fix 157 inconsistent data handling with embedded entities #161

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
Parent: Changes from 6.x
merged 1 commit into from
Sep 11, 2024
Merged

Fix 157 inconsistent data handling with embedded entities #161

Show file tree
Hide file tree
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
6 changes: 4 additions & 2 deletions rsql-jpa/src/main/java/io/github/perplexhub/rsql/RSQLJPAContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@

import javax.persistence.criteria.Path;
import javax.persistence.metamodel.Attribute;
import javax.persistence.metamodel.ManagedType;

import lombok.Value;

@Value(staticConstructor = "of")
class RSQLJPAContext {

private Path<?> path;
private Attribute<?, ?> attribute;
Path<?> path;
Attribute<?, ?> attribute;
ManagedType<?> managedType;

}
3 changes: 2 additions & 1 deletion rsql-jpa/src/main/java/io/github/perplexhub/rsql/RSQLJPAPredicateConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ RSQLJPAContext findPropertyPath(String propertyPath, Path startRoot) {
RSQLJPAContext context = findPropertyPath(mappedProperty, root);
root = context.getPath();
attribute = context.getAttribute();
classMetadata = context.getManagedType();
} else {
if (!hasPropertyName(mappedProperty, classMetadata)) {
if (Modifier.isAbstract(classMetadata.getJavaType().getModifiers())) {
Expand Down Expand Up @@ -153,7 +154,7 @@ RSQLJPAContext findPropertyPath(String propertyPath, Path startRoot) {
accessControl(type, attribute.getName());
}

return RSQLJPAContext.of(root, attribute);
return RSQLJPAContext.of(root, attribute, classMetadata);
}

private String getKeyJoin(Path<?> root, String mappedProperty) {
Expand Down
Loading