From 4ea94056ccd89abc9e6fc180b87abb51d548e656 Mon Sep 17 00:00:00 2001
From: Oscar Hernandez <OsaSofto@gmail.com>
Date: Thu, 24 Oct 2024 13:12:51 +0200
Subject: [PATCH] Fix NPE in `CrudRepositoryExtensions`.

Closes #3187
---
 .../data/repository/CrudRepositoryExtensions.kt              | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/kotlin/org/springframework/data/repository/CrudRepositoryExtensions.kt b/src/main/kotlin/org/springframework/data/repository/CrudRepositoryExtensions.kt
index 44c67742a..94b39220d 100644
--- a/src/main/kotlin/org/springframework/data/repository/CrudRepositoryExtensions.kt
+++ b/src/main/kotlin/org/springframework/data/repository/CrudRepositoryExtensions.kt
@@ -19,8 +19,9 @@ package org.springframework.data.repository
  * Retrieves an entity by its id.
  *
  * @param id the entity id.
- * @return the entity with the given id or `null` if none found
+ * @return the entity with the given id or `null` if none found.
  * @author Sebastien Deleuze
+ * @author Oscar Hernandez
  * @since 2.1.4
  */
-fun <T, ID> CrudRepository<T, ID>.findByIdOrNull(id: ID): T? = findById(id!!).orElse(null)
+fun <T, ID: Any> CrudRepository<T, ID>.findByIdOrNull(id: ID): T? = findById(id).orElse(null)