HHH-8444 - Fix criteriaapi failures from JPA 2.1 TCK

hibernate-entitymanager/src/main/java/org/hibernate/jpa/criteria/CriteriaQueryImpl.java

@@ -26,6 +26,7 @@ package org.hibernate.jpa.criteria;
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -43,6 +44,8 @@ import javax.persistence.metamodel.EntityType;
 
 import org.jboss.logging.Logger;
 
+import org.hibernate.internal.util.StringHelper;
+import org.hibernate.internal.util.collections.CollectionHelper;
 import org.hibernate.jpa.internal.QueryImpl;
 import org.hibernate.jpa.criteria.compile.CompilableCriteria;
 import org.hibernate.jpa.criteria.compile.CriteriaInterpretation;
@@ -76,9 +79,7 @@ public class CriteriaQueryImpl<T> extends AbstractNode implements CriteriaQuery<
 		this.queryStructure = new QueryStructure<T>( this, criteriaBuilder );
 	}
 
-	/**
+	@Override
-	 * {@inheritDoc}
-	 */
 	public Class<T> getResultType() {
 		return returnType;
 	}
@@ -86,24 +87,18 @@ public class CriteriaQueryImpl<T> extends AbstractNode implements CriteriaQuery<
 
 	// SELECTION ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-	/**
+	@Override
-	 * {@inheritDoc}
-	 */
 	public CriteriaQuery<T> distinct(boolean applyDistinction) {
 		queryStructure.setDistinct( applyDistinction );
 		return this;
 	}
 
-	/**
+	@Override
-	 * {@inheritDoc}
-	 */
 	public boolean isDistinct() {
 		return queryStructure.isDistinct();
 	}
 
-	/**
+	@Override
-	 * {@inheritDoc}
-	 */
 	@SuppressWarnings({ "unchecked" })
 	public Selection<T> getSelection() {
 		return ( Selection<T> ) queryStructure.getSelection();
@@ -113,29 +108,25 @@ public class CriteriaQueryImpl<T> extends AbstractNode implements CriteriaQuery<
 		queryStructure.setSelection( selection );
 	}
 
-	/**
+	@Override
-	 * {@inheritDoc}
-	 */
 	public CriteriaQuery<T> select(Selection<? extends T> selection) {
 		applySelection( selection );
 		return this;
 	}
 
-	/**
+	@Override
-	 * {@inheritDoc}
-	 */
 	@SuppressWarnings({ "unchecked" })
 	public CriteriaQuery<T> multiselect(Selection<?>... selections) {
 		return multiselect( Arrays.asList( selections ) );
 	}
 
-	/**
+	@Override
-	 * {@inheritDoc}
-	 */
 	@SuppressWarnings({ "unchecked" })
 	public CriteriaQuery<T> multiselect(List<Selection<?>> selections) {
 		final Selection<? extends T> selection;
 
+		validateSelections( selections );
+
 		if ( Tuple.class.isAssignableFrom( getResultType() ) ) {
 			selection = ( Selection<? extends T> ) criteriaBuilder().tuple( selections );
 		}
@@ -168,26 +159,34 @@ public class CriteriaQueryImpl<T> extends AbstractNode implements CriteriaQuery<
 		return this;
 	}
 
+	private void validateSelections(List<Selection<?>> selections) {
+		// handle the requirement that we validate that the incoming selections do not contain
+		// duplicate aliases.
+		final HashSet<String> aliases = new HashSet<String>( CollectionHelper.determineProperSizing( selections.size() ) );
+		for ( Selection<?> selection : selections ) {
+			if ( StringHelper.isNotEmpty( selection.getAlias() ) ) {
+				boolean added = aliases.add( selection.getAlias() );
+				if ( ! added ) {
+					throw new IllegalArgumentException( "Multi-select expressions defined duplicate alias : " + selection.getAlias() );
+				}
+			}
+		}
+	}
+
 
 	// ROOTS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-	/**
+	@Override
-	 * {@inheritDoc}
-	 */
 	public Set<Root<?>> getRoots() {
 		return queryStructure.getRoots();
 	}
 
