From 2f69b704d1e8a2fa58f30e52cd7856c3629605e6 Mon Sep 17 00:00:00 2001 From: Marco Belladelli Date: Fri, 16 Jun 2023 11:48:02 +0200 Subject: [PATCH] HHH-16784 Add test for issue --- .../MappedSuperclassTemporalAccessorTest.java | 128 ++++++++++++++++++ 1 file changed, 128 insertions(+) create mode 100644 hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/MappedSuperclassTemporalAccessorTest.java diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/MappedSuperclassTemporalAccessorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/MappedSuperclassTemporalAccessorTest.java new file mode 100644 index 0000000000..5b536cab61 --- /dev/null +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/MappedSuperclassTemporalAccessorTest.java @@ -0,0 +1,128 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later + * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + */ +package org.hibernate.orm.test.annotations.generics; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.time.temporal.TemporalAccessor; + +import org.hibernate.query.criteria.JpaPath; + +import org.hibernate.testing.orm.junit.DomainModel; +import org.hibernate.testing.orm.junit.Jira; +import org.hibernate.testing.orm.junit.SessionFactory; +import org.hibernate.testing.orm.junit.SessionFactoryScope; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Root; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * @author Marco Belladelli + */ +@SessionFactory +@DomainModel( annotatedClasses = { + MappedSuperclassTemporalAccessorTest.AbstractSuperclass.class, + MappedSuperclassTemporalAccessorTest.TestEntity.class, +} ) +@Jira( "https://hibernate.atlassian.net/browse/HHH-16784" ) +public class MappedSuperclassTemporalAccessorTest { + @BeforeAll + public void setUp(SessionFactoryScope scope) { + scope.inTransaction( session -> session.persist( new TestEntity( + 1L, + "Marco", + LocalDateTime.of( 2023, 6, 16, 11, 41 ) + ) ) ); + } + + @AfterAll + public void tearDown(SessionFactoryScope scope) { + scope.inTransaction( session -> session.createMutationQuery( "delete from TestEntity" ).executeUpdate() ); + } + + @Test + public void testGenericTemporalAccessorPath(SessionFactoryScope scope) { + scope.inTransaction( session -> { + final CriteriaBuilder cb = session.getCriteriaBuilder(); + final CriteriaQuery cq = cb.createQuery( Object.class ); + final Root root = cq.from( TestEntity.class ); + final Path createTime = root.get( "createTime" ); + assertThat( createTime.getModel() ).isSameAs( root.getModel().getAttribute( "createTime" ) ); + assertThat( ( (JpaPath) createTime ).getResolvedModel() + .getBindableJavaType() ).isEqualTo( LocalDateTime.class ); + final Object result = session.createQuery( cq.select( createTime ) ).getSingleResult(); + assertThat( result ).isEqualTo( LocalDateTime.of( 2023, 6, 16, 11, 41 ) ); + } ); + } + + @Test + public void testGenericSerializablePath(SessionFactoryScope scope) { + scope.inTransaction( session -> { + final CriteriaBuilder cb = session.getCriteriaBuilder(); + final CriteriaQuery cq = cb.createQuery( Object.class ); + final Root root = cq.from( TestEntity.class ); + final Path id = root.get( "id" ); + assertThat( id.getModel() ).isSameAs( root.getModel().getAttribute( "id" ) ); + assertThat( ( (JpaPath) id ).getResolvedModel() + .getBindableJavaType() ).isEqualTo( Long.class ); + final Object result = session.createQuery( cq.select( id ) ).getSingleResult(); + assertThat( result ).isEqualTo( 1L ); + } ); + } + + @Test + public void testGenericObjectPath(SessionFactoryScope scope) { + scope.inTransaction( session -> { + final CriteriaBuilder cb = session.getCriteriaBuilder(); + final CriteriaQuery cq = cb.createQuery( Object.class ); + final Root root = cq.from( TestEntity.class ); + final Path createUser = root.get( "createUser" ); + assertThat( createUser.getModel() ).isSameAs( root.getModel().getAttribute( "createUser" ) ); + assertThat( ( (JpaPath) createUser ).getResolvedModel() + .getBindableJavaType() ).isEqualTo( String.class ); + final Object result = session.createQuery( cq.select( createUser ) ).getSingleResult(); + assertThat( result ).isEqualTo( "Marco" ); + } ); + } + + @MappedSuperclass + public static abstract class AbstractSuperclass { + @Id + private I id; + private U createUser; + private T createTime; + + public AbstractSuperclass() { + } + + public AbstractSuperclass(I id, U createUser, T createTime) { + this.id = id; + this.createUser = createUser; + this.createTime = createTime; + } + } + + @Entity( name = "TestEntity" ) + public static class TestEntity extends AbstractSuperclass { + public TestEntity() { + } + + public TestEntity(Long id, String createUser, LocalDateTime createTime) { + super( id, createUser, createTime ); + } + } +}