HHH-16972 try getting rid of DomainType.getSqlType()

Author: gavinking

hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayConstructorFunction.java

@@ -6,7 +6,6 @@
 
 import java.util.List;
 
-import org.hibernate.metamodel.model.domain.DomainType;
 import org.hibernate.metamodel.model.domain.ReturnableType;
 import org.hibernate.query.SemanticException;
 import org.hibernate.sql.ast.SqlAstTranslator;
@@ -31,10 +30,9 @@ public void render(
 					"Oracle array constructor emulation requires knowledge about the return type, but resolved return type could not be determined"
 			);
 		}
-		final DomainType<?> type = returnType.getSqmType();
-		if ( !(type instanceof BasicPluralType<?, ?> pluralType) ) {
+		if ( !(returnType instanceof BasicPluralType<?, ?> pluralType) ) {
 			throw new SemanticException(
-					"Oracle array constructor emulation requires a basic plural return type, but resolved return type was: " + type
+					"Oracle array constructor emulation requires a basic plural return type, but resolved return type was: " + returnType
 			);
 		}
 		final String arrayTypeName = DdlTypeHelper.getCastTypeName(

hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayConstructorFunction.java

@@ -6,7 +6,6 @@
 
 import java.util.List;
 
-import org.hibernate.metamodel.model.domain.DomainType;
 import org.hibernate.metamodel.model.domain.ReturnableType;
 import org.hibernate.sql.ast.SqlAstTranslator;
 import org.hibernate.sql.ast.spi.SqlAppender;
@@ -32,16 +31,13 @@ public void render(
 			ReturnableType<?> returnType,
 			SqlAstTranslator<?> walker) {
 		String arrayTypeName = null;
-		if ( returnType != null ) {
-			final DomainType<?> type = returnType.getSqmType();
-			if ( type instanceof BasicPluralType<?, ?> pluralType ) {
-				if ( needsArrayCasting( pluralType.getElementType() ) ) {
-					arrayTypeName = DdlTypeHelper.getCastTypeName(
-							returnType,
-							walker.getSessionFactory().getTypeConfiguration()
-					);
-					sqlAppender.append( "cast(" );
-				}
+		if ( returnType instanceof BasicPluralType<?, ?> pluralType ) {
+			if ( needsArrayCasting( pluralType.getElementType() ) ) {
+				arrayTypeName = DdlTypeHelper.getCastTypeName(
+						returnType,
+						walker.getSessionFactory().getTypeConfiguration()
+				);
+				sqlAppender.append( "cast(" );
 			}
 		}
 		super.render( sqlAppender, sqlAstArguments, returnType, walker );

hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayTrimEmulation.java

@@ -6,7 +6,6 @@
 
 import java.util.List;
 
-import org.hibernate.metamodel.model.domain.DomainType;
 import org.hibernate.metamodel.model.domain.ReturnableType;
 import org.hibernate.sql.ast.SqlAstTranslator;
 import org.hibernate.sql.ast.spi.SqlAppender;
@@ -35,15 +34,12 @@ public void render(
 		elementCountExpression.accept( walker );
 
 		String arrayTypeName = null;
-		if ( returnType != null ) {
-			final DomainType<?> type = returnType.getSqmType();
-			if ( type instanceof BasicPluralType<?, ?> pluralType ) {
-				if ( needsArrayCasting( pluralType.getElementType() ) ) {
-					arrayTypeName = DdlTypeHelper.getCastTypeName(
-							returnType,
-							walker.getSessionFactory().getTypeConfiguration()
-					);
-				}
+		if ( returnType instanceof BasicPluralType<?, ?> pluralType ) {
+			if ( needsArrayCasting( pluralType.getElementType() ) ) {
+				arrayTypeName = DdlTypeHelper.getCastTypeName(
+						returnType,
+						walker.getSessionFactory().getTypeConfiguration()
+				);
 			}
 		}
 		if ( arrayTypeName != null ) {

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

@@ -24,10 +24,6 @@
  * @author Steve Ebersole
  */
 public interface DomainType<J> extends BindableType<J> {
-//	@Override
-	default DomainType<J> getSqmType() {
-		return this;
-	}
 
 	JavaType<J> getExpressibleJavaType();
 

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

@@ -18,10 +18,6 @@
  */
 public interface EmbeddableDomainType<J>
 		extends TreatableDomainType<J>, EmbeddableType<J> {
-	@Override
-	default EmbeddableDomainType<J> getSqmType() {
-		return this;
-	}
 
 	@Override
 	Collection<? extends EmbeddableDomainType<? extends J>> getSubTypes();

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

@@ -18,9 +18,4 @@ public interface EntityDomainType<J> extends IdentifiableDomainType<J>, EntityTy
 
 	@Override
 	Collection<? extends EntityDomainType<? extends J>> getSubTypes();
-
-	@Override
-	default EntityDomainType<J> getSqmType() {
-		return this;
-	}
 }

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

@@ -14,8 +14,4 @@
  */
 public interface MappedSuperclassDomainType<J>
 		extends IdentifiableDomainType<J>, MappedSuperclassType<J>, PathSource<J> {
-	@Override
-	default DomainType<J> getSqmType() {
-		return IdentifiableDomainType.super.getSqmType();
-	}
 }

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

@@ -8,8 +8,4 @@
  * @author Marco Belladelli
  */
 public interface TreatableDomainType<J> extends ManagedDomainType<J>, PathSource<J> {
-	@Override
-	default DomainType<J> getSqmType() {
-		return this;
-	}
 }

hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmMappedSuperclassDomainType.java

@@ -9,9 +9,7 @@
 
 public interface SqmMappedSuperclassDomainType<T> extends MappedSuperclassDomainType<T>, SqmPathSource<T>, SqmDomainType<T> {
 	@Override
-	default SqmMappedSuperclassDomainType<T> getSqmType() {
-		return this;
-	}
+	SqmMappedSuperclassDomainType<T> getSqmType();
 
 	@Override
 	default String getTypeName() {