You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by pp...@apache.org on 2009/08/25 03:18:04 UTC
svn commit: r807445 -
/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/FromImpl.java
Author: ppoddar
Date: Tue Aug 25 01:18:04 2009
New Revision: 807445
URL: http://svn.apache.org/viewvc?rev=807445&view=rev
Log:
OPENJPA-1262: Missed file in commit
Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/FromImpl.java
Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/FromImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/FromImpl.java?rev=807445&r1=807444&r2=807445&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/FromImpl.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/FromImpl.java Tue Aug 25 01:18:04 2009
@@ -180,56 +180,55 @@
}
public <W,Y> Join<W,Y> join(String attr, JoinType jt) {
- ManagedType<X> mtype = assertJoinable();
- return (Join<W,Y>)join(mtype.getSingularAttribute(attr), jt);
+ assertJoinable();
+ return (Join<W,Y>)join(((ManagedType<X>)type).getSingularAttribute(attr), jt);
}
public <W,Y> CollectionJoin<W, Y> joinCollection(String attr) {
- ManagedType<X> mtype = assertJoinable();
- return (CollectionJoin<W,Y>)join(mtype.getCollection(attr), JoinType.INNER);
+ assertJoinable();
+ return (CollectionJoin<W,Y>)join(((ManagedType<X>)type).getCollection(attr), JoinType.INNER);
}
public <W,Y> CollectionJoin<W, Y> joinCollection(String attr, JoinType jt) {
- ManagedType<X> mtype = assertJoinable();
- return (CollectionJoin<W,Y>)join(mtype.getCollection(attr), jt);
+ assertJoinable();
+ return (CollectionJoin<W,Y>)join(((ManagedType<X>)type).getCollection(attr), jt);
}
public <W,Y> ListJoin<W, Y> joinList(String attr) {
- ManagedType<X> mtype = assertJoinable();
- return (ListJoin<W,Y>)join(mtype.getList(attr), JoinType.INNER);
+ assertJoinable();
+ return (ListJoin<W,Y>)join(((ManagedType<X>)type).getList(attr), JoinType.INNER);
}
public <W,Y> ListJoin<W,Y> joinList(String attr, JoinType jt) {
- ManagedType<X> mtype = assertJoinable();
- return (ListJoin<W,Y>)join(mtype.getList(attr), jt);
+ assertJoinable();
+ return (ListJoin<W,Y>)join(((ManagedType<X>)type).getList(attr), jt);
}
public <W,K,V> MapJoin<W,K,V> joinMap(String attr) {
- ManagedType<X> mtype = assertJoinable();
- return (MapJoin<W,K,V>)join(mtype.getMap(attr));
+ assertJoinable();
+ return (MapJoin<W,K,V>)join(((ManagedType<X>)type).getMap(attr));
}
public <W,K,V> MapJoin<W,K,V> joinMap(String attr, JoinType jt) {
- ManagedType<X> mtype = assertJoinable();
- return (MapJoin<W,K,V>)join(mtype.getMap(attr));
+ assertJoinable();
+ return (MapJoin<W,K,V>)join(((ManagedType<X>)type).getMap(attr));
}
public <W,Y> SetJoin<W, Y> joinSet(String attr) {
- ManagedType<X> mtype = assertJoinable();
- return (SetJoin<W, Y>)join(mtype.getSet(attr));
+ assertJoinable();
+ return (SetJoin<W, Y>)join(((ManagedType<X>)type).getSet(attr));
}
public <W,Y> SetJoin<W, Y> joinSet(String attr, JoinType jt) {
- ManagedType<X> mtype = assertJoinable();
- return (SetJoin<W, Y>)join(mtype.getSet(attr), jt);
+ assertJoinable();
+ return (SetJoin<W, Y>)join(((ManagedType<X>)type).getSet(attr), jt);
}
- ManagedType<X> assertJoinable() {
+ void assertJoinable() {
if (type.getPersistenceType() == PersistenceType.BASIC) {
throw new IllegalArgumentException(this + " is a basic path and can not be navigated to ");
}
- return (ManagedType<X>)type;
}
private void addJoin(Join<X,?> join) {
@@ -258,13 +257,13 @@
//String-based:
- public <Y> Fetch<X, Y> fetch(String assocName) {
+ public <X,Y> Fetch<X, Y> fetch(String assocName) {
return fetch(assocName, JoinType.INNER);
}
- public <Y> Fetch<X, Y> fetch(String name, JoinType jt) {
- ManagedType<X> mtype = assertJoinable();
- Attribute<? super X,?> attr = mtype.getAttribute(name);
+ public <X,Y> Fetch<X, Y> fetch(String name, JoinType jt) {
+ assertJoinable();
+ Attribute<? super X,?> attr = ((ManagedType<X>)type).getAttribute(name);
if (attr.isCollection()) {
return fetch((PluralAttribute)attr, jt);
} else {