Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OPENJPA-2305: Downcast the attribute, if necessary, while navigating a path 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@1456614 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Pinaki Poddar 2013-03-14 19:04:44 +00:00
parent e617abd086
commit 70a201a55d
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/PathImpl.java
View File

@ -244,6 +244,9 @@ class PathImpl<Z,X> extends ExpressionImpl<X> implements Path<X> {
* Gets a new path that represents the given single-valued attribute from this path. * Gets a new path that represents the given single-valued attribute from this path.
*/ */
public <Y> Path<Y> get(SingularAttribute<? super X, Y> attr) { public <Y> Path<Y> get(SingularAttribute<? super X, Y> attr) {
if (getType() != attr.getDeclaringType()) {
attr = (SingularAttribute)((ManagedType)getType()).getAttribute(attr.getName());
}
return new PathImpl<X,Y>(this, (Members.SingularAttributeImpl<? super X, Y>)attr, attr.getJavaType()); return new PathImpl<X,Y>(this, (Members.SingularAttributeImpl<? super X, Y>)attr, attr.getJavaType());
} }
@ -251,6 +254,9 @@ class PathImpl<Z,X> extends ExpressionImpl<X> implements Path<X> {
* Gets a new path that represents the given multi-valued attribute from this path. * Gets a new path that represents the given multi-valued attribute from this path.
*/ */
public <E, C extends java.util.Collection<E>> Expression<C> get(PluralAttribute<X, C, E> coll) { public <E, C extends java.util.Collection<E>> Expression<C> get(PluralAttribute<X, C, E> coll) {
if (getType() != coll.getDeclaringType()) {
coll = (PluralAttribute)((ManagedType)getType()).getAttribute(coll.getName());
}
return new PathImpl<X,C>(this, (Members.PluralAttributeImpl<? super X, C, E>)coll, coll.getJavaType()); return new PathImpl<X,C>(this, (Members.PluralAttributeImpl<? super X, C, E>)coll, coll.getJavaType());
} }
@ -258,6 +264,9 @@ class PathImpl<Z,X> extends ExpressionImpl<X> implements Path<X> {
* Gets a new path that represents the given map-valued attribute from this path. * Gets a new path that represents the given map-valued attribute from this path.
*/ */
public <K, V, M extends java.util.Map<K, V>> Expression<M> get(MapAttribute<X, K, V> map) { public <K, V, M extends java.util.Map<K, V>> Expression<M> get(MapAttribute<X, K, V> map) {
if (getType() != map.getDeclaringType()) {
map = (MapAttribute)((ManagedType)getType()).getAttribute(map.getName());
}
return new PathImpl<X,M>(this, (Members.MapAttributeImpl<? super X,K,V>)map, (Class<M>)map.getJavaType()); return new PathImpl<X,M>(this, (Members.MapAttributeImpl<? super X,K,V>)map, (Class<M>)map.getJavaType());
} }