HHH-18709 Add test for issue

Author: mbellade

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/JsonMappingTests.java

@@ -12,25 +12,24 @@
 import java.util.List;
 import java.util.Map;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import jakarta.json.JsonValue;
 import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.community.dialect.AltibaseDialect;
 import org.hibernate.dialect.AbstractHANADialect;
 import org.hibernate.dialect.DerbyDialect;
 import org.hibernate.dialect.OracleDialect;
-import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.dialect.SybaseDialect;
 import org.hibernate.metamodel.mapping.internal.BasicAttributeMapping;
 import org.hibernate.metamodel.spi.MappingMetamodelImplementor;
 import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.hibernate.query.MutationQuery;
+import org.hibernate.query.criteria.HibernateCriteriaBuilder;
 import org.hibernate.type.SqlTypes;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
 
 import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.Jira;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
@@ -41,15 +40,19 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.json.JsonValue;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
+import jakarta.persistence.criteria.CriteriaUpdate;
+import jakarta.persistence.criteria.Root;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isOneOf;
 import static org.hamcrest.Matchers.isA;
+import static org.hamcrest.Matchers.isOneOf;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
 
@@ -124,7 +127,8 @@ public void verifyMappings(SessionFactoryScope scope) {
 				"objectMap" );
 		final BasicAttributeMapping listAttribute = (BasicAttributeMapping) entityDescriptor.findAttributeMapping(
 				"list" );
-		final BasicAttributeMapping jsonAttribute = (BasicAttributeMapping) entityDescriptor.findAttributeMapping( "jsonString" );
+		final BasicAttributeMapping jsonAttribute = (BasicAttributeMapping) entityDescriptor.findAttributeMapping(
+				"jsonString" );
 
 		assertThat( stringMapAttribute.getJavaType().getJavaTypeClass(), equalTo( Map.class ) );
 		assertThat( objectMapAttribute.getJavaType().getJavaTypeClass(), equalTo( Map.class ) );
@@ -146,8 +150,8 @@ public void verifyReadWorks(SessionFactoryScope scope) {
 					assertThat( entityWithJson.stringMap, is( stringMap ) );
 					assertThat( entityWithJson.objectMap, is( objectMap ) );
 					assertThat( entityWithJson.list, is( list ) );
-					assertThat( entityWithJson.jsonNode, is( nullValue() ));
-					assertThat( entityWithJson.jsonValue, is( nullValue() ));
+					assertThat( entityWithJson.jsonNode, is( nullValue() ) );
+					assertThat( entityWithJson.jsonValue, is( nullValue() ) );
 				}
 		);
 	}
@@ -167,14 +171,14 @@ public void verifyMergeWorks(SessionFactoryScope scope) {
 					assertThat( entityWithJson.objectMap, is( nullValue() ) );
 					assertThat( entityWithJson.list, is( nullValue() ) );
 					assertThat( entityWithJson.jsonString, is( nullValue() ) );
-					assertThat( entityWithJson.jsonNode, is( nullValue() ));
-					assertThat( entityWithJson.jsonValue, is( nullValue() ));
+					assertThat( entityWithJson.jsonNode, is( nullValue() ) );
+					assertThat( entityWithJson.jsonValue, is( nullValue() ) );
 				}
 		);
 	}
 
 	@Test
-	@JiraKey( "HHH-16682" )
+	@JiraKey("HHH-16682")
 	public void verifyDirtyChecking(SessionFactoryScope scope) {
 		scope.inTransaction(
 				(session) -> {
@@ -198,7 +202,7 @@ public void verifyDirtyChecking(SessionFactoryScope scope) {
 	@SkipForDialect(dialectClass = AltibaseDialect.class, reason = "Altibase doesn't support comparing CLOBs with the = operator")
 	public void verifyComparisonWorks(SessionFactoryScope scope) {
 		scope.inTransaction(
-				(session) ->  {
+				(session) -> {
 					// PostgreSQL returns the JSON slightly formatted
 					String alternativeJson = "{\"name\": \"abc\"}";
 					EntityWithJson entityWithJson = session.createQuery(
@@ -243,6 +247,32 @@ else if ( nativeJson instanceof Clob ) {
 		);
 	}
 
+	@Test
+	@Jira("https://hibernate.atlassian.net/browse/HHH-18709")
+	public void verifyCriteriaUpdateQueryWorks(SessionFactoryScope scope) {
+		final Map<String, String> newMap = Map.of( "name", "ABC" );
+		final List<StringNode> newList = List.of( new StringNode( "ABC" ) );
+		final String newJson = "{\"count\":123}";
+		scope.inTransaction( session -> {
+			final HibernateCriteriaBuilder builder = session.getCriteriaBuilder();
+			final CriteriaUpdate<EntityWithJson> criteria = builder.createCriteriaUpdate( EntityWithJson.class );
+			final Root<EntityWithJson> root = criteria.from( EntityWithJson.class );
+			criteria.set( root.get( "stringMap" ), newMap );
+			criteria.set( "list", newList );
+			criteria.set( root.get( "jsonString" ), newJson );
+			criteria.where( builder.equal( root.get( "id" ), 1 ) );
+			final MutationQuery query = session.createMutationQuery( criteria );
+			final int count = query.executeUpdate();
+			assertThat( count, is( 1 ) );
+		} );
+		scope.inSession( session -> {
+			final EntityWithJson entityWithJson = session.find( EntityWithJson.class, 1 );
+			assertThat( entityWithJson.stringMap, is( newMap ) );
+			assertThat( entityWithJson.list, is( newList ) );
+			assertThat( entityWithJson.jsonString.replaceAll( "\\s", "" ), is( newJson ) );
+		} );
+	}
+
 	@Entity(name = "EntityWithJson")
 	@Table(name = "EntityWithJson")
 	public static class EntityWithJson {