Sync master into querydsl-7.0

pom.xml

@@ -101,11 +101,11 @@
 
     <git-code-format-maven-plugin.version>5.3</git-code-format-maven-plugin.version>
 
-    <junit.version>5.12.0</junit.version>
+    <junit.version>5.12.1</junit.version>
     <ecj.version>3.33.0</ecj.version>
     <jdo.version>3.2.1</jdo.version>
-    <springboot.version>3.4.3</springboot.version>
-    <spring.version>6.2.3</spring.version>
+    <springboot.version>3.4.4</springboot.version>
+    <spring.version>6.2.5</spring.version>
 
     <!-- SQL deps -->
     <db2.version>12.1.0.0</db2.version>
@@ -115,7 +115,7 @@
     <postgresql.version>42.7.5</postgresql.version>
     <oracle.version>23.7.0.25.01</oracle.version>
     <mysql.version>9.2.0</mysql.version>
-    <mssql.version>12.9.0.jre8-preview</mssql.version>
+    <mssql.version>12.10.0.jre8</mssql.version>
     <cubrid.version>9.3.9.0002</cubrid.version>
     <sqlite.version>3.49.1.0</sqlite.version>
     <teradata.version>13.10.00.35</teradata.version>
@@ -125,30 +125,30 @@
     <r2dbc.version>1.0.0.RELEASE</r2dbc.version>
 
     <!-- JPA deps -->
-    <hibernate.version>6.6.10.Final</hibernate.version>
+    <hibernate.version>6.6.12.Final</hibernate.version>
     <hibernate.validator.version>8.0.2.Final</hibernate.validator.version>
     <eclipselink.version>4.0.5</eclipselink.version>
     <jpa.version>3.1.0</jpa.version>
     <jakarta.annotation.version>3.0.0</jakarta.annotation.version>
 
     <assertj.version>3.27.3</assertj.version>
     <mvn.version>3.9.9</mvn.version>
-    <guava.version>33.4.0-jre</guava.version>
+    <guava.version>33.4.6-jre</guava.version>
     <codegen.version>0.6.8</codegen.version>
     <mysema.lang.version>0.2.4</mysema.lang.version>
-    <byte-buddy.version>1.17.2</byte-buddy.version>
+    <byte-buddy.version>1.17.5</byte-buddy.version>
     <slf4j.version>2.0.17</slf4j.version>
-    <surefire.version>3.5.2</surefire.version>
+    <surefire.version>3.5.3</surefire.version>
     <animal-sniffer.version>1.24</animal-sniffer.version>
     <h2gis.version>2.2.3</h2gis.version>
     <morphia.version>1.3.2</morphia.version>
     <jmh.version>1.37</jmh.version>
-    <kotlin.version>2.1.10</kotlin.version>
-    <ksp.version>2.1.10-1.0.31</ksp.version>
+    <kotlin.version>2.1.20</kotlin.version>
+    <ksp.version>2.1.20-1.0.32</ksp.version>
     <kotlinpoet.version>2.1.0</kotlinpoet.version>
     <dokka.version>2.0.0</dokka.version>
     <scala.version>2.11.12</scala.version>
-    <asm.version>9.7.1</asm.version>
+    <asm.version>9.8</asm.version>
     <querydsl.version>${project.version}</querydsl.version>
 
     <!-- Import-Package definitions for maven-bundle-plugin -->
@@ -222,7 +222,7 @@
       <dependency>
         <groupId>org.geolatte</groupId>
         <artifactId>geolatte-geom</artifactId>
-        <version>1.9.1</version>
+        <version>1.10</version>
       </dependency>
       <dependency>
         <groupId>org.jetbrains.kotlin</groupId>
@@ -487,7 +487,7 @@
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.8.12</version>
+        <version>0.8.13</version>
         <executions>
           <execution>
             <id>prepare-agent</id>
@@ -1009,18 +1009,18 @@
           <plugin>
             <groupId>org.openrewrite.maven</groupId>
             <artifactId>rewrite-maven-plugin</artifactId>
