Author: steve.ebersole(a)jboss.com
Date: 2009-08-04 13:07:20 -0400 (Tue, 04 Aug 2009)
New Revision: 17226
Modified:
jpa-api/trunk/src/main/java/javax/persistence/criteria/From.java
Log:
fixed method signatures of attribute-name (string-based) joins
Modified: jpa-api/trunk/src/main/java/javax/persistence/criteria/From.java
===================================================================
--- jpa-api/trunk/src/main/java/javax/persistence/criteria/From.java 2009-08-03 03:14:57
UTC (rev 17225)
+++ jpa-api/trunk/src/main/java/javax/persistence/criteria/From.java 2009-08-04 17:07:20
UTC (rev 17226)
@@ -122,7 +122,7 @@
* @throws IllegalArgumentException if attribute of the given
* name does not exist
*/
- <X, Y> Join<X, Y> join(String attributeName);
+ <Y> Join<X, Y> join(String attributeName);
/**
* Join to the specified Collection-valued attribute using an
@@ -133,7 +133,7 @@
* @throws IllegalArgumentException if attribute of the given
* name does not exist
*/
- <X, Y> CollectionJoin<X, Y> joinCollection(String attributeName);
+ <Y> CollectionJoin<X, Y> joinCollection(String attributeName);
/**
* Join to the specified Set-valued attribute using an inner
@@ -144,7 +144,7 @@
* @throws IllegalArgumentException if attribute of the given
* name does not exist
*/
- <X, Y> SetJoin<X, Y> joinSet(String attributeName);
+ <Y> SetJoin<X, Y> joinSet(String attributeName);
/**
* Join to the specified List-valued attribute using an inner
@@ -155,7 +155,7 @@
* @throws IllegalArgumentException if attribute of the given
* name does not exist
*/
- <X, Y> ListJoin<X, Y> joinList(String attributeName);
+ <Y> ListJoin<X, Y> joinList(String attributeName);
/**
* Join to the specified Map-valued attribute using an inner
@@ -166,7 +166,7 @@
* @throws IllegalArgumentException if attribute of the given
* name does not exist
*/
- <X, K, V> MapJoin<X, K, V> joinMap(String attributeName);
+ <K, V> MapJoin<X, K, V> joinMap(String attributeName);
/**
@@ -179,7 +179,7 @@
* @throws IllegalArgumentException if attribute of the given
* name does not exist
*/
- <X, Y> Join<X, Y> join(String attributeName, JoinType jt);
+ <Y> Join<X, Y> join(String attributeName, JoinType jt);
/**
* Join to the specified Collection-valued attribute using
@@ -191,7 +191,7 @@
* @throws IllegalArgumentException if attribute of the given
* name does not exist
*/
- <X, Y> CollectionJoin<X, Y> joinCollection(String attributeName, JoinType
jt);
+ <Y> CollectionJoin<X, Y> joinCollection(String attributeName, JoinType
jt);
/**
* Join to the specified Set-valued attribute using
@@ -203,7 +203,7 @@
* @throws IllegalArgumentException if attribute of the given
* name does not exist
*/
- <X, Y> SetJoin<X, Y> joinSet(String attributeName, JoinType jt);
+ <Y> SetJoin<X, Y> joinSet(String attributeName, JoinType jt);
/**
* Join to the specified List-valued attribute using
@@ -215,7 +215,7 @@
* @throws IllegalArgumentException if attribute of the given
* name does not exist
*/
- <X, Y> ListJoin<X, Y> joinList(String attributeName, JoinType jt);
+ <Y> ListJoin<X, Y> joinList(String attributeName, JoinType jt);
/**
* Join to the specified Map-valued attribute using
@@ -227,5 +227,5 @@
* @throws IllegalArgumentException if attribute of the given
* name does not exist
*/
- <X, K, V> MapJoin<X, K, V> joinMap(String attributeName, JoinType jt);
+ <K, V> MapJoin<X, K, V> joinMap(String attributeName, JoinType jt);
}