From 1fc9c2529b9c4b7ffa05310aa8a66f4991f2b30c Mon Sep 17 00:00:00 2001 From: Oliver Drotbohm Date: Wed, 13 Jul 2022 17:49:03 +0200 Subject: [PATCH] Set up entity load graph test according to what's required by Hibernate 6. As recommended in [0], we now set up our integration tests verifying the application of entity load graphs using a lazy @ManyToOne relationship. [0] https://hibernate.atlassian.net/browse/HHH-15391 Related to #2423. --- .../org/springframework/data/jpa/domain/sample/User.java | 7 +++---- .../EntityGraphRepositoryMethodsIntegrationTests.java | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/User.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/User.java index ebf3b7f0a..4521b9792 100644 --- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/User.java +++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/User.java @@ -92,8 +92,7 @@ import java.util.Set; @Table(name = "SD_User") public class User { - @Id - @GeneratedValue(strategy = GenerationType.AUTO) private Integer id; + @Id @GeneratedValue(strategy = GenerationType.AUTO) private Integer id; private String firstname; private String lastname; private int age; @@ -106,7 +105,7 @@ public class User { @ManyToMany private Set roles; - @ManyToOne private User manager; + @ManyToOne(fetch = FetchType.LAZY) private User manager; @Embedded private Address address; @@ -372,7 +371,7 @@ public class User { User that = (User) obj; - if (null == this.getId() || null == that.getId()) { + if ((null == this.getId()) || (null == that.getId())) { return false; } diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/EntityGraphRepositoryMethodsIntegrationTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/EntityGraphRepositoryMethodsIntegrationTests.java index 224a3e251..0e3254370 100644 --- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/EntityGraphRepositoryMethodsIntegrationTests.java +++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/EntityGraphRepositoryMethodsIntegrationTests.java @@ -31,7 +31,6 @@ import java.util.List; import org.assertj.core.api.SoftAssertions; import org.junit.Assume; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; @@ -94,7 +93,6 @@ public class EntityGraphRepositoryMethodsIntegrationTests { } @Test // DATAJPA-612 - @Disabled // HHH-15391 void shouldRespectConfiguredJpaEntityGraph() { Assume.assumeTrue(currentEntityManagerIsAJpa21EntityManager(em));