-            <version>6.3.0</version>
+            <version>6.4.0</version>
 
             <dependencies>
               <dependency>
                 <groupId>org.openrewrite.recipe</groupId>
                 <artifactId>rewrite-testing-frameworks</artifactId>
-                <version>3.4.0</version>
+                <version>3.5.1</version>
               </dependency>
               <dependency>
                 <groupId>org.openrewrite.recipe</groupId>
                 <artifactId>rewrite-migrate-java</artifactId>
-                <version>3.4.0</version>
+                <version>3.5.0</version>
               </dependency>
             </dependencies>
 

querydsl-examples/querydsl-example-jpa-quarkus/pom.xml

@@ -12,7 +12,7 @@
   <name>Querydsl example - JPA Quarkus</name>
 
   <properties>
-    <quarkus.version>3.19.2</quarkus.version>
+    <quarkus.version>3.21.1</quarkus.version>
   </properties>
 
   <dependencyManagement>

querydsl-examples/querydsl-example-ksp-codegen/src/main/kotlin/com/querydsl/example/ksp/PersonDTO.kt

@@ -0,0 +1,11 @@
+package com.querydsl.example.ksp
+
+import com.querydsl.core.annotations.QueryProjection
+
+data class PersonClassConstructorDTO @QueryProjection constructor(
+    val id: Int,
+    val name: String,
+)
+
+@QueryProjection
+data class PersonClassDTO (val id: Int, val name: String)

querydsl-examples/querydsl-example-ksp-codegen/src/test/kotlin/Tests.kt

@@ -3,6 +3,8 @@ import com.querydsl.example.ksp.CatType
 import com.querydsl.example.ksp.Person
 import com.querydsl.example.ksp.QCat
 import com.querydsl.example.ksp.QPerson
+import com.querydsl.example.ksp.QPersonClassDTO
+import com.querydsl.example.ksp.QPersonClassConstructorDTO
 import com.querydsl.jpa.impl.JPAQueryFactory
 import jakarta.persistence.EntityManagerFactory
 import org.hibernate.cfg.AvailableSettings
@@ -111,6 +113,55 @@ class Tests {
         }
     }
 
+    @Test
+    fun `select dto`() {
+        val emf = initialize()
+
+        run {
+            val em = emf.createEntityManager()
+            em.transaction.begin()
+            em.persist(Person(424, "John Smith"))
+            em.transaction.commit()
+            em.close()
+        }
+
+        run {
+            val em = emf.createEntityManager()
+            val queryFactory = JPAQueryFactory(em)
+            val q = QPerson.person
+            val personDTO = queryFactory
+                .select(QPersonClassConstructorDTO(q.id, q.name))
+                .from(q)
+                .where(q.name.eq("John Smith"))
+                .fetchOne()
+            if (personDTO == null) {
+                fail<Any>("No personDTO was returned")
+            } else {
+                assertThat(personDTO.id).isEqualTo(424)
+                assertThat(personDTO.name).isEqualTo("John Smith")
+            }
+            em.close()
+        }
+
+        run {
+            val em = emf.createEntityManager()
+            val queryFactory = JPAQueryFactory(em)
+            val q = QPerson.person
+            val personDTO = queryFactory
+                .select(QPersonClassDTO(q.id, q.name))
+                .from(q)
+                .where(q.name.eq("John Smith"))
+                .fetchOne()
+            if (personDTO == null) {
+                fail<Any>("No personDTO was returned")
+            } else {
+                assertThat(personDTO.id).isEqualTo(424)
+                assertThat(personDTO.name).isEqualTo("John Smith")
+            }
+            em.close()
+        }
+    }
+
     private fun initialize(): EntityManagerFactory {
         val configuration = Configuration()
             .setProperty(AvailableSettings.JAKARTA_JDBC_DRIVER, org.h2.Driver::class.qualifiedName!!)

querydsl-examples/querydsl-example-sql-spring/pom.xml

@@ -32,7 +32,7 @@
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
-      <version>1.18.36</version>
+      <version>1.18.38</version>
       <scope>provided</scope>
     </dependency>
 

querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLSerializer.java

@@ -65,7 +65,7 @@ public class JPQLSerializer extends SerializerBase<JPQLSerializer> {
               Ops.ADD, Ops.SUB, Ops.MULT, Ops.DIV, Ops.LT, Ops.LOE, Ops.GT, Ops.GOE, Ops.BETWEEN));
 
   private static final Set<? extends Operator> CASE_OPS =
