Merge pull request #45609 from LarsSven/ls/kotlin-panache-nullable

Allow null for query parameters in Kotlin panache
quarkusio · Jan 15, 2025 · 3f0743c · 3f0743c
2 parents 552d558 + dbdc588
commit 3f0743c
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 34 deletions.
diff --git a/.../runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheRepositoryBase.kt b/.../runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheRepositoryBase.kt
@@ -115,7 +115,7 @@ interface PanacheRepositoryBase<Entity : Any, Id : Any> {
      * @see [PanacheRepositoryBase.stream]
      */
     @GenerateBridge
-    fun find(query: String, vararg params: Any): PanacheQuery<Entity> =
+    fun find(query: String, vararg params: Any?): PanacheQuery<Entity> =
         throw implementationInjectionMissing()
 
     /**
@@ -129,7 +129,7 @@ interface PanacheRepositoryBase<Entity : Any, Id : Any> {
      * @see [PanacheRepositoryBase.stream]
      */
     @GenerateBridge
-    fun find(query: String, sort: Sort, vararg params: Any): PanacheQuery<Entity> =
+    fun find(query: String, sort: Sort, vararg params: Any?): PanacheQuery<Entity> =
         throw implementationInjectionMissing()
 
     /**
@@ -142,7 +142,7 @@ interface PanacheRepositoryBase<Entity : Any, Id : Any> {
      * @see [PanacheRepositoryBase.stream]
      */
     @GenerateBridge
-    fun find(query: String, params: Map<String, Any>): PanacheQuery<Entity> =
+    fun find(query: String, params: Map<String, Any?>): PanacheQuery<Entity> =
         throw implementationInjectionMissing()
 
     /**
@@ -156,7 +156,7 @@ interface PanacheRepositoryBase<Entity : Any, Id : Any> {
      * @see [PanacheRepositoryBase.stream]
      */
     @GenerateBridge
-    fun find(query: String, sort: Sort, params: Map<String, Any>): PanacheQuery<Entity> =
+    fun find(query: String, sort: Sort, params: Map<String, Any?>): PanacheQuery<Entity> =
         throw implementationInjectionMissing()
 
     /**
@@ -217,7 +217,7 @@ interface PanacheRepositoryBase<Entity : Any, Id : Any> {
      * @see [PanacheRepositoryBase.stream]
      */
     @GenerateBridge
-    fun list(query: String, vararg params: Any): List<Entity> =
+    fun list(query: String, vararg params: Any?): List<Entity> =
         throw implementationInjectionMissing()
 
     /**
@@ -232,7 +232,7 @@ interface PanacheRepositoryBase<Entity : Any, Id : Any> {
      * @see [PanacheRepositoryBase.stream]
      */
     @GenerateBridge
-    fun list(query: String, sort: Sort, vararg params: Any): List<Entity> =
+    fun list(query: String, sort: Sort, vararg params: Any?): List<Entity> =
         throw implementationInjectionMissing()
 
     /**
@@ -246,7 +246,7 @@ interface PanacheRepositoryBase<Entity : Any, Id : Any> {
      * @see [PanacheRepositoryBase.stream]
      */
     @GenerateBridge
-    fun list(query: String, params: Map<String, Any>): List<Entity> =
+    fun list(query: String, params: Map<String, Any?>): List<Entity> =
         throw implementationInjectionMissing()
 
     /**
@@ -261,7 +261,7 @@ interface PanacheRepositoryBase<Entity : Any, Id : Any> {
      * @see [PanacheRepositoryBase.stream]
      */
     @GenerateBridge
-    fun list(query: String, sort: Sort, params: Map<String, Any>): List<Entity> =
+    fun list(query: String, sort: Sort, params: Map<String, Any?>): List<Entity> =
         throw implementationInjectionMissing()
 
     /**
@@ -325,7 +325,7 @@ interface PanacheRepositoryBase<Entity : Any, Id : Any> {
      * @see [PanacheRepositoryBase.list]
      */
     @GenerateBridge
-    fun stream(query: String, vararg params: Any): Stream<Entity> =
+    fun stream(query: String, vararg params: Any?): Stream<Entity> =
         throw implementationInjectionMissing()
 
     /**
@@ -342,7 +342,7 @@ interface PanacheRepositoryBase<Entity : Any, Id : Any> {
      * @see [PanacheRepositoryBase.list]
      */
     @GenerateBridge
-    fun stream(query: String, sort: Sort, vararg params: Any): Stream<Entity> =
+    fun stream(query: String, sort: Sort, vararg params: Any?): Stream<Entity> =
         throw implementationInjectionMissing()
 
     /**
@@ -357,7 +357,7 @@ interface PanacheRepositoryBase<Entity : Any, Id : Any> {
      * @see [PanacheRepositoryBase.list]
      */
     @GenerateBridge
-    fun stream(query: String, params: Map<String, Any>): Stream<Entity> =
+    fun stream(query: String, params: Map<String, Any?>): Stream<Entity> =
         throw implementationInjectionMissing()
 
     /**
@@ -373,7 +373,7 @@ interface PanacheRepositoryBase<Entity : Any, Id : Any> {
      * @see [PanacheRepositoryBase.list]
      */
     @GenerateBridge
-    fun stream(query: String, sort: Sort, params: Map<String, Any>): Stream<Entity> =
+    fun stream(query: String, sort: Sort, params: Map<String, Any?>): Stream<Entity> =
         throw implementationInjectionMissing()
 
     /**
@@ -447,7 +447,7 @@ interface PanacheRepositoryBase<Entity : Any, Id : Any> {
      * @return the number of entities counted.
      */
     @GenerateBridge
-    fun count(query: String, vararg params: Any): Long = throw implementationInjectionMissing()
+    fun count(query: String, vararg params: Any?): Long = throw implementationInjectionMissing()
 
     /**
      * Counts the number of this type of entity matching the given query, with named parameters.
@@ -457,7 +457,7 @@ interface PanacheRepositoryBase<Entity : Any, Id : Any> {
      * @return the number of entities counted.
      */
     @GenerateBridge
-    fun count(query: String, params: Map<String, Any>): Long =
+    fun count(query: String, params: Map<String, Any?>): Long =
         throw implementationInjectionMissing()
 
     /**
@@ -493,7 +493,7 @@ interface PanacheRepositoryBase<Entity : Any, Id : Any> {
      * @see [PanacheRepositoryBase.deleteAll]
      */
     @GenerateBridge
-    fun delete(query: String, vararg params: Any): Long = throw implementationInjectionMissing()
+    fun delete(query: String, vararg params: Any?): Long = throw implementationInjectionMissing()
 
     /**
      * Delete all entities of this type matching the given query, with named parameters.
@@ -507,7 +507,7 @@ interface PanacheRepositoryBase<Entity : Any, Id : Any> {
      * @see [PanacheRepositoryBase.deleteAll]
      */
     @GenerateBridge
-    fun delete(query: String, params: Map<String, Any>): Long =
+    fun delete(query: String, params: Map<String, Any?>): Long =
         throw implementationInjectionMissing()
 
     /**
@@ -567,7 +567,7 @@ interface PanacheRepositoryBase<Entity : Any, Id : Any> {
      * @return the number of entities updated.
      */
     @GenerateBridge
-    fun update(query: String, vararg params: Any): Int = throw implementationInjectionMissing()
+    fun update(query: String, vararg params: Any?): Int = throw implementationInjectionMissing()
 
     /**
      * Update all entities of this type matching the given query, with named parameters.
@@ -577,7 +577,7 @@ interface PanacheRepositoryBase<Entity : Any, Id : Any> {
      * @return the number of entities updated.
      */
     @GenerateBridge
-    fun update(query: String, params: Map<String, Any>): Int =
+    fun update(query: String, params: Map<String, Any?>): Int =
         throw implementationInjectionMissing()
 
     /**

diff --git a/...ime/src/main/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/PanacheRepositoryBase.kt b/...ime/src/main/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/PanacheRepositoryBase.kt
@@ -104,7 +104,7 @@ interface PanacheRepositoryBase<Entity : Any, Id : Any> {
      * @see [list] list
      */
     @GenerateBridge
-    fun find(query: String, vararg params: Any): PanacheQuery<Entity> =
+    fun find(query: String, vararg params: Any?): PanacheQuery<Entity> =
         throw INSTANCE.implementationInjectionMissing()
 
     /**
@@ -117,7 +117,7 @@ interface PanacheRepositoryBase<Entity : Any, Id : Any> {
      * @see [list] list
      */
     @GenerateBridge
-    fun find(query: String, sort: Sort, vararg params: Any): PanacheQuery<Entity> =
+    fun find(query: String, sort: Sort, vararg params: Any?): PanacheQuery<Entity> =
         throw INSTANCE.implementationInjectionMissing()
 
     /**
@@ -129,7 +129,7 @@ interface PanacheRepositoryBase<Entity : Any, Id : Any> {
      * @see [list] list
      */
     @GenerateBridge
-    fun find(query: String, params: Map<String, Any>): PanacheQuery<Entity> =
+    fun find(query: String, params: Map<String, Any?>): PanacheQuery<Entity> =
         throw INSTANCE.implementationInjectionMissing()
 
     /**
@@ -142,7 +142,7 @@ interface PanacheRepositoryBase<Entity : Any, Id : Any> {
      * @see [list] list
      */
     @GenerateBridge
-    fun find(query: String, sort: Sort, params: Map<String, Any>): PanacheQuery<Entity> =
+    fun find(query: String, sort: Sort, params: Map<String, Any?>): PanacheQuery<Entity> =
         throw INSTANCE.implementationInjectionMissing()
 
     /**
@@ -200,7 +200,7 @@ interface PanacheRepositoryBase<Entity : Any, Id : Any> {
      */
     @CheckReturnValue
     @GenerateBridge
-    fun list(query: String, vararg params: Any): Uni<List<Entity>> =
+    fun list(query: String, vararg params: Any?): Uni<List<Entity>> =
         throw INSTANCE.implementationInjectionMissing()
 
     /**
@@ -215,7 +215,7 @@ interface PanacheRepositoryBase<Entity : Any, Id : Any> {
      */
     @CheckReturnValue
     @GenerateBridge
-    fun list(query: String, sort: Sort, vararg params: Any): Uni<List<Entity>> =
+    fun list(query: String, sort: Sort, vararg params: Any?): Uni<List<Entity>> =
         throw INSTANCE.implementationInjectionMissing()
 
     /**
@@ -229,7 +229,7 @@ interface PanacheRepositoryBase<Entity : Any, Id : Any> {
      */
     @CheckReturnValue
     @GenerateBridge
-    fun list(query: String, params: Map<String, Any>): Uni<List<Entity>> =
+    fun list(query: String, params: Map<String, Any?>): Uni<List<Entity>> =
         throw INSTANCE.implementationInjectionMissing()
 
     /**
@@ -244,7 +244,7 @@ interface PanacheRepositoryBase<Entity : Any, Id : Any> {
      */
     @CheckReturnValue
     @GenerateBridge
-    fun list(query: String, sort: Sort, params: Map<String, Any>): Uni<List<Entity>> =
+    fun list(query: String, sort: Sort, params: Map<String, Any?>): Uni<List<Entity>> =
         throw INSTANCE.implementationInjectionMissing()
 
     /**
@@ -319,7 +319,7 @@ interface PanacheRepositoryBase<Entity : Any, Id : Any> {
      */
     @CheckReturnValue
     @GenerateBridge
-    fun count(query: String, vararg params: Any): Uni<Long> =
+    fun count(query: String, vararg params: Any?): Uni<Long> =
         throw INSTANCE.implementationInjectionMissing()
 
     /**
@@ -331,7 +331,7 @@ interface PanacheRepositoryBase<Entity : Any, Id : Any> {
      */
     @CheckReturnValue
     @GenerateBridge
-    fun count(query: String, params: Map<String, Any>): Uni<Long> =
+    fun count(query: String, params: Map<String, Any?>): Uni<Long> =
         throw INSTANCE.implementationInjectionMissing()
 
     /**
@@ -382,7 +382,7 @@ interface PanacheRepositoryBase<Entity : Any, Id : Any> {
      */
     @CheckReturnValue
     @GenerateBridge
-    fun delete(query: String, vararg params: Any): Uni<Long> =
+    fun delete(query: String, vararg params: Any?): Uni<Long> =
         throw INSTANCE.implementationInjectionMissing()
 
     /**
@@ -398,7 +398,7 @@ interface PanacheRepositoryBase<Entity : Any, Id : Any> {
      */
     @CheckReturnValue
     @GenerateBridge
-    fun delete(query: String, params: Map<String, Any>): Uni<Long> =
+    fun delete(query: String, params: Map<String, Any?>): Uni<Long> =
         throw INSTANCE.implementationInjectionMissing()
 
     /**
@@ -453,7 +453,7 @@ interface PanacheRepositoryBase<Entity : Any, Id : Any> {
      */
     @CheckReturnValue
     @GenerateBridge
-    fun update(query: String, vararg params: Any): Uni<Int> =
+    fun update(query: String, vararg params: Any?): Uni<Int> =
         throw INSTANCE.implementationInjectionMissing()
 
     /**
@@ -465,7 +465,7 @@ interface PanacheRepositoryBase<Entity : Any, Id : Any> {
      */
     @CheckReturnValue
     @GenerateBridge
-    fun update(query: String, params: Map<String, Any>): Uni<Int> =
+    fun update(query: String, params: Map<String, Any?>): Uni<Int> =
         throw INSTANCE.implementationInjectionMissing()
 
     /**

diff --git a/...s/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/AddressDao.kt b/...s/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/AddressDao.kt
@@ -14,5 +14,5 @@ open class AddressDao(private val dummyService: DummyService) :
         }
     }
 
-    override fun count(query: String, params: Map<String, Any>): Long = shouldBeOverridden()
+    override fun count(query: String, params: Map<String, Any?>): Long = shouldBeOverridden()
 }
diff --git a/...rnate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/PersonRepository.kt b/...rnate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/PersonRepository.kt
@@ -6,7 +6,7 @@ import jakarta.enterprise.context.ApplicationScoped
 
 @ApplicationScoped
 open class PersonRepository : PanacheRepository<Person> {
-    override fun count(query: String, params: Map<String, Any>): Long {
+    override fun count(query: String, params: Map<String, Any?>): Long {
         return INSTANCE.count(Person::class.java, query, params)
     }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
             }
         }
-        override fun count(query: String, params: Map<String, Any>): Long = shouldBeOverridden()
+        override fun count(query: String, params: Map<String, Any?>): Long = shouldBeOverridden()
     }