From eccb2598019753c3aa22760cc1c37b8382ea106c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alaksiej=20=C5=A0=C4=8Darbaty?=
 <hahaha.funny.yellow.dog@gmail.com>
Date: Fri, 25 Aug 2023 14:51:50 +0200
Subject: [PATCH] Don't return a value from assertNotNull

Because of kotlin smart casts, there is no need to return a
non-nullable value from `assertNotNull` methods

Issue: #1866
---
 .../src/main/kotlin/org/junit/jupiter/api/Assertions.kt  | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/junit-jupiter-api/src/main/kotlin/org/junit/jupiter/api/Assertions.kt b/junit-jupiter-api/src/main/kotlin/org/junit/jupiter/api/Assertions.kt
index 3aa9c83bcbb7..980b53bc0382 100644
--- a/junit-jupiter-api/src/main/kotlin/org/junit/jupiter/api/Assertions.kt
+++ b/junit-jupiter-api/src/main/kotlin/org/junit/jupiter/api/Assertions.kt
@@ -179,13 +179,12 @@ fun assertNull(actual: Any?, messageSupplier: () -> String) {
  * @see Assertions.assertNotNull
  */
 @API(since = "5.10", status = EXPERIMENTAL)
-fun <T> assertNotNull(actual: T?): T {
+fun assertNotNull(actual: Any?) {
     contract {
         returns() implies (actual != null)
     }
 
     Assertions.assertNotNull(actual)
-    return actual!!
 }
 
 /**
@@ -201,13 +200,12 @@ fun <T> assertNotNull(actual: T?): T {
  * @see Assertions.assertNotNull
  */
 @API(since = "5.10", status = EXPERIMENTAL)
-fun <T> assertNotNull(actual: T?, message: String): T {
+fun assertNotNull(actual: Any?, message: String) {
     contract {
         returns() implies (actual != null)
     }
 
     Assertions.assertNotNull(actual, message)
-    return actual!!
 }
 
 /**
@@ -223,7 +221,7 @@ fun <T> assertNotNull(actual: T?, message: String): T {
  * @see Assertions.assertNotNull
  */
 @API(since = "5.10", status = EXPERIMENTAL)
-fun <T> assertNotNull(actual: T?, messageSupplier: () -> String): T {
+fun assertNotNull(actual: Any?, messageSupplier: () -> String) {
     contract {
         returns() implies (actual != null)
 
@@ -231,7 +229,6 @@ fun <T> assertNotNull(actual: T?, messageSupplier: () -> String): T {
     }
 
     Assertions.assertNotNull(actual, messageSupplier)
-    return actual!!
 }
 
 /**