HHH-18979 provide untypesafe version of API

Author: gavinking

hibernate-core/src/main/java/org/hibernate/query/NamedAttributeRange.java

@@ -0,0 +1,45 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.query;
+
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.SingularAttribute;
+import org.hibernate.query.range.Range;
+
+/**
+ * Restricts an attribute of an entity to a given {@link Range}.
+ *
+ * @param <X> The entity type
+ * @param <U> The attribute type
+ */
+record NamedAttributeRange<X, U>(Class<X> entity, String attributeName, Range<U> range) implements Restriction<X> {
+	@Override
+	public Restriction<X> negated() {
+		return new Negation<>( this );
+	}
+
+	@Override
+	public Predicate toPredicate(Root<? extends X> root, CriteriaBuilder builder) {
+		final EntityType<? extends X> entityType = root.getModel();
+		if ( !entity.isAssignableFrom( entityType.getJavaType() ) ) {
+			throw new IllegalArgumentException( "Root entity is not a subtype of '" + entity.getTypeName() + "'" );
+		}
+		final Attribute<?, ?> att = entityType.getAttribute( attributeName );
+		if ( !range.getType().isAssignableFrom( att.getJavaType() ) ) {
+			throw new IllegalArgumentException( "Attribute '" + attributeName
+					+ "' is not assignable to range of type '" + range.getType().getName() + "'" );
+		}
+		if ( !(att instanceof SingularAttribute) ) {
+			throw new IllegalArgumentException( "Attribute '" + attributeName + "' is not singular" );
+		}
+		@SuppressWarnings("unchecked")
+		final SingularAttribute<X, U> attribute = (SingularAttribute<X, U>) att;
+		return range.toPredicate( root, attribute, builder );
+	}
+}

hibernate-core/src/main/java/org/hibernate/query/Restriction.java

@@ -57,6 +57,10 @@ static <T, U> Restriction<T> restrict(SingularAttribute<T, U> attribute, Range<U
 		return new AttributeRange<>( attribute, range );
 	}
 
+	static <T> Restriction<T> restrict(Class<T> type, String attributeName, Range<?> range) {
+		return new NamedAttributeRange<>( type, attributeName, range );
+	}
+
 	static <T, U> Restriction<T> equal(SingularAttribute<T, U> attribute, U value) {
 		return restrict( attribute, Range.singleValue( value ) );
 	}

hibernate-core/src/main/java/org/hibernate/query/range/CaseInsensitiveValue.java

@@ -25,4 +25,9 @@ public <X> Predicate toPredicate(Path<? extends X> root, SingularAttribute<X, St
 		final Expression<String> literal = builder.literal( value.toLowerCase( Locale.ROOT ) );
 		return builder.lower( root.get( attribute ) ).equalTo( literal );
 	}
+
+	@Override
+	public Class<String> getType() {
+		return String.class;
+	}
 }

hibernate-core/src/main/java/org/hibernate/query/range/Interval.java

@@ -22,4 +22,9 @@ public <X> Predicate toPredicate(Path<? extends X> root, SingularAttribute<X, U>
 				: builder.between( root.get( attribute ),
 						builder.literal( lowerBound.bound() ), builder.literal( upperBound.bound() ) );
 	}
+
+	@Override
+	public Class<? extends U> getType() {
+		return lowerBound.getType();
+	}
 }

hibernate-core/src/main/java/org/hibernate/query/range/LowerBound.java

@@ -25,4 +25,9 @@ public <X> Predicate toPredicate(Path<? extends X> root, SingularAttribute<X, U>
 				? builder.greaterThan( root.get( attribute ), literal )
 				: builder.greaterThanOrEqualTo( root.get( attribute ), literal );
 	}
+
+	@Override @SuppressWarnings("unchecked")
+	public Class<? extends U> getType() {
+		return (Class<? extends U>) bound.getClass();
+	}
 }

hibernate-core/src/main/java/org/hibernate/query/range/Pattern.java

@@ -22,4 +22,9 @@ public <X> Predicate toPredicate(Path<? extends X> root, SingularAttribute<X, St
 				: builder.like( builder.lower( root.get( attribute ) ),
 						builder.literal( pattern.toLowerCase( Locale.ROOT ) ) );
 	}
+
+	@Override
+	public Class<String> getType() {
+		return String.class;
+	}
 }

hibernate-core/src/main/java/org/hibernate/query/range/Range.java

@@ -28,6 +28,8 @@
 @Incubating
 public interface Range<U> {
 
+	Class<? extends U> getType();
+
 	/**
 	 * Return a JPA Criteria {@link Predicate} constraining the given
 	 * attribute of the given root entity to this domain of allowed

hibernate-core/src/main/java/org/hibernate/query/range/UpperBound.java

@@ -25,4 +25,9 @@ public <X> Predicate toPredicate(Path<? extends X> root, SingularAttribute<X, U>
 				? builder.lessThan( root.get( attribute ), literal )
 				: builder.lessThanOrEqualTo( root.get( attribute ), literal );
 	}
+
+	@Override @SuppressWarnings("unchecked")
+	public Class<? extends U> getType() {
+		return (Class<? extends U>) bound.getClass();
+	}
 }

hibernate-core/src/main/java/org/hibernate/query/range/Value.java

@@ -23,4 +23,9 @@ public <X> Predicate toPredicate(Path<? extends X> root, SingularAttribute<X, U>
 		final Expression<U> literal = builder.literal( value );
 		return root.get( attribute ).equalTo( literal );
 	}
+
+	@Override @SuppressWarnings("unchecked")
+	public Class<? extends U> getType() {
+		return (Class<? extends U>) value.getClass();
+	}
 }

hibernate-core/src/main/java/org/hibernate/query/range/ValueList.java

@@ -19,4 +19,9 @@ record ValueList<U>(List<U> values) implements Range<U> {
 	public <X> Predicate toPredicate(Path<? extends X> root, SingularAttribute<X, U> attribute, CriteriaBuilder builder) {
 		return root.get( attribute ).in( values.stream().map( builder::literal ).toList() );
 	}
+
+	@Override @SuppressWarnings("unchecked")
+	public Class<? extends U> getType() {
+		return (Class<? extends U>) values.get(0).getClass();
+	}
 }