-	/**
+	@Override
-	 * {@inheritDoc}
-	 */
 	public <X> Root<X> from(EntityType<X> entityType) {
 		return queryStructure.from( entityType );
 	}
 
-	/**
+	@Override
-	 * {@inheritDoc}
-	 */
 	public <X> Root<X> from(Class<X> entityClass) {
 		return queryStructure.from( entityClass );
 	}
@@ -195,24 +194,18 @@ public class CriteriaQueryImpl<T> extends AbstractNode implements CriteriaQuery<
 
 	// RESTRICTION ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-	/**
+	@Override
-	 * {@inheritDoc}
-	 */
 	public Predicate getRestriction() {
 		return queryStructure.getRestriction();
 	}
 
-	/**
+	@Override
-	 * {@inheritDoc}
-	 */
 	public CriteriaQuery<T> where(Expression<Boolean> expression) {
 		queryStructure.setRestriction( criteriaBuilder().wrap( expression ) );
 		return this;
 	}
 
-	/**
+	@Override
-	 * {@inheritDoc}
-	 */
 	public CriteriaQuery<T> where(Predicate... predicates) {
 		// TODO : assuming this should be a conjuntion, but the spec does not say specifically...
 		queryStructure.setRestriction( criteriaBuilder().and( predicates ) );
@@ -222,44 +215,35 @@ public class CriteriaQueryImpl<T> extends AbstractNode implements CriteriaQuery<
 
 	// GROUPING ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-	/**
+	@Override
-	 * {@inheritDoc}
-	 */
 	public List<Expression<?>> getGroupList() {
 		return queryStructure.getGroupings();
 	}
 
-	/**
+	@Override
-	 * {@inheritDoc}
-	 */
 	public CriteriaQuery<T> groupBy(Expression<?>... groupings) {
 		queryStructure.setGroupings( groupings );
 		return this;
 	}
 
+	@Override
 	public CriteriaQuery<T> groupBy(List<Expression<?>> groupings) {
 		queryStructure.setGroupings( groupings );
 		return this;
 	}
 
-	/**
+	@Override
-	 * {@inheritDoc}
-	 */
 	public Predicate getGroupRestriction() {
 		return queryStructure.getHaving();
 	}
 
-	/**
+	@Override
-	 * {@inheritDoc}
-	 */
 	public CriteriaQuery<T> having(Expression<Boolean> expression) {
 		queryStructure.setHaving( criteriaBuilder().wrap( expression ) );
 		return this;
 	}
 
-	/**
+	@Override
-	 * {@inheritDoc}
-	 */
 	public CriteriaQuery<T> having(Predicate... predicates) {
 		queryStructure.setHaving( criteriaBuilder().and( predicates ) );
 		return this;
@@ -268,16 +252,12 @@ public class CriteriaQueryImpl<T> extends AbstractNode implements CriteriaQuery<
 
 	// ORDERING ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-	/**
+	@Override
-	 * {@inheritDoc}
-	 */
 	public List<Order> getOrderList() {
 		return orderSpecs;
 	}
 
-	/**
+	@Override
-	 * {@inheritDoc}
-	 */
 	public CriteriaQuery<T> orderBy(Order... orders) {
 		if ( orders != null && orders.length > 0 ) {
 			orderSpecs = Arrays.asList( orders );
@@ -288,28 +268,23 @@ public class CriteriaQueryImpl<T> extends AbstractNode implements CriteriaQuery<
 		return this;
 	}
 
-	/**
+	@Override
-	 * {@inheritDoc}
-	 */
 	public CriteriaQuery<T> orderBy(List<Order> orders) {
 		orderSpecs = orders;
 		return this;
 	}
 
-	/**
+	@Override
-	 * {@inheritDoc}
-	 */
 	public Set<ParameterExpression<?>> getParameters() {
 		return queryStructure.getParameters();
 	}
 
-	/**
+	@Override
-	 * {@inheritDoc}
-	 */
 	public <U> Subquery<U> subquery(Class<U> subqueryType) {
 		return queryStructure.subquery( subqueryType );
 	}
 
+	@Override
 	public void validate() {
 		// getRoots() is explicitly supposed to return empty if none defined, no need to check for null
 		if ( getRoots().isEmpty() ) {