Fix code to work with hibernate 7 and eclipselink 5

Author: velo

querydsl-libraries/querydsl-jpa/pom.xml

@@ -35,6 +35,13 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.hibernate.orm</groupId>
+      <artifactId>hibernate-community-dialects</artifactId>
+      <version>${hibernate.version}</version>
+      <scope>provided</scope>
+      <optional>true</optional>
+    </dependency>
 
     <dependency>
       <groupId>jakarta.persistence</groupId>

querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QDerbyDialect.java

@@ -16,7 +16,7 @@
 import com.querydsl.core.types.Ops;
 import com.querydsl.sql.DerbyTemplates;
 import org.hibernate.boot.model.FunctionContributions;
-import org.hibernate.dialect.DerbyDialect;
+import org.hibernate.community.dialect.DerbyDialect;
 
 /** {@code QDerbyDialect} extends {@code DerbyDialect} with additional functions */
 public class QDerbyDialect extends DerbyDialect {

querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/AbstractJPATest.java

@@ -283,6 +283,7 @@ public void aggregates_uniqueResult_min() {
   }
 
   @Test
+  @NoEclipseLink
   public void alias() {
     assertThat(query().from(cat).select(cat.id.as(cat.id)).fetch()).hasSize(6);
   }

querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateBase.java

@@ -77,7 +77,7 @@ public void setSession(Session session) {
 
   @Override
   protected void save(Object entity) {
-    session.save(entity);
+    session.persist(entity);
   }
 
   @Test

querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateSQLBase.java

@@ -56,12 +56,12 @@ public void setSession(Session session) {
   @Before
   public void setUp() {
     if (query().from(cat).fetchCount() == 0) {
-      session.save(new Cat("Beck", 1, Color.BLACK));
-      session.save(new Cat("Kate", 2, Color.BLACK));
-      session.save(new Cat("Kitty", 3, Color.BLACK));
-      session.save(new Cat("Bobby", 4, Color.BLACK));
-      session.save(new Cat("Harold", 5, Color.BLACK));
-      session.save(new Cat("Tim", 6, Color.BLACK));
+      session.persist(new Cat("Beck", 1, Color.BLACK));
+      session.persist(new Cat("Kate", 2, Color.BLACK));
+      session.persist(new Cat("Kitty", 3, Color.BLACK));
+      session.persist(new Cat("Bobby", 4, Color.BLACK));
+      session.persist(new Cat("Harold", 5, Color.BLACK));
+      session.persist(new Cat("Tim", 6, Color.BLACK));
       session.flush();
     }
   }

querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/IntegrationBase.java

@@ -98,8 +98,8 @@ private HibernateInsertClause insert(EntityPath<?> entity) {
 
   @Test
   public void scroll() {
-    session.save(new Cat("Bob", 10));
-    session.save(new Cat("Steve", 11));
+    session.persist(new Cat("Bob", 10));
+    session.persist(new Cat("Steve", 11));
 
     var cat = QCat.cat;
     HibernateQuery<?> query = new HibernateQuery<Void>(session);
@@ -112,7 +112,7 @@ public void scroll() {
 
   @Test
   public void insert() {
-    session.save(new Cat("Bob", 10));
+    session.persist(new Cat("Bob", 10));
 
     var cat = QCat.cat;
     var amount = insert(cat).set(cat.name, "Bobby").set(cat.alive, false).execute();
@@ -123,7 +123,7 @@ public void insert() {
 
   @Test
   public void insert2() {
-    session.save(new Cat("Bob", 10));
+    session.persist(new Cat("Bob", 10));
 
     var cat = QCat.cat;
     var amount = insert(cat).columns(cat.name, cat.alive).values("Bobby", false).execute();
@@ -134,7 +134,7 @@ public void insert2() {
 
   @Test
   public void insert3() {
-    session.save(new Cat("Bob", 10));
+    session.persist(new Cat("Bob", 10));
 
     var cat = QCat.cat;
     var bob = new QCat("Bob");
@@ -151,8 +151,8 @@ public void insert3() {
 
   @Test
   public void update() {
-    session.save(new Cat("Bob", 10));
-    session.save(new Cat("Steve", 11));
+    session.persist(new Cat("Bob", 10));
+    session.persist(new Cat("Steve", 11));
 
     var cat = QCat.cat;
     var amount =
@@ -168,8 +168,8 @@ public void update() {
 
   @Test
   public void update_with_null() {
-    session.save(new Cat("Bob", 10));
-    session.save(new Cat("Steve", 11));
+    session.persist(new Cat("Bob", 10));
+    session.persist(new Cat("Steve", 11));
 
     var cat = QCat.cat;
     var amount =
@@ -183,8 +183,8 @@ public void update_with_null() {
 
   @Test
   public void delete() {
-    session.save(new Cat("Bob", 10));
-    session.save(new Cat("Steve", 11));
+    session.persist(new Cat("Bob", 10));
+    session.persist(new Cat("Steve", 11));
 
     var cat = QCat.cat;
     var amount = delete(cat).where(cat.name.eq("Bob")).execute();
@@ -195,7 +195,7 @@ public void delete() {
   public void collection() throws Exception {
     List<Cat> cats = Arrays.asList(new Cat("Bob", 10), new Cat("Steve", 11));
     for (Cat cat : cats) {
-      session.save(cat);
+      session.persist(cat);
     }
 
     query().from(cat).innerJoin(cat.kittens, kitten).where(kitten.in(cats)).parse();

querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/QueryHelper.java

@@ -83,7 +83,9 @@ public void parse() {
 
     var input = toString();
     logger.fine("input: " + input.replace('\n', ' '));
-    var parser = HqlParseTreeBuilder.INSTANCE.buildHqlParser(input);
+    var parser =
+        HqlParseTreeBuilder.INSTANCE.buildHqlParser(
+            input, HqlParseTreeBuilder.INSTANCE.buildHqlLexer(input));
     parser.statement();
   }
 

querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/UniqueResultsTest.java

@@ -32,9 +32,9 @@ public class UniqueResultsTest implements HibernateTest {
 
   @Test
   public void test() {
-    session.save(new Cat("Bob1", 1));
-    session.save(new Cat("Bob2", 2));
-    session.save(new Cat("Bob3", 3));
+    session.persist(new Cat("Bob1", 1));
+    session.persist(new Cat("Bob2", 2));
+    session.persist(new Cat("Bob3", 3));
 
     assertThat(
             query()

querydsl-tooling/querydsl-apt/src/main/java/com/querydsl/apt/hibernate/HibernateConfiguration.java

@@ -47,7 +47,7 @@ public HibernateConfiguration(
   protected List<Class<? extends Annotation>> getAnnotations() {
     try {
       List<Class<? extends Annotation>> annotations = new ArrayList<>(super.getAnnotations());
-      for (String simpleName : Arrays.asList("Type", "Cascade", "LazyCollection", "OnDelete")) {
+      for (String simpleName : Arrays.asList("Type", "Cascade", "OnDelete")) {
         annotations.add(
             (Class<? extends Annotation>) Class.forName("org.hibernate.annotations." + simpleName));
       }

querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/InterfaceType2Test.java

@@ -49,8 +49,6 @@ public void setId(Long id) {
 
   @Entity
   @Table(name = "USERS")
-  //    @org.hibernate.annotations.AccessType("field")
-  @org.hibernate.annotations.Proxy(proxyClass = User.class)
   public static class UserImpl extends EntityImpl implements User {
 
     @NaturalId(mutable = true)
@@ -85,8 +83,6 @@ public void setParty(Party party) {
 
   @jakarta.persistence.Entity
   @Table(name = "PARTY")
-  //    @org.hibernate.annotations.AccessType("field")
-  @org.hibernate.annotations.Proxy(proxyClass = Party.class)
   public abstract static class PartyImpl extends EntityImpl implements Party {
 
     @Column(name = "NAME", nullable = false)