[hibernate-commits] Hibernate SVN: r17250 - core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria.

[hibernate-commits at lists.jboss.org]

Author: steve.ebersole at jboss.com
Date: 2009-08-06 14:39:33 -0400 (Thu, 06 Aug 2009)
New Revision: 17250

Modified:
   core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/QueryBuilderImpl.java
Log:
EJB-447 : Implement JPA 2.0 criteria apis (revert to strict method sigs)

Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/QueryBuilderImpl.java
===================================================================
--- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/QueryBuilderImpl.java	2009-08-06 18:30:13 UTC (rev 17249)
+++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/QueryBuilderImpl.java	2009-08-06 18:39:33 UTC (rev 17250)
@@ -549,28 +549,28 @@
 	/**
 	 * {@inheritDoc}
 	 */
-	public <N extends Number> AggregationFunction.AVG avg(Expression<N> x) {
+	public <N extends Number> Expression<Double> avg(Expression<N> x) {
 		return new AggregationFunction.AVG( this, x );
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public <N extends Number> AggregationFunction.SUM<N> sum(Expression<N> x) {
+	public <N extends Number> Expression<N> sum(Expression<N> x) {
 		return new AggregationFunction.SUM<N>( this, x );
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public <N extends Number> AggregationFunction.MAX<N> max(Expression<N> x) {
+	public <N extends Number> Expression<N> max(Expression<N> x) {
 		return new AggregationFunction.MAX<N>( this, x );
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public <N extends Number> AggregationFunction.MIN<N> min(Expression<N> x) {
+	public <N extends Number> Expression<N> min(Expression<N> x) {
 		return new AggregationFunction.MIN<N>( this, x );
 	}