HHH-16972 move getTupleLength() off API and onto SQM type

Author: gavinking

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/DomainType.java

@@ -4,7 +4,6 @@
  */
 package org.hibernate.metamodel.model.domain;
 
-import org.hibernate.Internal;
 import org.hibernate.type.descriptor.java.JavaType;
 
 /**
@@ -47,9 +46,4 @@ public interface DomainType<J> {
 	 *          However, using the string allows for dynamic models.
 	 */
 	String getTypeName();
-
-	@Internal
-	default int getTupleLength() {
-		return 1;
-	}
 }

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddableTypeImpl.java

@@ -14,6 +14,7 @@
 import org.hibernate.metamodel.model.domain.ManagedDomainType;
 import org.hibernate.metamodel.model.domain.spi.JpaMetamodelImplementor;
 import org.hibernate.query.sqm.SqmPathSource;
+import org.hibernate.query.sqm.tree.domain.SqmDomainType;
 import org.hibernate.query.sqm.tree.domain.SqmPath;
 import org.hibernate.query.sqm.tree.domain.SqmEmbeddableDomainType;
 import org.hibernate.type.descriptor.java.JavaType;
@@ -48,10 +49,11 @@ public PersistenceType getPersistenceType() {
 		return PersistenceType.EMBEDDABLE;
 	}
 
+	@Override
 	public int getTupleLength() {
 		int count = 0;
 		for ( var attribute : getSingularAttributes() ) {
-			count += ( (DomainType<?>) attribute.getType() ).getTupleLength();
+			count += ( (SqmDomainType<?>) attribute.getType() ).getTupleLength();
 		}
 		return count;
 	}

hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmDomainType.java

@@ -17,4 +17,8 @@ public interface SqmDomainType<T>
 	default String getTypeName() {
 		return SqmExpressible.super.getTypeName();
 	}
+
+	default int getTupleLength() {
+		return 1;
+	}
 }

hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectableNode.java

@@ -7,10 +7,10 @@
 import java.util.function.Consumer;
 import jakarta.persistence.criteria.Selection;
 
-import org.hibernate.metamodel.model.domain.DomainType;
 import org.hibernate.query.criteria.JpaSelection;
 import org.hibernate.query.sqm.tree.SqmCopyContext;
 import org.hibernate.query.sqm.tree.SqmTypedNode;
+import org.hibernate.query.sqm.tree.domain.SqmDomainType;
 
 /**
  * Defines a SQM AST node that can be used as a selection in the query,
@@ -33,7 +33,7 @@ public interface SqmSelectableNode<T> extends JpaSelection<T>, SqmTypedNode<T> {
 	SqmSelectableNode<T> copy(SqmCopyContext context);
 
 	default Integer getTupleLength() {
-		final DomainType<T> sqmType = getNodeType() == null ? null : getNodeType().getSqmType();
+		final SqmDomainType<T> sqmType = getNodeType() == null ? null : getNodeType().getSqmType();
 		return sqmType == null ? 1 : sqmType.getTupleLength();
 	}
 }