Merge remote-tracking branch 'origin/master' into querydsl-7.0

OpenFeign · Feb 21, 2025 · 7704fee · 7704fee
2 parents 0a5628f + 227f118
commit 7704fee
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -107,7 +107,7 @@
     <junit.version>5.11.4</junit.version>
     <ecj.version>3.40.0</ecj.version>
     <jdo.version>3.2.1</jdo.version>
-    <springboot.version>3.4.2</springboot.version>
+    <springboot.version>3.4.3</springboot.version>
     <spring.version>6.2.3</spring.version>
 
     <!-- SQL deps -->
@@ -120,7 +120,7 @@
     <mysql.version>9.2.0</mysql.version>
     <mssql.version>12.9.0.jre8-preview</mssql.version>
     <cubrid.version>9.3.9.0002</cubrid.version>
-    <sqlite.version>3.49.0.0</sqlite.version>
+    <sqlite.version>3.49.1.0</sqlite.version>
     <teradata.version>13.10.00.35</teradata.version>
     <firebird.version>5.0.6.java11</firebird.version>
     <mongodb.version>3.12.14</mongodb.version>
@@ -171,7 +171,7 @@
       <dependency>
         <groupId>io.smallrye</groupId>
         <artifactId>jandex</artifactId>
-        <version>3.2.6</version>
+        <version>3.2.7</version>
       </dependency>
       <dependency>
         <groupId>org.jetbrains</groupId>
@@ -1011,18 +1011,18 @@
           <plugin>
             <groupId>org.openrewrite.maven</groupId>
             <artifactId>rewrite-maven-plugin</artifactId>
-            <version>6.1.4</version>
+            <version>6.2.0</version>
 
             <dependencies>
               <dependency>
                 <groupId>org.openrewrite.recipe</groupId>
                 <artifactId>rewrite-testing-frameworks</artifactId>
-                <version>3.2.0</version>
+                <version>3.3.0</version>
               </dependency>
               <dependency>
                 <groupId>org.openrewrite.recipe</groupId>
                 <artifactId>rewrite-migrate-java</artifactId>
-                <version>3.2.0</version>
+                <version>3.3.0</version>
               </dependency>
             </dependencies>
 

diff --git a/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml b/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml
@@ -12,7 +12,7 @@
   <name>Querydsl example - JPA Quarkus</name>
 
   <properties>
-    <quarkus.version>3.18.3</quarkus.version>
+    <quarkus.version>3.18.4</quarkus.version>
   </properties>
 
   <dependencyManagement>

diff --git a/querydsl-libraries/querydsl-r2dbc/pom.xml b/querydsl-libraries/querydsl-r2dbc/pom.xml
@@ -105,7 +105,7 @@
     <dependency>
       <groupId>io.asyncer</groupId>
       <artifactId>r2dbc-mysql</artifactId>
-      <version>1.3.2</version>
+      <version>1.4.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/...tooling/querydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/Extensions.kt b/...tooling/querydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/Extensions.kt
@@ -27,9 +27,10 @@ import com.squareup.kotlinpoet.asTypeName
 import com.squareup.kotlinpoet.joinToCode
 import kotlin.reflect.KClass
 
-fun Type.asTypeName(): TypeName = asClassName().let { className ->
+@JvmOverloads
+fun Type.asTypeName(out: Boolean = false): TypeName = asClassName().let { className ->
     if (parameters.isNotEmpty())
-        className.parameterizedBy(*parameters.map { it.asTypeName() }.toTypedArray()) else className
+        className.parameterizedBy(*parameters.map { if (out) it.asOutTypeName() else it.asTypeName() }.toTypedArray()) else className
 }
 
 fun Type.asClassName(): ClassName = when (this.fullName) {
@@ -57,7 +58,7 @@ fun Type.asClassName(): ClassName = when (this.fullName) {
     else -> ClassName(packageName, *enclosingTypeHierarchy().toTypedArray())
 }
 
-fun Type.asOutTypeName() = WildcardTypeName.producerOf(asTypeName())
+fun Type.asOutTypeName() = WildcardTypeName.producerOf(asTypeName(out = true))
 
 private fun Type.enclosingTypeHierarchy(): List<String> {
     var current: Type? = this
@@ -76,6 +77,8 @@ fun KClass<*>.parameterizedBy(vararg types: TypeName) = asTypeName().parameteriz
 
 fun KClass<*>.parameterizedBy(vararg types: Type) = asTypeName().parameterizedBy(types.map { it.asTypeName() })
 
+fun KClass<*>.parameterizedByOut(vararg types: Type) = asTypeName().parameterizedBy(types.map { it.asTypeName(out = true) })
+
 fun Collection<String>.joinToCode(
         format: String = "%S",
         separator: CharSequence = ", ",

diff --git a/...ydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/KotlinEntitySerializer.kt b/...ydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/KotlinEntitySerializer.kt
@@ -106,7 +106,7 @@ open class KotlinEntitySerializer @Inject constructor(
         }
         val superType = when (model.originalCategory) {
             TypeCategory.BOOLEAN, TypeCategory.STRING -> pathType.asTypeName()
-            else -> pathType.parameterizedBy(model)
+            else -> pathType.parameterizedByOut(model)
         }
         return TypeSpec.classBuilder(mappings.getPathClassName(model, model))
             .addAnnotations(model.annotations.map { AnnotationSpec.get(it) })