geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r806252 - in /geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence: Result.java ResultItem.java criteria/AbstractQuery.java criteria/CriteriaQuery.java criteria/FetchParent.java criteria/QueryBuilder.java
Date Thu, 20 Aug 2009 16:58:27 GMT
Author: dwoods
Date: Thu Aug 20 16:58:26 2009
New Revision: 806252

URL: http://svn.apache.org/viewvc?rev=806252&view=rev
Log:
GERONIMO-4410 Spec API updates from 20090819

Removed:
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Result.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ResultItem.java
Modified:
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/AbstractQuery.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/CriteriaQuery.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/FetchParent.java
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/QueryBuilder.java

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/AbstractQuery.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/AbstractQuery.java?rev=806252&r1=806251&r2=806252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/AbstractQuery.java
(original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/AbstractQuery.java
Thu Aug 20 16:58:26 2009
@@ -50,6 +50,8 @@
 
     AbstractQuery<T> distinct(boolean distinct);
 
+    <U> Subquery<U> subquery(Class<U> type);
+
     Selection<T> getSelection();
     List<Expression<?>> getGroupList();
 
@@ -58,5 +60,6 @@
     Predicate getGroupRestriction();
 
     boolean isDistinct();
-    <U> Subquery<U> subquery(Class<U> type);
+
+    Class<T> getResultType();  	
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/CriteriaQuery.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/CriteriaQuery.java?rev=806252&r1=806251&r2=806252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/CriteriaQuery.java
(original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/CriteriaQuery.java
Thu Aug 20 16:58:26 2009
@@ -37,7 +37,6 @@
 
     CriteriaQuery<T> multiselect(List<Selection<?>> selectionList);
 
-
     CriteriaQuery<T> where(Expression<Boolean> restriction);
 
     CriteriaQuery<T> where(Predicate... restrictions);
@@ -51,8 +50,6 @@
     CriteriaQuery<T> orderBy(Order... o);
 
     CriteriaQuery<T> distinct(boolean distinct);
-
-    Class<T> getResultType();  
     List<Order> getOrderList();
     Set<ParameterExpression<?>> getParameters();
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/FetchParent.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/FetchParent.java?rev=806252&r1=806251&r2=806252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/FetchParent.java
(original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/FetchParent.java
Thu Aug 20 16:58:26 2009
@@ -40,7 +40,7 @@
     <Y> Fetch<X, Y> fetch(PluralAttribute<? super X, ?, Y> attribute);
     <Y> Fetch<X, Y> fetch(PluralAttribute<? super X, ?, Y> attribute, JoinType
jt);
 
-    <Y> Fetch<X, Y> fetch(String attributeName);
+    <X, Y> Fetch<X, Y> fetch(String attributeName);
 
-    <Y> Fetch<X, Y> fetch(String attributeName, JoinType jt);
+    <X, Y> Fetch<X, Y> fetch(String attributeName, JoinType jt);
 }

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/QueryBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/QueryBuilder.java?rev=806252&r1=806251&r2=806252&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/QueryBuilder.java
(original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/QueryBuilder.java
Thu Aug 20 16:58:26 2009
@@ -181,6 +181,7 @@
 
     <T> Expression<T> literal(T value);
 
+    <T> Expression<T> nullLiteral(Class<T> resultClass);
 
 
     <T> ParameterExpression<T> parameter(Class<T> paramClass);
@@ -267,6 +268,7 @@
 	}
     <T> In<T> in(Expression<? extends T> expression);
 
+
     <Y> Expression<Y> coalesce(Expression<? extends Y> x, Expression<?
extends Y> y);
 
     <Y> Expression<Y> coalesce(Expression<? extends Y> x, Y y);



Mime
View raw message