HHH-18979 endsWith(), startsWith(), contains()

Author: gavinking

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

@@ -119,6 +119,13 @@ static <T, U extends Comparable<U>> Restriction<T> lessThanOrEqual(SingularAttri
 		return restrict( attribute, Range.lessThanOrEqualTo( upperBound ) );
 	}
 
+	static <T> Restriction<T> like(
+			SingularAttribute<T, String> attribute,
+			String pattern, boolean caseSensitive,
+			char charWildcard, char stringWildcard) {
+		return like( attribute, escape( pattern, charWildcard, stringWildcard ), caseSensitive );
+	}
+
 	static <T> Restriction<T> like(SingularAttribute<T, String> attribute, String pattern, boolean caseSensitive) {
 		return restrict( attribute, Range.pattern( pattern, caseSensitive ) );
 	}
@@ -135,6 +142,22 @@ static <T> Restriction<T> notLike(SingularAttribute<T, String> attribute, String
 		return like( attribute, pattern, caseSensitive ).negated();
 	}
 
+	static <T> Restriction<T> startsWith(SingularAttribute<T, String> attribute, String prefix) {
+		return like( attribute, escape( prefix ) + '%' );
+	}
+
+	static <T> Restriction<T> endWith(SingularAttribute<T, String> attribute, String suffix) {
+		return like( attribute, '%' + escape( suffix ) );
+	}
+
+	static <T> Restriction<T> contains(SingularAttribute<T, String> attribute, String substring) {
+		return like( attribute, '%' + escape( substring ) + '%' );
+	}
+
+	static <T> Restriction<T> notContains(SingularAttribute<T, String> attribute, String substring) {
+		return contains( attribute, substring ).negated();
+	}
+
 	@SafeVarargs
 	static <T> Restriction<T> and(Restriction<T>... restrictions) {
 		return new Conjunction<>( java.util.List.of( restrictions ) );
@@ -148,4 +171,36 @@ static <T> Restriction<T> or(Restriction<T>... restrictions) {
 	static <T> Restriction<T> unrestricted() {
 		return new Unrestricted<>();
 	}
+
+	private static String escape(String literal, char charWildcard, char stringWildcard) {
+		final var result = new StringBuilder();
+		for ( int i = 0; i < literal.length(); i++ ) {
+			final char ch = literal.charAt( i );
+			if ( ch == charWildcard ) {
+				result.append( '_' );
+			}
+			else if ( ch == stringWildcard ) {
+				result.append( '%' );
+			}
+			else {
+				if ( ch=='%' || ch=='_' || ch=='\\' ) {
+					result.append('\\');
+				}
+				result.append( ch );
+			}
+		}
+		return result.toString();
+	}
+
+	private static String escape(String literal) {
+		final var result = new StringBuilder();
+		for ( int i = 0; i < literal.length(); i++ ) {
+			final char ch = literal.charAt( i );
+			if ( ch=='%' || ch=='_' || ch=='\\' ) {
+				result.append('\\');
+			}
+			result.append( ch );
+		}
+		return result.toString();
+	}
 }

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

@@ -17,9 +17,10 @@ record Pattern(String pattern, boolean caseSensitive) implements Range<String> {
 	@Override
 	public Predicate toPredicate(Path<String> path, CriteriaBuilder builder) {
 		return caseSensitive
-				? builder.like( path, builder.literal( pattern ) )
+				? builder.like( path, builder.literal( pattern ), '\\' )
 				: builder.like( builder.lower( path ),
-						builder.literal( pattern.toLowerCase( Locale.ROOT ) ) );
+						builder.literal( pattern.toLowerCase( Locale.ROOT ) ),
+						'\\' );
 	}
 
 	@Override

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

@@ -79,6 +79,10 @@ static Range<String> pattern(String pattern, boolean caseSensitive) {
 		return new Pattern( pattern, caseSensitive );
 	}
 
+	static Range<String> pattern(String pattern) {
+		return pattern( pattern, true );
+	}
+
 	static <U> Range<U> empty(Class<U> type) {
 		return new EmptyRange<>( type );
 	}

hibernate-core/src/test/java/org/hibernate/orm/test/query/restriction/RestrictionTest.java

@@ -91,6 +91,21 @@ void test(SessionFactoryScope scope) {
 						.addRestriction( Restriction.unrestricted().negated() )
 						.getResultList() );
 		assertEquals( 0, noBooks.size() );
+		List<Book> books1 = scope.fromSession( session ->
+				session.createSelectionQuery( "from Book", Book.class)
+						.addRestriction( Restriction.endWith(title, "Hibernate") )
+						.getResultList() );
+		assertEquals( 1, books1.size() );
+		List<Book> books2 = scope.fromSession( session ->
+				session.createSelectionQuery( "from Book", Book.class)
+						.addRestriction( Restriction.like(title, "*Hibernat?", false, '?', '*') )
+						.getResultList() );
+		assertEquals( 1, books2.size() );
+		List<Book> books3 = scope.fromSession( session ->
+				session.createSelectionQuery( "from Book", Book.class)
+						.addRestriction( Restriction.contains(title, "Hibernate") )
+						.getResultList() );
+		assertEquals( 2, books3.size() );
 	}
 
 	@Entity(name="Book")