-      Collections.unmodifiableSet(EnumSet.of(Ops.CASE_ELSE));
+      Collections.unmodifiableSet(EnumSet.of(Ops.CASE_WHEN, Ops.CASE_ELSE));
 
   private static final String COMMA = ", ";
 
@@ -383,6 +383,10 @@ private void serializeSources(boolean forCountRow, List<JoinExpression> joins) {
 
   @Override
   public void visitConstant(Object constant) {
+    if (inCaseOperation && constant instanceof Enum) {
+      visitLiteral(constant);
+      return;
+    }
     if (inCaseOperation && templates.isCaseWithLiterals()) {
       if (constant instanceof Collection) {
         append("(");

querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLTemplates.java

@@ -213,7 +213,7 @@ public String asLiteral(Object constant) {
     } else if (constant instanceof String) {
       return "'" + escapeLiteral(constant.toString()) + "'";
     } else if (constant instanceof Enum) {
-      return constant.getClass().getName() + "." + ((Enum) constant).name();
+      return "'" + ((Enum<?>) constant).name() + "'";
     } else {
       return "'" + constant.toString() + "'";
     }

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

@@ -19,19 +19,13 @@
 import com.querydsl.core.DefaultQueryMetadata;
 import com.querydsl.core.JoinType;
 import com.querydsl.core.QueryMetadata;
-import com.querydsl.core.domain.QAnimal;
 import com.querydsl.core.domain.QCat;
 import com.querydsl.core.types.EntityPath;
 import com.querydsl.core.types.Expression;
 import com.querydsl.core.types.Path;
 import com.querydsl.core.types.Predicate;
-import com.querydsl.core.types.dsl.EntityPathBase;
-import com.querydsl.core.types.dsl.Expressions;
-import com.querydsl.core.types.dsl.NumberPath;
-import com.querydsl.jpa.domain.JobFunction;
-import com.querydsl.jpa.domain.Location;
-import com.querydsl.jpa.domain.QDomesticCat;
-import com.querydsl.jpa.domain.QEmployee;
+import com.querydsl.core.types.dsl.*;
+import com.querydsl.jpa.domain.*;
 import java.util.Arrays;
 import org.junit.Test;
 
@@ -67,7 +61,7 @@ public void case1_hibernate() {
         Expressions.cases().when(cat.toes.eq(2)).then(2).when(cat.toes.eq(3)).then(3).otherwise(4);
     serializer.handle(expr);
     assertThat(serializer.toString())
-        .isEqualTo("case when (cat.toes = ?1) then ?2 when (cat.toes = ?3) then ?4 else 4 end");
+        .isEqualTo("case when (cat.toes = ?1) then 2 when (cat.toes = ?2) then 3 else 4 end");
   }
 
   @Test
@@ -337,18 +331,38 @@ public void visitLiteral_string() {
     assertThat(serializer).hasToString("'abc''''def'");
   }
 
-  @Test
-  public void visitLiteral_enum() {
-    var serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
-    serializer.visitLiteral(JobFunction.MANAGER);
-    assertThat(serializer).hasToString("com.querydsl.jpa.domain.JobFunction.MANAGER");
-  }
-
   @Test
   public void substring_indexOf() {
     var cat = QCat.cat;
     var serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
     cat.name.substring(cat.name.indexOf("")).accept(serializer, null);
     assertThat(serializer).hasToString("substring(cat.name,locate(?1,cat.name)-1 + ?2)");
   }
+
+  @Test
+  public void case_enumConversion() {
+    var serializer = new JPQLSerializer(JPQLTemplates.DEFAULT);
+
+    Expression<?> expr =
+        new CaseBuilder()
+            .when(Expressions.TRUE)
+            .then(JobFunction.MANAGER)
+            .otherwise(JobFunction.CONSULTANT);
+
+    serializer.handle(expr);
+
+    assertThat(serializer.toString())
+        .isEqualTo("case when true then 'MANAGER' else 'CONSULTANT' end");
+  }
+
+  @Test
+  public void inClause_enumCollection() {
+    QAnimal animal = QAnimal.animal;
+    Expression<?> predicate = animal.color.in(Arrays.asList(Color.BLACK, Color.TABBY));
+    JPQLSerializer serializer = new JPQLSerializer(JPQLTemplates.DEFAULT);
+    serializer.handle(predicate);
+    assertThat(serializer.toString()).isEqualTo("animal.color in ?1");
+    Object constant = serializer.getConstants().get(0);
+    assertThat(constant.toString()).isEqualTo("[BLACK, TABBY]");
+  }
 }

querydsl-libraries/querydsl-scala/pom.xml

@@ -153,7 +153,7 @@
       <plugin>
         <groupId>net.alchim31.maven</groupId>
         <artifactId>scala-maven-plugin</artifactId>
-        <version>4.9.2</version>
+        <version>4.9.5</version>
         <configuration>
           <charset>${character.encoding}</charset>
           <scalaVersion>${scala.version}</scalaVersion>

querydsl-tooling/querydsl-apt/pom.xml

@@ -100,7 +100,7 @@
     <dependency>
       <groupId>org.joda</groupId>
       <artifactId>joda-money</artifactId>
-      <version>2.0.1</version>
+      <version>2.0.2</version>
       <scope>test</scope>
     </dependency>
 

querydsl-tooling/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/model/SimpleType.java

@@ -103,7 +103,7 @@ public SimpleType(
     this.fullName = fullName;
     this.packageName = packageName;
     this.simpleName = simpleName;
-    if (packageName.length() > 0) {
+    if (packageName.length() > 0 && fullName.length() > packageName.length()) {
       this.localName = fullName.substring(packageName.length() + 1);
     } else {
       this.localName = fullName;

querydsl-tooling/querydsl-ksp-codegen/src/main/kotlin/com/querydsl/ksp/codegen/QueryDslProcessor.kt

@@ -1,5 +1,6 @@
 package com.querydsl.ksp.codegen
 
+import com.google.devtools.ksp.isConstructor
 import com.google.devtools.ksp.processing.CodeGenerator
 import com.google.devtools.ksp.processing.Resolver
 import com.google.devtools.ksp.processing.SymbolProcessor
@@ -17,9 +18,32 @@ class QueryDslProcessor(
         if (settings.enable) {
             QueryModelType.entries.forEach { type ->
                 resolver.getSymbolsWithAnnotation(type.associatedAnnotation)
-                    .map { it as KSClassDeclaration }
-                    .filter { isIncluded(it) }
-                    .forEach { declaration -> typeProcessor.add(declaration, type) }
+                    .map { declaration ->
+                        when {
+                            type == QueryModelType.QUERY_PROJECTION -> {
+                                val errorMessage = "${type.associatedAnnotation} annotation" +
+                                        " must be declared on a constructor function or class"
+                                when (declaration) {
+                                    is KSFunctionDeclaration -> {
+                                        if (!declaration.isConstructor()) error(errorMessage)
+                                        declaration.parent as? KSClassDeclaration
+                                            ?: error(errorMessage)
+                                    }
+
+                                    is KSClassDeclaration -> declaration
+                                    else -> error(errorMessage)
+                                }
+                            }
+
+                            else -> declaration as KSClassDeclaration
+                        }
+                    }
+                    .filter {
+                        isIncluded(it)
+                    }
+                    .forEach { declaration ->
+                        typeProcessor.add(declaration, type)
+                    }
             }
         }
         return emptyList()