HHH-19449 clean up TupleType hierarchy

Author: gavinking

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

@@ -16,17 +16,15 @@
 import org.hibernate.query.sqm.SqmBindable;
 import org.hibernate.query.sqm.tree.domain.SqmDomainType;
 import org.hibernate.query.sqm.tuple.TupleType;
-import org.hibernate.metamodel.model.domain.ReturnableType;
 import org.hibernate.query.sqm.SqmExpressible;
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.descriptor.java.ObjectArrayJavaType;
 
 /**
  * @author Christian Beikov
  */
-public class ArrayTupleType implements TupleType<Object[]>,
-		ReturnableType<Object[]>, SqmDomainType<Object[]>,
-		MappingModelExpressible<Object[]> {
+public class ArrayTupleType
+		implements TupleType<Object[]>, SqmDomainType<Object[]>, MappingModelExpressible<Object[]> {
 
 	private final ObjectArrayJavaType javaType;
 	private final SqmBindable<?>[] components;

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

@@ -6,14 +6,16 @@
 
 import org.hibernate.Incubating;
 import org.hibernate.metamodel.model.domain.DomainType;
-import org.hibernate.query.BindableType;
 import org.hibernate.query.sqm.SqmBindable;
 
 @Incubating
 public interface SqmDomainType<T>
-		extends DomainType<T>, SqmBindable<T>, BindableType<T> {
+		extends DomainType<T>, SqmBindable<T> {
+
 	@Override
-	SqmDomainType<T> getSqmType();
+	default Class<T> getJavaType() {
+		return SqmBindable.super.getJavaType();
+	}
 
 	@Override
 	default String getTypeName() {
@@ -23,7 +25,4 @@ default String getTypeName() {
 	default int getTupleLength() {
 		return 1;
 	}
-
-	@Override
-	Class<T> getJavaType();
 }

hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/TupleType.java

@@ -4,17 +4,17 @@
  */
 package org.hibernate.query.sqm.tuple;
 
-import java.util.List;
-
+import org.hibernate.metamodel.model.domain.ReturnableType;
 import org.hibernate.query.sqm.SqmBindable;
-import org.hibernate.query.sqm.SqmExpressible;
+
+import java.util.List;
 
 /**
  * Describes any structural type without a direct java type representation.
  *
  * @author Christian Beikov
  */
-public interface TupleType<J> extends SqmExpressible<J> {
+public interface TupleType<J> extends ReturnableType<J> {
 
 	int componentCount();
 	String getComponentName(int index);

hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleType.java

@@ -23,7 +23,6 @@
 import org.hibernate.query.sqm.tree.domain.SqmDomainType;
 import org.hibernate.query.sqm.tree.domain.SqmPluralPersistentAttribute;
 import org.hibernate.query.sqm.tuple.TupleType;
-import org.hibernate.metamodel.model.domain.ReturnableType;
 import org.hibernate.query.SemanticException;
 import org.hibernate.query.sqm.SqmExpressible;
 import org.hibernate.query.sqm.tree.domain.SqmPath;
@@ -46,7 +45,7 @@
  */
 @Incubating
 public class AnonymousTupleType<T>
-		implements TupleType<T>, SqmDomainType<T>, ReturnableType<T>, SqmPathSource<T> {
+		implements TupleType<T>, SqmDomainType<T>, SqmPathSource<T> {
 
 	private final JavaType<T> javaTypeDescriptor;
 	private final @Nullable NavigablePath[] componentSourcePaths;
@@ -277,7 +276,7 @@ public Class<T> getBindableJavaType() {
 
 	@Override
 	public Class<T> getJavaType() {
-		return getBindableJavaType();
+		return SqmDomainType.super.getJavaType();
 	}
 
 	@Override