minor cleanups to TenantIdBinder

Author: gavinking

hibernate-core/src/main/java/org/hibernate/binder/internal/TenantIdBinder.java

@@ -6,6 +6,7 @@
 
 import java.util.Collections;
 
+import org.hibernate.AssertionFailure;
 import org.hibernate.MappingException;
 import org.hibernate.annotations.TenantId;
 import org.hibernate.binder.AttributeBinder;
@@ -17,9 +18,9 @@
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Property;
 import org.hibernate.mapping.Selectable;
+import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.type.BasicType;
 import org.hibernate.type.descriptor.java.JavaType;
-import org.hibernate.type.spi.TypeConfiguration;
 
 import static java.util.Collections.emptyMap;
 import static java.util.Collections.singletonMap;
@@ -41,12 +42,11 @@ public void bind(
 			PersistentClass persistentClass,
 			Property property) {
 		final InFlightMetadataCollector collector = buildingContext.getMetadataCollector();
-		final TypeConfiguration typeConfiguration = collector.getTypeConfiguration();
 
 		final String returnedClassName = property.getReturnedClassName();
-		final BasicType<Object> tenantIdType = typeConfiguration
-				.getBasicTypeRegistry()
-				.getRegisteredType( returnedClassName );
+		final BasicType<Object> tenantIdType =
+				collector.getTypeConfiguration().getBasicTypeRegistry()
+						.getRegisteredType( returnedClassName );
 
 		final FilterDefinition filterDefinition = collector.getFilterDefinition( FILTER_NAME );
 		if ( filterDefinition == null ) {
@@ -63,13 +63,13 @@ public void bind(
 		}
 		else {
 			final JavaType<?> tenantIdTypeJtd = tenantIdType.getJavaTypeDescriptor();
-			final JavaType<?> parameterJtd = filterDefinition
-					.getParameterJdbcMapping( PARAMETER_NAME )
-					.getJavaTypeDescriptor();
-			if ( !parameterJtd.getJavaTypeClass().equals( tenantIdTypeJtd.getJavaTypeClass() ) ) {
+			final JdbcMapping jdbcMapping = filterDefinition.getParameterJdbcMapping( PARAMETER_NAME );
+			assert jdbcMapping != null;
+			final JavaType<?> parameterJavaType = jdbcMapping.getJavaTypeDescriptor();
+			if ( !parameterJavaType.getJavaTypeClass().equals( tenantIdTypeJtd.getJavaTypeClass() ) ) {
 				throw new MappingException(
 						"all @TenantId fields must have the same type: "
-								+ parameterJtd.getTypeName()
+								+ parameterJavaType.getTypeName()
 								+ " differs from "
 								+ tenantIdTypeJtd.getTypeName()
 				);
@@ -93,10 +93,16 @@ private String columnNameOrFormula(Property property) {
 		if ( property.getColumnSpan() != 1 ) {
 			throw new MappingException( "@TenantId attribute must be mapped to a single column or formula" );
 		}
-		Selectable selectable = property.getSelectables().get( 0 );
-		return selectable.isFormula()
-				? ( (Formula) selectable ).getFormula()
-				: ( (Column) selectable ).getName();
+		final Selectable selectable = property.getSelectables().get( 0 );
+		if ( selectable instanceof Formula formula ) {
+			return formula.getFormula();
+		}
+		else if ( selectable instanceof Column column ) {
+			return column.getName();
+		}
+		else {
+			throw new AssertionFailure( "@TenantId attribute must be mapped to a column or formula" );
+		}
 	}
 
 }