From 06a98db984911390bc601e2db4279e84f744ac46 Mon Sep 17 00:00:00 2001
From: Chris Bono <chris.bono@broadcom.com>
Date: Tue, 10 Jun 2025 14:53:55 -0500
Subject: [PATCH] Let Kotlin repository generics extend `Any`.

The move to Kotlin 2.x introduces warnings in the Kotlin extensions for type arguments tha are not within their bounds (i.e. `Thing<T>` should be `Thing<T : Any>`). This commit fixes these cases and removes the warnings.

Signed-off-by: Chris Bono <chris.bono@broadcom.com>
Closes #3309
---
 .../springframework/data/repository/CrudRepositoryExtensions.kt | 2 +-
 .../data/repository/kotlin/CoroutineCrudRepository.kt           | 2 +-
 .../data/repository/kotlin/CoroutineSortingRepository.kt        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/kotlin/org/springframework/data/repository/CrudRepositoryExtensions.kt b/src/main/kotlin/org/springframework/data/repository/CrudRepositoryExtensions.kt
index 94b39220d..f6eb45974 100644
--- a/src/main/kotlin/org/springframework/data/repository/CrudRepositoryExtensions.kt
+++ b/src/main/kotlin/org/springframework/data/repository/CrudRepositoryExtensions.kt
@@ -24,4 +24,4 @@ package org.springframework.data.repository
  * @author Oscar Hernandez
  * @since 2.1.4
  */
-fun <T, ID: Any> CrudRepository<T, ID>.findByIdOrNull(id: ID): T? = findById(id).orElse(null)
+fun <T: Any, ID: Any> CrudRepository<T, ID>.findByIdOrNull(id: ID): T? = findById(id).orElse(null)
diff --git a/src/main/kotlin/org/springframework/data/repository/kotlin/CoroutineCrudRepository.kt b/src/main/kotlin/org/springframework/data/repository/kotlin/CoroutineCrudRepository.kt
index 948f351ea..f197a880d 100644
--- a/src/main/kotlin/org/springframework/data/repository/kotlin/CoroutineCrudRepository.kt
+++ b/src/main/kotlin/org/springframework/data/repository/kotlin/CoroutineCrudRepository.kt
@@ -37,7 +37,7 @@ import reactor.core.publisher.Mono
  * @see Flow
  */
 @NoRepositoryBean
-interface CoroutineCrudRepository<T, ID> : Repository<T, ID> {
+interface CoroutineCrudRepository<T: Any, ID: Any> : Repository<T, ID> {
 
 	/**
 	 * Saves a given entity. Use the returned instance for further operations as the save operation might have changed the
diff --git a/src/main/kotlin/org/springframework/data/repository/kotlin/CoroutineSortingRepository.kt b/src/main/kotlin/org/springframework/data/repository/kotlin/CoroutineSortingRepository.kt
index 7175e7062..5dde2053b 100644
--- a/src/main/kotlin/org/springframework/data/repository/kotlin/CoroutineSortingRepository.kt
+++ b/src/main/kotlin/org/springframework/data/repository/kotlin/CoroutineSortingRepository.kt
@@ -34,7 +34,7 @@ import org.springframework.data.repository.Repository
  * @see CoroutineCrudRepository
  */
 @NoRepositoryBean
-interface CoroutineSortingRepository<T, ID> : Repository<T, ID> {
+interface CoroutineSortingRepository<T: Any, ID: Any> : Repository<T, ID> {
 
 	/**
 	 * Returns all entities sorted by the given options.